[PATCH 2.6.18] WE-21 for orinoco

[Jean Tourrilhes]

        Hi,

        WE-21 for Orinoco driver...

        Jean

Signed-off-by: Jean Tourrilhes <[EMAIL PROTECTED]>

-----------------------------------------------------------

diff -u -p linux/drivers/net/wireless/orinoco.20.c 
linux/drivers/net/wireless/orinoco.c
--- linux/drivers/net/wireless/orinoco.20.c     2006-08-28 17:37:19.000000000 
-0700
+++ linux/drivers/net/wireless/orinoco.c        2006-08-28 17:37:26.000000000 
-0700
@@ -3036,7 +3036,7 @@ static int orinoco_ioctl_getessid(struct
        }
 
        erq->flags = 1;
-       erq->length = strlen(essidbuf) + 1;
+       erq->length = strlen(essidbuf);
 
        return 0;
 }
@@ -3077,7 +3077,7 @@ static int orinoco_ioctl_getnick(struct 
        memcpy(nickbuf, priv->nick, IW_ESSID_MAX_SIZE+1);
        orinoco_unlock(priv, &flags);
 
-       nrq->length = strlen(nickbuf)+1;
+       nrq->length = strlen(nickbuf);
 
        return 0;
 }
@@ -3574,14 +3574,14 @@ static int orinoco_ioctl_getretry(struct
                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;
                }
        }
 
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html