2008-04-21 08:49:04

by Adrian Bunk

[permalink] [raw]

Subject: [RFC: 2.6 patch] remove ieee80211_wx_{get,set}_auth()

---

After the bcm43xx removal ieee80211_wx_{get,set}_auth() were no longer
used.

Signed-off-by: Adrian Bunk <[email protected]>

---

include/net/ieee80211.h | 8 ---
net/ieee80211/ieee80211_wx.c | 89 -----------------------------------
2 files changed, 97 deletions(-)

ec783a7fb0fdacebefd93c7bf40493467a825c70 diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index facd0ff..b31399e 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -1309,14 +1309,6 @@ extern int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra);
-extern int ieee80211_wx_set_auth(struct net_device *dev,
- struct iw_request_info *info,
- union iwreq_data *wrqu,
- char *extra);
-extern int ieee80211_wx_get_auth(struct net_device *dev,
- struct iw_request_info *info,
- union iwreq_data *wrqu,
- char *extra);

static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
{
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 623489a..822606b 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -744,98 +744,9 @@ int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
return 0;
}

-int ieee80211_wx_set_auth(struct net_device *dev,
- struct iw_request_info *info,
- union iwreq_data *wrqu,
- char *extra)
-{
- struct ieee80211_device *ieee = netdev_priv(dev);
- unsigned long flags;
- int err = 0;
-
- spin_lock_irqsave(&ieee->lock, flags);
-
- switch (wrqu->param.flags & IW_AUTH_INDEX) {
- case IW_AUTH_WPA_VERSION:
- case IW_AUTH_CIPHER_PAIRWISE:
- case IW_AUTH_CIPHER_GROUP:
- case IW_AUTH_KEY_MGMT:
- /*
- * Host AP driver does not use these parameters and allows
- * wpa_supplicant to control them internally.
- */
- break;
- case IW_AUTH_TKIP_COUNTERMEASURES:
- break; /* FIXME */
- case IW_AUTH_DROP_UNENCRYPTED:
- ieee->drop_unencrypted = !!wrqu->param.value;
- break;
- case IW_AUTH_80211_AUTH_ALG:
- break; /* FIXME */
- case IW_AUTH_WPA_ENABLED:
- ieee->privacy_invoked = ieee->wpa_enabled = !!wrqu->param.value;
- break;
- case IW_AUTH_RX_UNENCRYPTED_EAPOL:
- ieee->ieee802_1x = !!wrqu->param.value;
- break;
- case IW_AUTH_PRIVACY_INVOKED:
- ieee->privacy_invoked = !!wrqu->param.value;
- break;
- default:
- err = -EOPNOTSUPP;
- break;
- }
- spin_unlock_irqrestore(&ieee->lock, flags);
- return err;
-}
-
-int ieee80211_wx_get_auth(struct net_device *dev,
- struct iw_request_info *info,
- union iwreq_data *wrqu,
- char *extra)
-{
- struct ieee80211_device *ieee = netdev_priv(dev);
- unsigned long flags;
- int err = 0;
-
- spin_lock_irqsave(&ieee->lock, flags);
-
- switch (wrqu->param.flags & IW_AUTH_INDEX) {
- case IW_AUTH_WPA_VERSION:
- case IW_AUTH_CIPHER_PAIRWISE:
- case IW_AUTH_CIPHER_GROUP:
- case IW_AUTH_KEY_MGMT:
- case IW_AUTH_TKIP_COUNTERMEASURES: /* FIXME */
- case IW_AUTH_80211_AUTH_ALG: /* FIXME */
- /*
- * Host AP driver does not use these parameters and allows
- * wpa_supplicant to control them internally.
- */
- err = -EOPNOTSUPP;
- break;
- case IW_AUTH_DROP_UNENCRYPTED:
- wrqu->param.value = ieee->drop_unencrypted;
- break;
- case IW_AUTH_WPA_ENABLED:
- wrqu->param.value = ieee->wpa_enabled;
- break;
- case IW_AUTH_RX_UNENCRYPTED_EAPOL:
- wrqu->param.value = ieee->ieee802_1x;
- break;
- default:
- err = -EOPNOTSUPP;
- break;
- }
- spin_unlock_irqrestore(&ieee->lock, flags);
- return err;
-}
-
EXPORT_SYMBOL(ieee80211_wx_set_encodeext);
EXPORT_SYMBOL(ieee80211_wx_get_encodeext);

EXPORT_SYMBOL(ieee80211_wx_get_scan);
EXPORT_SYMBOL(ieee80211_wx_set_encode);
EXPORT_SYMBOL(ieee80211_wx_get_encode);
-
-EXPORT_SYMBOL_GPL(ieee80211_wx_set_auth);
-EXPORT_SYMBOL_GPL(ieee80211_wx_get_auth);

2008-04-21 09:12:05

by Johannes Berg

[permalink] [raw]

Subject: Re: [RFC: 2.6 patch] remove ieee80211_wx_{get,set}_auth()

---

On Mon, 2008-04-21 at 11:48 +0300, Adrian Bunk wrote:
> After the bcm43xx removal ieee80211_wx_{get,set}_auth() were no longer
> used.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
>
> include/net/ieee80211.h | 8 ---
> net/ieee80211/ieee80211_wx.c | 89 -----------------------------------
> 2 files changed, 97 deletions(-)

Interesting. I thought those would have been in softmac, removal sounds
fine to me but I don't use the ieee80211 stack.

johannes

---

Attachments:

signature.asc (828.00 B)
This is a digitally signed message part

2008-04-21 16:57:19

by Dan Williams

[permalink] [raw]

Subject: Re: [RFC: 2.6 patch] remove ieee80211_wx_{get,set}_auth()

---

On Mon, 2008-04-21 at 11:11 +0200, Johannes Berg wrote:
> On Mon, 2008-04-21 at 11:48 +0300, Adrian Bunk wrote:
> > After the bcm43xx removal ieee80211_wx_{get,set}_auth() were no longer
> > used.
> >
> > Signed-off-by: Adrian Bunk <[email protected]>
> >
> > ---
> >
> > include/net/ieee80211.h | 8 ---
> > net/ieee80211/ieee80211_wx.c | 89 -----------------------------------
> > 2 files changed, 97 deletions(-)
>
> Interesting. I thought those would have been in softmac, removal sounds
> fine to me but I don't use the ieee80211 stack.

The only other two users of ieee80211 are ipw2100 and ipw2200, and they
both appear to implement the SIOCxIWAUTH calls privately. So I think
these can go to the function slaughterhouse. If somebody wants to unify
them later it would be better to start fresh anyway.

Dan