remove wext handlers from mac80211/iwm
Johannes Berg
maintainercover remove wext handlers from mac80211/iwm
Since we've moved almost everything over, we can also move over the handlers array and have cfg80211 automatically assign it where appropriate.
johannes
Johannes Berg
maintainerPATCH 1/4 cfg80211: combine iwfreq implementations
Until now we implemented iwfreq for managed mode, we needed to keep the implementations separate, but now that we have all versions implemented we can combine them and export just one handler.
--- drivers/net/wireless/iwmc3200wifi/wext.c | 34 -------------- include/net/cfg80211.h | 20 ++------ net/mac80211/wext.c | 73 ------------------------------- net/wireless/core.h | 3 + net/wireless/ibss.c | 5 -- net/wireless/nl80211.c | 2 net/wireless/wext-compat.c | 54 ++++++++++++++++++++++ net/wireless/wext-compat.h | 21 ++++++++ net/wireless/wext-sme.c | 5 -- 9 files changed, 91 insertions(+), 126 deletions(-)
include/net/cfg80211.h +6 -14
@@ -1595,12 +1595,6 @@ int cfg80211_wext_siwmlme(struct net_devint cfg80211_wext_giwrange (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *extra); -int cfg80211_ibss_wext_siwfreq (struct net_device *dev, -struct iw_request_info *info, -struct iw_freq *freq,char *extra); -int cfg80211_ibss_wext_giwfreq (struct net_device *dev, -struct iw_request_info *info, -struct iw_freq *freq,char *extra);int cfg80211_ibss_wext_siwessid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *ssid);
@@ -1614,12 +1608,6 @@ int cfg80211_ibss_wext_giwap(struct net_struct iw_request_info *info, struct sockaddr *ap_addr, char *extra); -int cfg80211_mgd_wext_siwfreq (struct net_device *dev, -struct iw_request_info *info, -struct iw_freq *freq,char *extra); -int cfg80211_mgd_wext_giwfreq (struct net_device *dev, -struct iw_request_info *info, -struct iw_freq *freq,char *extra);int cfg80211_mgd_wext_siwessid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *ssid);
@@ -1642,8 +1630,12 @@ int cfg80211_wext_giwauth(struct net_devstruct iw_request_info *info, struct iw_param *data, char *extra); -struct ieee80211_channel *cfg80211_wext_freq (struct wiphy *wiphy, -struct iw_freq *freq); +int cfg80211_wext_siwfreq (struct net_device *dev, +struct iw_request_info *info, +struct iw_freq *freq,char *extra); +int cfg80211_wext_giwfreq (struct net_device *dev, +struct iw_request_info *info, +struct iw_freq *freq,char *extra); int cfg80211_wext_siwrate(struct net_device *dev, struct iw_request_info *info,
net/mac80211/wext.c +2 -71
85 lines not on this page · raw message
net/wireless/ibss.c +1 -4
@@ -7,6 +7,7 @@#include <linux/etherdevice.h> #include <linux/if_arp.h> #include <net/cfg80211.h> +#include "wext-compat.h" #include "nl80211.h"
@@ -312,8 +313,6 @@ int cfg80211_ibss_wext_siwfreq(struct nereturn err; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_ibss_wext_siwfreq); int cfg80211_ibss_wext_giwfreq(struct net_device *dev, struct iw_request_info *info,
@@ -342,8 +341,6 @@ int cfg80211_ibss_wext_giwfreq(struct ne/* no channel if not joining */ return -EINVAL ; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_ibss_wext_giwfreq); int cfg80211_ibss_wext_siwessid(struct net_device *dev, struct iw_request_info *info,
net/wireless/wext-compat.h new file +21 -0
@@ -0,0 +1,21 @@ +#ifndef __WEXT_COMPAT +#define __WEXT_COMPAT + +int cfg80211_ibss_wext_siwfreq (struct net_device *dev, +struct iw_request_info *info, +struct iw_freq *freq,char *extra); +int cfg80211_ibss_wext_giwfreq (struct net_device *dev, +struct iw_request_info *info, +struct iw_freq *freq,char *extra); + +int cfg80211_mgd_wext_siwfreq (struct net_device *dev, +struct iw_request_info *info, +struct iw_freq *freq,char *extra); +int cfg80211_mgd_wext_giwfreq (struct net_device *dev, +struct iw_request_info *info, +struct iw_freq *freq,char *extra); + +struct ieee80211_channel *cfg80211_wext_freq (struct wiphy *wiphy, +struct iw_freq *freq); + +#endif /* __WEXT_COMPAT */
net/wireless/wext-sme.c +1 -4
@@ -8,6 +8,7 @@#include <linux/etherdevice.h> #include <linux/if_arp.h> #include <net/cfg80211.h> +#include "wext-compat.h" #include "nl80211.h" int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
@@ -108,8 +109,6 @@ int cfg80211_mgd_wext_siwfreq(struct netcfg80211_unlock_rdev (rdev);return err; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_mgd_wext_siwfreq); int cfg80211_mgd_wext_giwfreq(struct net_device *dev, struct iw_request_info *info,
@@ -138,8 +137,6 @@ int cfg80211_mgd_wext_giwfreq(struct net/* no channel if not joining */ return -EINVAL ; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_mgd_wext_giwfreq); int cfg80211_mgd_wext_siwessid(struct net_device *dev, struct iw_request_info *info,
net/wireless/core.h +3 -0
@@ -66,6 +66,9 @@ struct cfg80211_registered_device {struct work_struct conn_work;struct work_struct event_work; +/* current channel */ +struct ieee80211_channel *channel; +#ifdef CONFIG_CFG80211_DEBUGFS /* Debugfs entries */ struct wiphy_debugfsdentries {
net/wireless/nl80211.c +2 -0
@@ -757,6 +757,8 @@ static int nl80211_set_wiphy(struct sk_b channel_type);if (result) goto bad_res; + + rdev->channel = chan; } changed =0 ;
net/wireless/wext-compat.c +53 -1
72 lines not on this page · raw message
drivers/net/wireless/iwmc3200wifi/wext.c +2 -32
@@ -27,36 +27,6 @@#include "iwm.h" #include "commands.h" -static int iwm_wext_siwfreq (struct net_device *dev, -struct iw_request_info *info, -struct iw_freq *freq,char *extra) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); - -switch (iwm->conf.mode) { -case UMAC_MODE_IBSS : -return cfg80211_ibss_wext_siwfreq (dev, info, freq, extra); -default : -return -EOPNOTSUPP ; - } -} - -static int iwm_wext_giwfreq (struct net_device *dev, -struct iw_request_info *info, -struct iw_freq *freq,char *extra) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); - -switch (iwm->conf.mode) { -case UMAC_MODE_IBSS : -return cfg80211_ibss_wext_giwfreq (dev, info, freq, extra); -case UMAC_MODE_BSS : -return cfg80211_mgd_wext_giwfreq (dev, info, freq, extra); -default : -return -EOPNOTSUPP ; - } -} -static int iwm_wext_siwap (struct net_device *dev,struct iw_request_info *info,struct sockaddr *ap_addr,char *extra) {
@@ -125,8 +95,8 @@ static const iw_handler iwm_handlers[] = (iw_handler ) cfg80211_wext_giwname,/* SIOCGIWNAME */ (iw_handler )NULL ,/* SIOCSIWNWID */ (iw_handler )NULL ,/* SIOCGIWNWID */ - (iw_handler ) iwm_wext_siwfreq,/* SIOCSIWFREQ */ - (iw_handler ) iwm_wext_giwfreq,/* SIOCGIWFREQ */ + (iw_handler ) cfg80211_wext_siwfreq,/* SIOCSIWFREQ */ + (iw_handler ) cfg80211_wext_giwfreq,/* SIOCGIWFREQ */ (iw_handler ) cfg80211_wext_siwmode,/* SIOCSIWMODE */ (iw_handler ) cfg80211_wext_giwmode,/* SIOCGIWMODE */ (iw_handler) NULL, /* SIOCSIWSENS */
Johannes Berg
maintainerPATCH 2/4 cfg80211: combine IWAP handlers
In reply to Johannes BergSince we now have IWAP handlers for all modes, we can combine them into one.
--- drivers/net/wireless/iwmc3200wifi/wext.c | 34 +------------------- include/net/cfg80211.h | 24 +++----------- net/mac80211/wext.c | 41 +----------------------- net/wireless/ibss.c | 4 -- net/wireless/wext-compat.c | 52 ++++++++++++++++++++++++++----- net/wireless/wext-compat.h | 12 +++++++ net/wireless/wext-sme.c | 4 -- 7 files changed, 66 insertions(+), 105 deletions(-)
include/net/cfg80211.h +6 -18
@@ -1601,12 +1601,6 @@ int cfg80211_ibss_wext_siwessid(struct nint cfg80211_ibss_wext_giwessid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *ssid); -int cfg80211_ibss_wext_siwap (struct net_device *dev, -struct iw_request_info *info, -struct sockaddr *ap_addr,char *extra); -int cfg80211_ibss_wext_giwap (struct net_device *dev, -struct iw_request_info *info, -struct sockaddr *ap_addr,char *extra); int cfg80211_mgd_wext_siwessid(struct net_device *dev, struct iw_request_info *info,
@@ -1614,12 +1608,6 @@ int cfg80211_mgd_wext_siwessid(struct neint cfg80211_mgd_wext_giwessid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *ssid); -int cfg80211_mgd_wext_siwap (struct net_device *dev, -struct iw_request_info *info, -struct sockaddr *ap_addr,char *extra); -int cfg80211_mgd_wext_giwap (struct net_device *dev, -struct iw_request_info *info, -struct sockaddr *ap_addr,char *extra);int cfg80211_wext_siwgenie (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *extra);
@@ -1686,12 +1674,12 @@ int cfg80211_wext_giwpower(struct net_destruct iw_request_info *info, struct iw_param *wrq, char *extra); -int cfg80211_wds_wext_siwap (struct net_device *dev, -struct iw_request_info *info, -struct sockaddr *addr,char *extra); -int cfg80211_wds_wext_giwap (struct net_device *dev, -struct iw_request_info *info, -struct sockaddr *addr,char *extra); +int cfg80211_wext_siwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *ap_addr,char *extra); +int cfg80211_wext_giwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *ap_addr,char *extra);/* * callbacks for asynchronous cfg80211 methods, notification
net/mac80211/wext.c +2 -39
53 lines not on this page · raw message
net/wireless/wext-compat.c +44 -8
74 lines not on this page · raw message
net/wireless/wext-compat.h +12 -0
@@ -7,6 +7,12 @@ int cfg80211_ibss_wext_siwfreq(struct neint cfg80211_ibss_wext_giwfreq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra); +int cfg80211_ibss_wext_siwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *ap_addr,char *extra); +int cfg80211_ibss_wext_giwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *ap_addr,char *extra); int cfg80211_mgd_wext_siwfreq(struct net_device *dev, struct iw_request_info *info,
@@ -14,6 +20,12 @@ int cfg80211_mgd_wext_siwfreq(struct netint cfg80211_mgd_wext_giwfreq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra); +int cfg80211_mgd_wext_siwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *ap_addr,char *extra); +int cfg80211_mgd_wext_giwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *ap_addr,char *extra);struct ieee80211_channel *cfg80211_wext_freq (struct wiphy *wiphy,struct iw_freq *freq);
net/wireless/ibss.c +0 -4
@@ -466,8 +466,6 @@ int cfg80211_ibss_wext_siwap(struct net_return err; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_ibss_wext_siwap); int cfg80211_ibss_wext_giwap(struct net_device *dev, struct iw_request_info *info,
@@ -493,6 +491,4 @@ int cfg80211_ibss_wext_giwap(struct net_ return 0; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_ibss_wext_giwap);#endif
net/wireless/wext-sme.c +0 -4
@@ -273,8 +273,6 @@ int cfg80211_mgd_wext_siwap(struct net_dcfg80211_unlock_rdev (wiphy_to_dev (wdev->wiphy));return err; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_mgd_wext_siwap); int cfg80211_mgd_wext_giwap(struct net_device *dev, struct iw_request_info *info,
@@ -299,8 +297,6 @@ int cfg80211_mgd_wext_giwap(struct net_dreturn 0 ; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_mgd_wext_giwap); int cfg80211_wext_siwgenie(struct net_device *dev, struct iw_request_info *info,
drivers/net/wireless/iwmc3200wifi/wext.c +2 -32
@@ -27,36 +27,6 @@#include "iwm.h" #include "commands.h" -static int iwm_wext_siwap (struct net_device *dev,struct iw_request_info *info, -struct sockaddr *ap_addr,char *extra) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); - -switch (iwm->conf.mode) { -case UMAC_MODE_IBSS : -return cfg80211_ibss_wext_siwap (dev, info, ap_addr, extra); -case UMAC_MODE_BSS : -return cfg80211_mgd_wext_siwap (dev, info, ap_addr, extra); -default : -return -EOPNOTSUPP ; - } -} - -static int iwm_wext_giwap (struct net_device *dev,struct iw_request_info *info, -struct sockaddr *ap_addr,char *extra) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); - -switch (iwm->conf.mode) { -case UMAC_MODE_IBSS : -return cfg80211_ibss_wext_giwap (dev, info, ap_addr, extra); -case UMAC_MODE_BSS : -return cfg80211_mgd_wext_giwap (dev, info, ap_addr, extra); -default : -return -EOPNOTSUPP ; - } -} -static int iwm_wext_siwessid (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *ssid)
@@ -111,8 +81,8 @@ static const iw_handler iwm_handlers[] = (iw_handler )NULL ,/* SIOCGIWSPY */ (iw_handler )NULL ,/* SIOCSIWTHRSPY */ (iw_handler )NULL ,/* SIOCGIWTHRSPY */ - (iw_handler ) iwm_wext_siwap,/* SIOCSIWAP */ - (iw_handler ) iwm_wext_giwap,/* SIOCGIWAP */ + (iw_handler ) cfg80211_wext_siwap,/* SIOCSIWAP */ + (iw_handler ) cfg80211_wext_giwap,/* SIOCGIWAP */ (iw_handler )NULL ,/* SIOCSIWMLME */ (iw_handler )NULL ,/* SIOCGIWAPLIST */ (iw_handler) cfg80211_wext_siwscan, /* SIOCSIWSCAN */
Johannes Berg
maintainerPATCH 3/4 cfg80211: combine IWESSID handlers
In reply to Johannes BergSince we now have handlers IWESSID for all modes, we can combine them into one.
--- drivers/net/wireless/iwmc3200wifi/wext.c | 36 +------------------------------ include/net/cfg80211.h | 20 +++++------------ net/mac80211/wext.c | 35 +----------------------------- net/wireless/ibss.c | 4 --- net/wireless/wext-compat.c | 34 +++++++++++++++++++++++++++++ net/wireless/wext-compat.h | 12 ++++++++++ net/wireless/wext-sme.c | 4 --- 7 files changed, 56 insertions(+), 89 deletions(-)
include/net/cfg80211.h +6 -14
@@ -1595,19 +1595,6 @@ int cfg80211_wext_siwmlme(struct net_devint cfg80211_wext_giwrange (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *extra); -int cfg80211_ibss_wext_siwessid (struct net_device *dev, -struct iw_request_info *info, -struct iw_point *data,char *ssid); -int cfg80211_ibss_wext_giwessid (struct net_device *dev, -struct iw_request_info *info, -struct iw_point *data,char *ssid); - -int cfg80211_mgd_wext_siwessid (struct net_device *dev, -struct iw_request_info *info, -struct iw_point *data,char *ssid); -int cfg80211_mgd_wext_giwessid (struct net_device *dev, -struct iw_request_info *info, -struct iw_point *data,char *ssid);int cfg80211_wext_siwgenie (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *extra);
@@ -1624,7 +1611,12 @@ int cfg80211_wext_siwfreq(struct net_devint cfg80211_wext_giwfreq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra); - +int cfg80211_wext_siwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid); +int cfg80211_wext_giwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid);int cfg80211_wext_siwrate (struct net_device *dev,struct iw_request_info *info,struct iw_param *rate,char *extra);
net/wireless/wext-compat.c +34 -0
@@ -1363,3 +1363,37 @@ int cfg80211_wext_giwap(struct net_devic } }EXPORT_SYMBOL_GPL (cfg80211_wext_giwap); + +int cfg80211_wext_siwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid) +{ +struct wireless_dev *wdev = dev->ieee80211_ptr; + +switch (wdev->iftype) { +case NL80211_IFTYPE_ADHOC : +return cfg80211_ibss_wext_siwessid (dev, info, data, ssid); +case NL80211_IFTYPE_STATION : +return cfg80211_mgd_wext_siwessid (dev, info, data, ssid); +default : +return -EOPNOTSUPP ; + } +} +EXPORT_SYMBOL_GPL (cfg80211_wext_siwessid); + +int cfg80211_wext_giwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid) +{ +struct wireless_dev *wdev = dev->ieee80211_ptr; + +switch (wdev->iftype) { +case NL80211_IFTYPE_ADHOC : +return cfg80211_ibss_wext_giwessid (dev, info, data, ssid); +case NL80211_IFTYPE_STATION : +return cfg80211_mgd_wext_giwessid (dev, info, data, ssid); +default : +return -EOPNOTSUPP ; + } +} +EXPORT_SYMBOL_GPL (cfg80211_wext_giwessid);
net/wireless/wext-compat.h +12 -0
@@ -13,6 +13,12 @@ int cfg80211_ibss_wext_siwap(struct net_int cfg80211_ibss_wext_giwap (struct net_device *dev,struct iw_request_info *info,struct sockaddr *ap_addr,char *extra); +int cfg80211_ibss_wext_siwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid); +int cfg80211_ibss_wext_giwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid); int cfg80211_mgd_wext_siwfreq(struct net_device *dev, struct iw_request_info *info,
@@ -26,6 +32,12 @@ int cfg80211_mgd_wext_siwap(struct net_dint cfg80211_mgd_wext_giwap (struct net_device *dev,struct iw_request_info *info,struct sockaddr *ap_addr,char *extra); +int cfg80211_mgd_wext_siwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid); +int cfg80211_mgd_wext_giwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid);struct ieee80211_channel *cfg80211_wext_freq (struct wiphy *wiphy,struct iw_freq *freq);
net/mac80211/wext.c +2 -33
@@ -27,37 +27,6 @@#include "aes_ccm.h" -static int ieee80211_ioctl_siwessid (struct net_device *dev, -struct iw_request_info *info, -struct iw_point *data,char *ssid) -{ -struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); - -if (sdata->vif.type ==NL80211_IFTYPE_ADHOC ) -return cfg80211_ibss_wext_siwessid (dev, info, data, ssid); -else if (sdata->vif.type ==NL80211_IFTYPE_STATION ) -return cfg80211_mgd_wext_siwessid (dev, info, data, ssid); - -return -EOPNOTSUPP ; -} - - -static int ieee80211_ioctl_giwessid (struct net_device *dev, -struct iw_request_info *info, -struct iw_point *data,char *ssid) -{ -struct ieee80211_sub_if_data *sdata; - - sdata =IEEE80211_DEV_TO_SUB_IF (dev); - -if (sdata->vif.type ==NL80211_IFTYPE_ADHOC ) -return cfg80211_ibss_wext_giwessid (dev, info, data, ssid); -else if (sdata->vif.type ==NL80211_IFTYPE_STATION ) -return cfg80211_mgd_wext_giwessid (dev, info, data, ssid); - -return -EOPNOTSUPP ; -} -/* Structures to export the Wireless Handlers */
@@ -89,8 +58,8 @@ static const iw_handler ieee80211_handle (iw_handler )NULL ,/* SIOCGIWAPLIST */ (iw_handler ) cfg80211_wext_siwscan,/* SIOCSIWSCAN */ (iw_handler ) cfg80211_wext_giwscan,/* SIOCGIWSCAN */ - (iw_handler ) ieee80211_ioctl_siwessid,/* SIOCSIWESSID */ - (iw_handler ) ieee80211_ioctl_giwessid,/* SIOCGIWESSID */ + (iw_handler ) cfg80211_wext_siwessid,/* SIOCSIWESSID */ + (iw_handler ) cfg80211_wext_giwessid,/* SIOCGIWESSID */ (iw_handler )NULL ,/* SIOCSIWNICKN */ (iw_handler )NULL ,/* SIOCGIWNICKN */ (iw_handler) NULL, /* -- hole -- */
net/wireless/wext-sme.c +0 -4
@@ -192,8 +192,6 @@ int cfg80211_mgd_wext_siwessid(struct necfg80211_unlock_rdev (wiphy_to_dev (wdev->wiphy));return err; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_mgd_wext_siwessid); int cfg80211_mgd_wext_giwessid(struct net_device *dev, struct iw_request_info *info,
@@ -218,8 +216,6 @@ int cfg80211_mgd_wext_giwessid(struct nereturn 0 ; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_mgd_wext_giwessid); int cfg80211_mgd_wext_siwap(struct net_device *dev, struct iw_request_info *info,
net/wireless/ibss.c +0 -4
@@ -381,8 +381,6 @@ int cfg80211_ibss_wext_siwessid(struct nreturn err; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_ibss_wext_siwessid); int cfg80211_ibss_wext_giwessid(struct net_device *dev, struct iw_request_info *info,
@@ -410,8 +408,6 @@ int cfg80211_ibss_wext_giwessid(struct nreturn 0 ; } -/* temporary symbol - mark GPL - in the future the handler won't be */ -EXPORT_SYMBOL_GPL (cfg80211_ibss_wext_giwessid); int cfg80211_ibss_wext_siwap(struct net_device *dev, struct iw_request_info *info,
drivers/net/wireless/iwmc3200wifi/wext.c +2 -34
@@ -27,38 +27,6 @@#include "iwm.h" #include "commands.h" -static int iwm_wext_siwessid (struct net_device *dev, -struct iw_request_info *info, -struct iw_point *data,char *ssid) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); - -switch (iwm->conf.mode) { -case UMAC_MODE_IBSS : -return cfg80211_ibss_wext_siwessid (dev, info, data, ssid); -case UMAC_MODE_BSS : -return cfg80211_mgd_wext_siwessid (dev, info, data, ssid); -default : -return -EOPNOTSUPP ; - } -} - -static int iwm_wext_giwessid (struct net_device *dev, -struct iw_request_info *info, -struct iw_point *data,char *ssid) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); - -switch (iwm->conf.mode) { -case UMAC_MODE_IBSS : -return cfg80211_ibss_wext_giwessid (dev, info, data, ssid); -case UMAC_MODE_BSS : -return cfg80211_mgd_wext_giwessid (dev, info, data, ssid); -default : -return -EOPNOTSUPP ; - } -} -static const iw_handler iwm_handlers[] = { (iw_handler )NULL ,/* SIOCSIWCOMMIT */
@@ -87,8 +55,8 @@ static const iw_handler iwm_handlers[] = (iw_handler )NULL ,/* SIOCGIWAPLIST */ (iw_handler ) cfg80211_wext_siwscan,/* SIOCSIWSCAN */ (iw_handler ) cfg80211_wext_giwscan,/* SIOCGIWSCAN */ - (iw_handler ) iwm_wext_siwessid,/* SIOCSIWESSID */ - (iw_handler ) iwm_wext_giwessid,/* SIOCGIWESSID */ + (iw_handler ) cfg80211_wext_siwessid,/* SIOCSIWESSID */ + (iw_handler ) cfg80211_wext_giwessid,/* SIOCGIWESSID */ (iw_handler )NULL ,/* SIOCSIWNICKN */ (iw_handler )NULL ,/* SIOCGIWNICKN */ (iw_handler) NULL, /* -- hole -- */
Johannes Berg
maintainerPATCH 4/4 cfg80211: self-contained wext handling where possible
In reply to Johannes BergFinally! This is what you've all been waiting for!
This patch makes cfg80211 take care of wext emulation _completely_ by itself, drivers that don't need things cfg80211 doesn't do yet don't even need to be aware of wireless extensions.
This means we can also clean up mac80211's and iwm's Kconfig and make it possible to build them w/o wext now!
RIP wext.
--- drivers/net/wireless/iwmc3200wifi/Kconfig | 1 drivers/net/wireless/iwmc3200wifi/Makefile | 2 drivers/net/wireless/iwmc3200wifi/iwm.h | 2 drivers/net/wireless/iwmc3200wifi/netdev.c | 1 drivers/net/wireless/iwmc3200wifi/wext.c | 95 ---------------------------- net/mac80211/Kconfig | 1 net/mac80211/Makefile | 1 net/mac80211/ieee80211_i.h | 4 - net/mac80211/iface.c | 1 net/mac80211/scan.c | 1 net/mac80211/wext.c | 98 ----------------------------- net/wireless/core.c | 3 net/wireless/mlme.c | 2 net/wireless/scan.c | 1 net/wireless/sme.c | 2 net/wireless/wext-compat.c | 40 +++++++++++ net/wireless/wext-compat.h | 5 + 17 files changed, 54 insertions(+), 206 deletions(-)
net/mac80211/wext.c deleted +0 -98
@@ -1,98 +0,0 @@ -/* -* Copyright 2002-2005, Instant802 Networks, Inc. -* Copyright 2005-2006, Devicescape Software, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#include <linux/module.h> -#include <linux/init.h> -#include <linux/netdevice.h> -#include <linux/types.h> -#include <linux/slab.h> -#include <linux/skbuff.h> -#include <linux/etherdevice.h> -#include <linux/if_arp.h> -#include <linux/wireless.h> -#include <net/iw_handler.h> -#include <asm/uaccess.h> - -#include <net/mac80211.h> -#include "ieee80211_i.h" -#include "led.h" -#include "rate.h" -#include "wpa.h" -#include "aes_ccm.h" - - - -/* Structures to export the Wireless Handlers */ - -static const iw_handler ieee80211_handler[] = -{ - (iw_handler )NULL ,/* SIOCSIWCOMMIT */ - (iw_handler ) cfg80211_wext_giwname,/* SIOCGIWNAME */ - (iw_handler )NULL ,/* SIOCSIWNWID */ - (iw_handler )NULL ,/* SIOCGIWNWID */ - (iw_handler ) cfg80211_wext_siwfreq,/* SIOCSIWFREQ */ - (iw_handler ) cfg80211_wext_giwfreq,/* SIOCGIWFREQ */ - (iw_handler ) cfg80211_wext_siwmode,/* SIOCSIWMODE */ - (iw_handler ) cfg80211_wext_giwmode,/* SIOCGIWMODE */ - (iw_handler )NULL ,/* SIOCSIWSENS */ - (iw_handler )NULL ,/* SIOCGIWSENS */ - (iw_handler )NULL /* not used */ ,/* SIOCSIWRANGE */ - (iw_handler ) cfg80211_wext_giwrange,/* SIOCGIWRANGE */ - (iw_handler )NULL /* not used */ ,/* SIOCSIWPRIV */ - (iw_handler )NULL /* kernel code */ ,/* SIOCGIWPRIV */ - (iw_handler )NULL /* not used */ ,/* SIOCSIWSTATS */ - (iw_handler )NULL /* kernel code */ ,/* SIOCGIWSTATS */ - (iw_handler )NULL ,/* SIOCSIWSPY */ - (iw_handler )NULL ,/* SIOCGIWSPY */ - (iw_handler )NULL ,/* SIOCSIWTHRSPY */ - (iw_handler )NULL ,/* SIOCGIWTHRSPY */ - (iw_handler ) cfg80211_wext_siwap,/* SIOCSIWAP */ - (iw_handler ) cfg80211_wext_giwap,/* SIOCGIWAP */ - (iw_handler ) cfg80211_wext_siwmlme,/* SIOCSIWMLME */ - (iw_handler )NULL ,/* SIOCGIWAPLIST */ - (iw_handler ) cfg80211_wext_siwscan,/* SIOCSIWSCAN */ - (iw_handler ) cfg80211_wext_giwscan,/* SIOCGIWSCAN */ - (iw_handler ) cfg80211_wext_siwessid,/* SIOCSIWESSID */ - (iw_handler ) cfg80211_wext_giwessid,/* SIOCGIWESSID */ - (iw_handler )NULL ,/* SIOCSIWNICKN */ - (iw_handler )NULL ,/* SIOCGIWNICKN */ - (iw_handler )NULL ,/* -- hole -- */ - (iw_handler )NULL ,/* -- hole -- */ - (iw_handler ) cfg80211_wext_siwrate,/* SIOCSIWRATE */ - (iw_handler ) cfg80211_wext_giwrate,/* SIOCGIWRATE */ - (iw_handler ) cfg80211_wext_siwrts,/* SIOCSIWRTS */ - (iw_handler ) cfg80211_wext_giwrts,/* SIOCGIWRTS */ - (iw_handler ) cfg80211_wext_siwfrag,/* SIOCSIWFRAG */ - (iw_handler ) cfg80211_wext_giwfrag,/* SIOCGIWFRAG */ - (iw_handler ) cfg80211_wext_siwtxpower,/* SIOCSIWTXPOW */ - (iw_handler ) cfg80211_wext_giwtxpower,/* SIOCGIWTXPOW */ - (iw_handler ) cfg80211_wext_siwretry,/* SIOCSIWRETRY */ - (iw_handler ) cfg80211_wext_giwretry,/* SIOCGIWRETRY */ - (iw_handler ) cfg80211_wext_siwencode,/* SIOCSIWENCODE */ - (iw_handler ) cfg80211_wext_giwencode,/* SIOCGIWENCODE */ - (iw_handler ) cfg80211_wext_siwpower,/* SIOCSIWPOWER */ - (iw_handler ) cfg80211_wext_giwpower,/* SIOCGIWPOWER */ - (iw_handler )NULL ,/* -- hole -- */ - (iw_handler )NULL ,/* -- hole -- */ - (iw_handler ) cfg80211_wext_siwgenie,/* SIOCSIWGENIE */ - (iw_handler )NULL ,/* SIOCGIWGENIE */ - (iw_handler ) cfg80211_wext_siwauth,/* SIOCSIWAUTH */ - (iw_handler ) cfg80211_wext_giwauth,/* SIOCGIWAUTH */ - (iw_handler ) cfg80211_wext_siwencodeext,/* SIOCSIWENCODEEXT */ - (iw_handler )NULL ,/* SIOCGIWENCODEEXT */ - (iw_handler )NULL ,/* SIOCSIWPMKSA */ - (iw_handler )NULL ,/* -- hole -- */ -}; - -const struct iw_handler_def ieee80211_iw_handler_def = -{ - .num_standard =ARRAY_SIZE (ieee80211_handler), - .standard = (iw_handler *) ieee80211_handler, - .get_wireless_stats = cfg80211_wireless_stats, -};
net/wireless/wext-compat.c +40 -0
@@ -1397,3 +1397,43 @@ int cfg80211_wext_giwessid(struct net_de } }EXPORT_SYMBOL_GPL (cfg80211_wext_giwessid); + +static const iw_handler cfg80211_handlers[] = { + [IW_IOCTL_IDX (SIOCGIWNAME )] = (iw_handler ) cfg80211_wext_giwname, + [IW_IOCTL_IDX (SIOCSIWFREQ )] = (iw_handler ) cfg80211_wext_siwfreq, + [IW_IOCTL_IDX (SIOCGIWFREQ )] = (iw_handler ) cfg80211_wext_giwfreq, + [IW_IOCTL_IDX (SIOCSIWMODE )] = (iw_handler ) cfg80211_wext_siwmode, + [IW_IOCTL_IDX (SIOCGIWMODE )] = (iw_handler ) cfg80211_wext_giwmode, + [IW_IOCTL_IDX (SIOCGIWRANGE )] = (iw_handler ) cfg80211_wext_giwrange, + [IW_IOCTL_IDX (SIOCSIWAP )] = (iw_handler ) cfg80211_wext_siwap, + [IW_IOCTL_IDX (SIOCGIWAP )] = (iw_handler ) cfg80211_wext_giwap, + [IW_IOCTL_IDX (SIOCSIWMLME )] = (iw_handler ) cfg80211_wext_siwmlme, + [IW_IOCTL_IDX (SIOCSIWSCAN )] = (iw_handler ) cfg80211_wext_siwscan, + [IW_IOCTL_IDX (SIOCGIWSCAN )] = (iw_handler ) cfg80211_wext_giwscan, + [IW_IOCTL_IDX (SIOCSIWESSID )] = (iw_handler ) cfg80211_wext_siwessid, + [IW_IOCTL_IDX (SIOCGIWESSID )] = (iw_handler ) cfg80211_wext_giwessid, + [IW_IOCTL_IDX (SIOCSIWRATE )] = (iw_handler ) cfg80211_wext_siwrate, + [IW_IOCTL_IDX (SIOCGIWRATE )] = (iw_handler ) cfg80211_wext_giwrate, + [IW_IOCTL_IDX (SIOCSIWRTS )] = (iw_handler ) cfg80211_wext_siwrts, + [IW_IOCTL_IDX (SIOCGIWRTS )] = (iw_handler ) cfg80211_wext_giwrts, + [IW_IOCTL_IDX (SIOCSIWFRAG )] = (iw_handler ) cfg80211_wext_siwfrag, + [IW_IOCTL_IDX (SIOCGIWFRAG )] = (iw_handler ) cfg80211_wext_giwfrag, + [IW_IOCTL_IDX (SIOCSIWTXPOW )] = (iw_handler ) cfg80211_wext_siwtxpower, + [IW_IOCTL_IDX (SIOCGIWTXPOW )] = (iw_handler ) cfg80211_wext_giwtxpower, + [IW_IOCTL_IDX (SIOCSIWRETRY )] = (iw_handler ) cfg80211_wext_siwretry, + [IW_IOCTL_IDX (SIOCGIWRETRY )] = (iw_handler ) cfg80211_wext_giwretry, + [IW_IOCTL_IDX (SIOCSIWENCODE )] = (iw_handler ) cfg80211_wext_siwencode, + [IW_IOCTL_IDX (SIOCGIWENCODE )] = (iw_handler ) cfg80211_wext_giwencode, + [IW_IOCTL_IDX (SIOCSIWPOWER )] = (iw_handler ) cfg80211_wext_siwpower, + [IW_IOCTL_IDX (SIOCGIWPOWER )] = (iw_handler ) cfg80211_wext_giwpower, + [IW_IOCTL_IDX (SIOCSIWGENIE )] = (iw_handler ) cfg80211_wext_siwgenie, + [IW_IOCTL_IDX (SIOCSIWAUTH )] = (iw_handler ) cfg80211_wext_siwauth, + [IW_IOCTL_IDX (SIOCGIWAUTH )] = (iw_handler ) cfg80211_wext_giwauth, + [IW_IOCTL_IDX (SIOCSIWENCODEEXT )]= (iw_handler ) cfg80211_wext_siwencodeext, +}; + +const struct iw_handler_def cfg80211_wext_handler = { + .num_standard =ARRAY_SIZE (cfg80211_handlers), + .standard = cfg80211_handlers, + .get_wireless_stats = cfg80211_wireless_stats, +};
net/wireless/wext-compat.h +5 -0
@@ -1,6 +1,9 @@#ifndef __WEXT_COMPAT#define __WEXT_COMPAT +#include <net/iw_handler.h> +#include <linux/wireless.h> +int cfg80211_ibss_wext_siwfreq (struct net_device *dev,struct iw_request_info *info,struct iw_freq *freq,char *extra);
@@ -42,4 +45,6 @@ int cfg80211_mgd_wext_giwessid(struct nestruct ieee80211_channel *cfg80211_wext_freq (struct wiphy *wiphy,struct iw_freq *freq); + +extern const struct iw_handler_def cfg80211_wext_handler;#endif /* __WEXT_COMPAT */
net/mac80211/Kconfig +0 -1
@@ -6,7 +6,6 @@ config MAC80211 select CRYPTO_ARC4 select CRYPTO_AES select CRC32 - select WIRELESS_EXT ---help--- This option enables the hardware independent IEEE 802.11 networking stack.
net/mac80211/Makefile +0 -1
@@ -3,7 +3,6 @@ obj-$(CONFIG_MAC80211) += mac80211.o # mac80211 objects mac80211-y := \ main.o \ - wext.o \ sta_info.o \ wep.o \ wpa.o \
net/mac80211/scan.c +0 -1
@@ -18,7 +18,6 @@#include <linux/if_arp.h> #include <linux/rtnetlink.h> #include <net/mac80211.h> -#include <net/iw_handler.h> #include "ieee80211_i.h" #include "driver-ops.h"
net/mac80211/ieee80211_i.h +0 -4
@@ -24,7 +24,6 @@#include <linux/spinlock.h> #include <linux/etherdevice.h> #include <net/cfg80211.h> -#include <net/iw_handler.h> #include <net/mac80211.h> #include "key.h" #include "sta_info.h"
@@ -951,9 +950,6 @@ void ieee80211_bss_info_change_notify(stvoid ieee80211_configure_filter (struct ieee80211_local *local);u32 ieee80211_reset_erp_info (struct ieee80211_sub_if_data *sdata); -/* wireless extensions */ -extern const struct iw_handler_def ieee80211_iw_handler_def; -/* STA code */ void ieee80211_sta_setup_sdata (struct ieee80211_sub_if_data *sdata); int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
net/mac80211/iface.c +0 -1
@@ -684,7 +684,6 @@ static void ieee80211_if_setup(struct ne {ether_setup (dev); dev->netdev_ops = &ieee80211_dataif_ops; - dev->wireless_handlers = &ieee80211_iw_handler_def; dev->destructor = free_netdev; }
net/wireless/scan.c +1 -0
@@ -14,6 +14,7 @@#include <net/iw_handler.h> #include "core.h" #include "nl80211.h" +#include "wext-compat.h" #define IEEE80211_SCAN_RESULT_EXPIRE (15 * HZ)
net/wireless/core.c +3 -0
@@ -19,6 +19,7 @@#include "core.h" #include "sysfs.h" #include "debugfs.h" +#include "wext-compat.h" /* name for sysfs, %d is appended */ #define PHY_NAME "phy"
@@ -665,6 +666,8 @@ static int cfg80211_netdev_notifier_call wdev->sme_state =CFG80211_SME_IDLE ;mutex_unlock (&rdev->devlist_mtx);#ifdef CONFIG_WIRELESS_EXT +if (!dev->wireless_handlers) + dev->wireless_handlers = &cfg80211_wext_handler; wdev->wext.default_key =-1 ; wdev->wext.default_mgmt_key =-1 ; wdev->wext.connect.auth_type =NL80211_AUTHTYPE_AUTOMATIC ;
net/wireless/sme.c +2 -0
@@ -8,6 +8,8 @@#include <linux/etherdevice.h> #include <linux/if_arp.h> #include <linux/workqueue.h> +#include <linux/wireless.h> +#include <net/iw_handler.h> #include <net/cfg80211.h> #include <net/rtnetlink.h> #include "nl80211.h"
net/wireless/mlme.c +2 -0
@@ -8,7 +8,9 @@#include <linux/module.h> #include <linux/netdevice.h> #include <linux/nl80211.h> +#include <linux/wireless.h> #include <net/cfg80211.h> +#include <net/iw_handler.h> #include "core.h" #include "nl80211.h"
drivers/net/wireless/iwmc3200wifi/Makefile +1 -1
@@ -1,5 +1,5 @@ obj-$(CONFIG_IWM) := iwmc3200wifi.o iwmc3200wifi-objs += main.o netdev.o rx.o tx.o sdio.o hal.o fw.o -iwmc3200wifi-objs += commands.o wext.o cfg80211.o eeprom.o +iwmc3200wifi-objs += commands.o cfg80211.o eeprom.o iwmc3200wifi-$(CONFIG_IWM_DEBUG) += debugfs.o
drivers/net/wireless/iwmc3200wifi/iwm.h +0 -2
@@ -306,8 +306,6 @@ static inline void *iwm_private(struct i#define skb_to_rx_info (s) ((struct iwm_rx_info *)(s->cb))#define skb_to_tx_info (s) ((struct iwm_tx_info *)s->cb) -extern const struct iw_handler_def iwm_iw_handler_def; -void *iwm_if_alloc (int sizeof_bus,struct device *dev,struct iwm_if_ops *if_ops);void iwm_if_free (struct iwm_priv *iwm);
drivers/net/wireless/iwmc3200wifi/netdev.c +0 -1
@@ -123,7 +123,6 @@ void *iwm_if_alloc(int sizeof_bus, struc } ndev->netdev_ops = &iwm_netdev_ops; - ndev->wireless_handlers = &iwm_iw_handler_def; ndev->ieee80211_ptr = wdev;SET_NETDEV_DEV (ndev,wiphy_dev (wdev->wiphy)); wdev->netdev = ndev;
drivers/net/wireless/iwmc3200wifi/wext.c deleted +0 -95
95 lines not on this page · raw message
drivers/net/wireless/iwmc3200wifi/Kconfig +0 -1
@@ -2,7 +2,6 @@ config IWM tristate "Intel Wireless Multicomm 3200 WiFi driver" depends on MMC && WLAN_80211 && EXPERIMENTAL depends on CFG80211 - select WIRELESS_EXT select FW_LOADER help The Intel Wireless Multicomm 3200 hardware is a combo