Commit eeec9f1a authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by John W. Linville
Browse files

[PATCH] WE-21 for orinoco 



Signed-off-by: default avatarJean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5b63bae0

drivers/net/wireless/orinoco.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

		}

	}