diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-04-19 13:57:45 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:57:17 -0400 |
commit | 691597cb26f236ac7471f1adf925a134c86799d6 (patch) | |
tree | e89d91e496af082711b7c0789aaf0a985e7ba964 /net/mac80211/mlme.c | |
parent | d726405af6c8c81d2ee5e6a29301c68b9d4c574f (diff) |
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 <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index a16c9d724be1..428742d7f440 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -2338,9 +2338,6 @@ int ieee80211_sta_deauthenticate(struct ieee80211_sub_if_data *sdata, u16 reason | |||
2338 | printk(KERN_DEBUG "%s: deauthenticating by local choice (reason=%d)\n", | 2338 | printk(KERN_DEBUG "%s: deauthenticating by local choice (reason=%d)\n", |
2339 | sdata->dev->name, reason); | 2339 | sdata->dev->name, reason); |
2340 | 2340 | ||
2341 | if (sdata->vif.type != NL80211_IFTYPE_STATION) | ||
2342 | return -EINVAL; | ||
2343 | |||
2344 | ieee80211_set_disassoc(sdata, true, true, reason); | 2341 | ieee80211_set_disassoc(sdata, true, true, reason); |
2345 | return 0; | 2342 | return 0; |
2346 | } | 2343 | } |
@@ -2352,9 +2349,6 @@ int ieee80211_sta_disassociate(struct ieee80211_sub_if_data *sdata, u16 reason) | |||
2352 | printk(KERN_DEBUG "%s: disassociating by local choice (reason=%d)\n", | 2349 | printk(KERN_DEBUG "%s: disassociating by local choice (reason=%d)\n", |
2353 | sdata->dev->name, reason); | 2350 | sdata->dev->name, reason); |
2354 | 2351 | ||
2355 | if (sdata->vif.type != NL80211_IFTYPE_STATION) | ||
2356 | return -EINVAL; | ||
2357 | |||
2358 | if (!(ifmgd->flags & IEEE80211_STA_ASSOCIATED)) | 2352 | if (!(ifmgd->flags & IEEE80211_STA_ASSOCIATED)) |
2359 | return -ENOLINK; | 2353 | return -ENOLINK; |
2360 | 2354 | ||