diff options
| author |   Marco Porsch <marco.porsch@etit.tu-chemnitz.de> | 2012-12-05 15:04:26 -0800 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2012-12-06 13:58:43 +0100 |
| commit | 815b8092bd5242d580038213da9179a5a4f69116 (patch) | |
| tree | ee392ce47bfb42b555cdfcba232239e9c096d0d8 /net | |
| parent | mac80211: skip radiotap space calculation if no monitor exists (diff) | |
| download | linux-dev-815b8092bd5242d580038213da9179a5a4f69116.tar.xz linux-dev-815b8092bd5242d580038213da9179a5a4f69116.zip | |
mac80211: don't drop mesh peering frames from unknown STA
Previously, mesh peering frames from a STA without a station
entry were being dropped.
Mesh Peering Open and other frames (WLAN_CATEGORY_SELF_PROTECTED)
are valid mesh peering frames even if received from a yet unknown
station; the STA entry will be created in mesh_peer_init later.
The problem didn't occur previously since both STAs receive each
other's beacons which created the STA entry. However, this causes
an unnecessary delay and beacons might not be received if either
node is in PS mode.
Signed-off-by: Marco Porsch <marco.porsch@etit.tu-chemnitz.de>
[reword commit log a bit]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index e4ee32748994..580704eba8b8 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2333,7 +2333,8 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) if (len < IEEE80211_MIN_ACTION_SIZE) return RX_DROP_UNUSABLE; - if (!rx->sta && mgmt->u.action.category != WLAN_CATEGORY_PUBLIC) + if (!rx->sta && mgmt->u.action.category != WLAN_CATEGORY_PUBLIC && + mgmt->u.action.category != WLAN_CATEGORY_SELF_PROTECTED) return RX_DROP_UNUSABLE; if (!(status->rx_flags & IEEE80211_RX_RA_MATCH)) |