diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-25 12:46:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-25 12:46:37 -0700 |
| commit | 345578d97c549995ddbcc178f16f710602cc06bb (patch) | |
| tree | ce05e39a01ffce847f6f7f65f19b1e8e20dbf0c2 /net/mac80211/main.c | |
| parent | fe2a70eefa18a3e419dd9a23e16af14258b7cc20 (diff) | |
| parent | cfef6047c4027a8448ec8dafeaf2bb362cc882e4 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index dc50fc3153e..0ab2a8df312 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -545,7 +545,9 @@ ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = { }, [NL80211_IFTYPE_MESH_POINT] = { .tx = 0xffff, - .rx = BIT(IEEE80211_STYPE_ACTION >> 4), + .rx = BIT(IEEE80211_STYPE_ACTION >> 4) | + BIT(IEEE80211_STYPE_AUTH >> 4) | + BIT(IEEE80211_STYPE_DEAUTH >> 4), }, }; @@ -760,6 +762,11 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) local->hw.wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MESH_POINT); #endif + /* if the underlying driver supports mesh, mac80211 will (at least) + * provide routing of mesh authentication frames to userspace */ + if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_MESH_POINT)) + local->hw.wiphy->flags |= WIPHY_FLAG_MESH_AUTH; + /* mac80211 supports control port protocol changing */ local->hw.wiphy->flags |= WIPHY_FLAG_CONTROL_PORT_PROTOCOL; |