From: Bertold Van den Bergh <bertold.vandenbergh@esat.kuleuven.be>
Date: Wed, 5 Aug 2015 14:02:42 +0000 (+0200)
Subject: mac80211: Only accept data frames in OCB mode
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cc11729893558b374316e6142dc383f0508436c8;p=linux-beck.git

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>
---

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;