adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-03 22:53:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] WE-21 for ipw2100

Browse source 
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Jean Tourrilhes 2006-08-29 18:00:48 -07:00 committed by John W. Linville
parent 9fb08363f1
commit 5b63bae0ab
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/wireless/ipw2100.c
View file

@ -6958,7 +6958,7 @@ static int ipw2100_wx_set_essid(struct net_device *dev,
} }
if (wrqu->essid.flags && wrqu->essid.length) { if (wrqu->essid.flags && wrqu->essid.length) {
length = wrqu->essid.length - 1; length = wrqu->essid.length;
essid = extra; essid = extra;
} }
@ -7051,7 +7051,7 @@ static int ipw2100_wx_get_nick(struct net_device *dev,
struct ipw2100_priv *priv = ieee80211_priv(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); memcpy(extra, priv->nick, wrqu->data.length);
wrqu->data.flags = 1; /* active */ wrqu->data.flags = 1; /* active */
@ -7343,14 +7343,14 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
goto done; 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); err = ipw2100_set_short_retry(priv, wrqu->retry.value);
IPW_DEBUG_WX("SET Short Retry Limit -> %d \n", IPW_DEBUG_WX("SET Short Retry Limit -> %d \n",
wrqu->retry.value); wrqu->retry.value);
goto done; 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); err = ipw2100_set_long_retry(priv, wrqu->retry.value);
IPW_DEBUG_WX("SET Long Retry Limit -> %d \n", IPW_DEBUG_WX("SET Long Retry Limit -> %d \n",
wrqu->retry.value); 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) if ((wrqu->retry.flags & IW_RETRY_TYPE) == IW_RETRY_LIFETIME)
return -EINVAL; return -EINVAL;
if (wrqu->retry.flags & IW_RETRY_MAX) { if (wrqu->retry.flags & IW_RETRY_LONG) {
wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_MAX; wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_LONG;
wrqu->retry.value = priv->long_retry_limit; wrqu->retry.value = priv->long_retry_limit;
} else { } else {
wrqu->retry.flags = wrqu->retry.flags =
(priv->short_retry_limit != (priv->short_retry_limit !=
priv->long_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; wrqu->retry.value = priv->short_retry_limit;
} }