cfg80211/mac80211: move wext SIWMLME into cfg80211
Subsystems (2)
Johannes Berg
maintainerPATCH 1/1 cfg80211/mac80211: move wext SIWMLME into cfg80211
Since we have ->deauth and ->disassoc we can support the wext SIWMLME call directly without driver wext handlers.
Signed-off-by Johannes Berg <[email protected]>
--- include/net/cfg80211.h | 3 ++ net/mac80211/cfg.c | 12 +++-------- net/mac80211/mlme.c | 6 ----- net/mac80211/wext.c | 25 ------------------------ net/wireless/wext-compat.c | 46 ++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 53 insertions(+), 39 deletions(-)
net/mac80211/wext.c +1 -24
@@ -612,29 +612,6 @@ static int ieee80211_ioctl_giwretry(strureturn 0 ; } -static int ieee80211_ioctl_siwmlme (struct net_device *dev, -struct iw_request_info *info, -struct iw_point *data,char *extra) -{ -struct ieee80211_sub_if_data *sdata; -struct iw_mlme *mlme = (struct iw_mlme *) extra; - - sdata =IEEE80211_DEV_TO_SUB_IF (dev); -if (!(sdata->vif.type ==NL80211_IFTYPE_STATION )) -return -EINVAL ; - -switch (mlme->cmd) { -case IW_MLME_DEAUTH : -/* TODO: mlme->addr.sa_data */ -return ieee80211_sta_deauthenticate (sdata, mlme->reason_code); -case IW_MLME_DISASSOC : -/* TODO: mlme->addr.sa_data */ -return ieee80211_sta_disassociate (sdata, mlme->reason_code); -default : -return -EOPNOTSUPP ; - } -} - static int ieee80211_ioctl_siwencode(struct net_device *dev, struct iw_request_info *info,
@@ -1076,7 +1053,7 @@ static const iw_handler ieee80211_handle (iw_handler )NULL ,/* SIOCGIWTHRSPY */ (iw_handler ) ieee80211_ioctl_siwap,/* SIOCSIWAP */ (iw_handler ) ieee80211_ioctl_giwap,/* SIOCGIWAP */ - (iw_handler ) ieee80211_ioctl_siwmlme,/* SIOCSIWMLME */ + (iw_handler ) cfg80211_wext_siwmlme,/* SIOCSIWMLME */ (iw_handler )NULL ,/* SIOCGIWAPLIST */ (iw_handler ) cfg80211_wext_siwscan,/* SIOCSIWSCAN */ (iw_handler) cfg80211_wext_giwscan, /* SIOCGIWSCAN */
net/wireless/wext-compat.c +45 -1
61 lines not on this page · raw message
include/net/cfg80211.h +3 -0
@@ -833,6 +833,9 @@ int cfg80211_wext_siwscan(struct net_devint cfg80211_wext_giwscan (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *extra); +int cfg80211_wext_siwmlme (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *extra);int cfg80211_wext_giwrange (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *extra);
net/mac80211/mlme.c +0 -6
@@ -2307,9 +2307,6 @@ int ieee80211_sta_deauthenticate(structprintk (KERN_DEBUG "%s: deauthenticating by local choice (reason=%d)\n" , sdata->dev->name, reason); -if (sdata->vif.type !=NL80211_IFTYPE_STATION ) -return -EINVAL ; -ieee80211_set_disassoc (sdata, true, true, reason);return 0 ; }
@@ -2321,9 +2318,6 @@ int ieee80211_sta_disassociate(struct ieprintk (KERN_DEBUG "%s: disassociating by local choice (reason=%d)\n" , sdata->dev->name, reason); -if (sdata->vif.type !=NL80211_IFTYPE_STATION ) -return -EINVAL ; -if (!(ifmgd->flags &IEEE80211_STA_ASSOCIATED ))return -ENOLINK ;
net/mac80211/cfg.c +4 -8
@@ -1267,22 +1267,18 @@ static int ieee80211_assoc(struct wiphystatic int ieee80211_deauth (struct wiphy *wiphy,struct net_device *dev,struct cfg80211_deauth_request *req) { -struct ieee80211_sub_if_data *sdata; +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); - sdata =IEEE80211_DEV_TO_SUB_IF (dev); - -/* TODO: req->ie */ +/* TODO: req->ie, req->peer_addr */ return ieee80211_sta_deauthenticate (sdata, req->reason_code); }static int ieee80211_disassoc (struct wiphy *wiphy,struct net_device *dev,struct cfg80211_disassoc_request *req) { -struct ieee80211_sub_if_data *sdata; - - sdata =IEEE80211_DEV_TO_SUB_IF (dev); +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); -/* TODO: req->ie */ +/* TODO: req->ie, req->peer_addr */ return ieee80211_sta_disassociate (sdata, req->reason_code); }