diff options
| author | Jean Tourrilhes <jt@hpl.hp.com> | 2006-08-29 18:02:31 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-09-25 16:52:15 -0400 |
| commit | eeec9f1a931262d69811135092c8447d6dccc3e6 (patch) | |
| tree | 8480c04931d504667afb8c34f61ae9826925b8d4 | |
| parent | 5b63bae0ab750942e84bfb9b353e6222583457a2 (diff) | |
| download | blackbird-op-linux-eeec9f1a931262d69811135092c8447d6dccc3e6.tar.gz blackbird-op-linux-eeec9f1a931262d69811135092c8447d6dccc3e6.zip | |
[PATCH] WE-21 for orinoco
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/orinoco.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 1840b69e3cb5..9e19a963febc 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c @@ -3037,7 +3037,7 @@ static int orinoco_ioctl_getessid(struct net_device *dev, } erq->flags = 1; - erq->length = strlen(essidbuf) + 1; + erq->length = strlen(essidbuf); return 0; } @@ -3078,7 +3078,7 @@ static int orinoco_ioctl_getnick(struct net_device *dev, memcpy(nickbuf, priv->nick, IW_ESSID_MAX_SIZE+1); orinoco_unlock(priv, &flags); - nrq->length = strlen(nickbuf)+1; + nrq->length = strlen(nickbuf); return 0; } @@ -3575,14 +3575,14 @@ static int orinoco_ioctl_getretry(struct net_device *dev, rrq->value = lifetime * 1000; /* ??? */ } else { /* By default, display the min number */ - if ((rrq->flags & IW_RETRY_MAX)) { - rrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX; + if ((rrq->flags & IW_RETRY_LONG)) { + rrq->flags = IW_RETRY_LIMIT | IW_RETRY_LONG; rrq->value = long_limit; } else { rrq->flags = IW_RETRY_LIMIT; rrq->value = short_limit; if(short_limit != long_limit) - rrq->flags |= IW_RETRY_MIN; + rrq->flags |= IW_RETRY_SHORT; } } |
