aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorBertold Van den Bergh <bertold.vandenbergh@esat.kuleuven.be>2015-08-05 16:02:42 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-08-14 17:49:49 +0200
commitcc11729893558b374316e6142dc383f0508436c8 (patch)
tree0b5621f489c728e8e8c498ad980d7656244c1fd3 /net
parentmac80211: Set txrc.bss to true for OCB interfaces (diff)
downloadlinux-dev-cc11729893558b374316e6142dc383f0508436c8.tar.xz
linux-dev-cc11729893558b374316e6142dc383f0508436c8.zip
mac80211: Only accept data frames in OCB mode
Currently OCB mode accepts frames with bssid==broadcast and type!=beacon. Some non-data frames are sent matching this, for example probe responses. This results in unnecessary creation of STA entries. Signed-off-by: Bertold Van den Bergh <bertold.vandenbergh@esat.kuleuven.be> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index f673304f70f5..4d217d3265f4 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3316,7 +3316,7 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)
case NL80211_IFTYPE_OCB:
if (!bssid)
return false;
- if (ieee80211_is_beacon(hdr->frame_control))
+ if (!ieee80211_is_data_present(hdr->frame_control))
return false;
if (!is_broadcast_ether_addr(bssid))
return false;