aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ray_cs.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-25 20:09:14 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-25 20:09:14 -0400
commitb0df3bd1e553e901ec7297267611a5db88240b38 (patch)
tree3eceef36f96a6cf187cf8c4072fd83b4f6435315 /drivers/net/wireless/ray_cs.c
parentcc3afe6f856054a3752ef2b3ccc5eebf33bd5024 (diff)
parenta67ab2bde752b26be75d4b68ecead9a14692eac5 (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into tmp
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
-rw-r--r--drivers/net/wireless/ray_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 4574290f971..e82548ea609 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -1173,7 +1173,7 @@ static int ray_set_essid(struct net_device *dev,
return -EOPNOTSUPP;
} else {
/* Check the size of the string */
- if(dwrq->length > IW_ESSID_MAX_SIZE + 1) {
+ if(dwrq->length > IW_ESSID_MAX_SIZE) {
return -E2BIG;
}