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

[PATCH] WE-21 for ipw2100 



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

drivers/net/wireless/ipw2100.c

+7 −7
Original line number Diff line number Diff line
@@ -6958,7 +6958,7 @@ static int ipw2100_wx_set_essid(struct net_device *dev, 
	}



	if (wrqu->essid.flags && wrqu->essid.length) {

		length = wrqu->essid.length - 1;

		length = wrqu->essid.length;

		essid = extra;

	}
@@ -7051,7 +7051,7 @@ static int ipw2100_wx_get_nick(struct net_device *dev, 


	struct ipw2100_priv *priv = ieee80211_priv(dev);



	wrqu->data.length = strlen(priv->nick) + 1;

	wrqu->data.length = strlen(priv->nick);

	memcpy(extra, priv->nick, wrqu->data.length);

	wrqu->data.flags = 1;	/* active */
@@ -7343,14 +7343,14 @@ static int ipw2100_wx_set_retry(struct net_device *dev, 
		goto done;

	}



	if (wrqu->retry.flags & IW_RETRY_MIN) {

	if (wrqu->retry.flags & IW_RETRY_SHORT) {

		err = ipw2100_set_short_retry(priv, wrqu->retry.value);

		IPW_DEBUG_WX("SET Short Retry Limit -> %d \n",

			     wrqu->retry.value);

		goto done;

	}



	if (wrqu->retry.flags & IW_RETRY_MAX) {

	if (wrqu->retry.flags & IW_RETRY_LONG) {

		err = ipw2100_set_long_retry(priv, wrqu->retry.value);

		IPW_DEBUG_WX("SET Long Retry Limit -> %d \n",

			     wrqu->retry.value);
@@ -7383,14 +7383,14 @@ static int ipw2100_wx_get_retry(struct net_device *dev, 
	if ((wrqu->retry.flags & IW_RETRY_TYPE) == IW_RETRY_LIFETIME)

		return -EINVAL;



	if (wrqu->retry.flags & IW_RETRY_MAX) {

		wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_MAX;

	if (wrqu->retry.flags & IW_RETRY_LONG) {

		wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_LONG;

		wrqu->retry.value = priv->long_retry_limit;

	} else {

		wrqu->retry.flags =

		    (priv->short_retry_limit !=

		     priv->long_retry_limit) ?

		    IW_RETRY_LIMIT | IW_RETRY_MIN : IW_RETRY_LIMIT;

		    IW_RETRY_LIMIT | IW_RETRY_SHORT : IW_RETRY_LIMIT;



		wrqu->retry.value = priv->short_retry_limit;

	}