diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 22:46:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 22:46:46 -0500 |
| commit | d1138cf035ad5a8dc0796b213bd078a2fb92eb7c (patch) | |
| tree | 72a4640fe87720ebfc118f2b3c7f140f5d19d6b7 /drivers/net/wireless/ray_cs.c | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
| parent | 77783a78ded96a56e3a1a0c03bbe87c56896fe6e (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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 319180ca7e71..7880d8c31aad 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
| @@ -1256,7 +1256,7 @@ static int ray_get_essid(struct net_device *dev, | |||
| 1256 | extra[IW_ESSID_MAX_SIZE] = '\0'; | 1256 | extra[IW_ESSID_MAX_SIZE] = '\0'; |
| 1257 | 1257 | ||
| 1258 | /* Push it out ! */ | 1258 | /* Push it out ! */ |
| 1259 | dwrq->length = strlen(extra) + 1; | 1259 | dwrq->length = strlen(extra); |
| 1260 | dwrq->flags = 1; /* active */ | 1260 | dwrq->flags = 1; /* active */ |
| 1261 | 1261 | ||
| 1262 | return 0; | 1262 | return 0; |