diff options
| author | Johannes Berg | 2010-09-30 21:06:09 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-10-05 19:35:23 +0200 |
| commit | 663fcafd977f13e6483f7d4cf2ccdbc4fae81ed0 (patch) | |
| tree | b1c74fe389dff24d94c95eaeb3a52932f6671007 /net/mac80211/cfg.c | |
| parent | iwlwifi: change WARN_ON to IWL_WARN in iwl_mac_add_interface (diff) | |
| download | kernel-qcow2-linux-663fcafd977f13e6483f7d4cf2ccdbc4fae81ed0.tar.gz kernel-qcow2-linux-663fcafd977f13e6483f7d4cf2ccdbc4fae81ed0.tar.xz kernel-qcow2-linux-663fcafd977f13e6483f7d4cf2ccdbc4fae81ed0.zip | |
cfg80211/mac80211: allow management frame TX in AP mode
Enable management frame transmission and subscribing
to management frames through nl80211 in both cfg80211
and mac80211. Also update a few places that I forgot
to update for P2P-client mode previously, and fix a
small bug with non-action frames in this API.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 9e63fc28f859..a7a78f28ff6f 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1549,7 +1549,11 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, switch (sdata->vif.type) { case NL80211_IFTYPE_ADHOC: - if (mgmt->u.action.category == WLAN_CATEGORY_PUBLIC) + case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_AP_VLAN: + case NL80211_IFTYPE_P2P_GO: + if (!ieee80211_is_action(mgmt->frame_control) || + mgmt->u.action.category == WLAN_CATEGORY_PUBLIC) break; rcu_read_lock(); sta = sta_info_get(sdata, mgmt->da); @@ -1558,6 +1562,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, return -ENOLINK; break; case NL80211_IFTYPE_STATION: + case NL80211_IFTYPE_P2P_CLIENT: break; default: return -EOPNOTSUPP; |