diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-09-29 17:27:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-07 16:39:43 -0400 |
commit | 3d23e349d807177eaf519d444677cee86b1a04cf (patch) | |
tree | e800dee247598e59185ddd2dd47d2ac6fe090b9c /net/wireless/nl80211.c | |
parent | bc974f4a230756faf4f69114f271de2e678b363b (diff) |
wext: refactor
Refactor wext to
* split out iwpriv handling
* split out iwspy handling
* split out procfs support
* allow cfg80211 to have wireless extensions compat code
w/o CONFIG_WIRELESS_EXT
After this, drivers need to
- select WIRELESS_EXT - for wext support
- select WEXT_PRIV - for iwpriv support
- select WEXT_SPY - for iwspy support
except cfg80211 -- which gets new hooks in wext-core.c
and can then get wext handlers without CONFIG_WIRELESS_EXT.
Wireless extensions procfs support is auto-selected
based on PROC_FS and anything that requires the wext core
(i.e. WIRELESS_EXT or CFG80211_WEXT).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r-- | net/wireless/nl80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index e0ecc9f153d4..14004e2ebd62 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -1264,7 +1264,7 @@ static int nl80211_set_key(struct sk_buff *skb, struct genl_info *info) | |||
1264 | if (!err) | 1264 | if (!err) |
1265 | err = func(&rdev->wiphy, dev, key.idx); | 1265 | err = func(&rdev->wiphy, dev, key.idx); |
1266 | 1266 | ||
1267 | #ifdef CONFIG_WIRELESS_EXT | 1267 | #ifdef CONFIG_CFG80211_WEXT |
1268 | if (!err) { | 1268 | if (!err) { |
1269 | if (func == rdev->ops->set_default_key) | 1269 | if (func == rdev->ops->set_default_key) |
1270 | dev->ieee80211_ptr->wext.default_key = key.idx; | 1270 | dev->ieee80211_ptr->wext.default_key = key.idx; |
@@ -1365,7 +1365,7 @@ static int nl80211_del_key(struct sk_buff *skb, struct genl_info *info) | |||
1365 | if (!err) | 1365 | if (!err) |
1366 | err = rdev->ops->del_key(&rdev->wiphy, dev, key.idx, mac_addr); | 1366 | err = rdev->ops->del_key(&rdev->wiphy, dev, key.idx, mac_addr); |
1367 | 1367 | ||
1368 | #ifdef CONFIG_WIRELESS_EXT | 1368 | #ifdef CONFIG_CFG80211_WEXT |
1369 | if (!err) { | 1369 | if (!err) { |
1370 | if (key.idx == dev->ieee80211_ptr->wext.default_key) | 1370 | if (key.idx == dev->ieee80211_ptr->wext.default_key) |
1371 | dev->ieee80211_ptr->wext.default_key = -1; | 1371 | dev->ieee80211_ptr->wext.default_key = -1; |