diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-25 20:09:14 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-25 20:09:14 -0400 |
| commit | b0df3bd1e553e901ec7297267611a5db88240b38 (patch) | |
| tree | 3eceef36f96a6cf187cf8c4072fd83b4f6435315 /drivers/net/wireless/ray_cs.c | |
| parent | cc3afe6f856054a3752ef2b3ccc5eebf33bd5024 (diff) | |
| parent | a67ab2bde752b26be75d4b68ecead9a14692eac5 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 4574290f971f..e82548ea609a 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, | |||
| 1173 | return -EOPNOTSUPP; | 1173 | return -EOPNOTSUPP; |
| 1174 | } else { | 1174 | } else { |
| 1175 | /* Check the size of the string */ | 1175 | /* Check the size of the string */ |
| 1176 | if(dwrq->length > IW_ESSID_MAX_SIZE + 1) { | 1176 | if(dwrq->length > IW_ESSID_MAX_SIZE) { |
| 1177 | return -E2BIG; | 1177 | return -E2BIG; |
| 1178 | } | 1178 | } |
| 1179 | 1179 | ||