diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-03-09 00:52:21 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-03-09 00:52:21 +0400 |
commit | 3d5c203272b25c4391397247cdb0059a04fccddf (patch) | |
tree | 1cf51dc656c10fd7ea0c84c86afea1d73f3f76bc /drivers/net/wireless/ath | |
parent | 7da060c1c01b103d181dba39bce9bd141a945f99 (diff) | |
parent | 87f59c70ce6d1abeaaf97594835be29f746b81a0 (diff) | |
download | linux-3d5c203272b25c4391397247cdb0059a04fccddf.tar.xz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 752ffc4f4166..28c413f861a2 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -2990,13 +2990,15 @@ static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev, { struct ath6kl *ar = ath6kl_priv(dev); struct ath6kl_vif *vif = netdev_priv(dev); + int err; if (vif->nw_type != AP_NETWORK) return -EOPNOTSUPP; - /* Use this only for authorizing/unauthorizing a station */ - if (!(params->sta_flags_mask & BIT(NL80211_STA_FLAG_AUTHORIZED))) - return -EOPNOTSUPP; + err = cfg80211_check_station_change(wiphy, params, + CFG80211_STA_AP_MLME_CLIENT); + if (err) + return err; if (params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED)) return ath6kl_wmi_ap_set_mlme(ar->wmi, vif->fw_vif_idx, |