summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-05-29 15:53:20 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-06-01 14:34:01 -0400
commit333ba7325213f0a09dfa5ceeddb056d6ad74b3b5 (patch)
tree9dff6d71d30b863a30bc07c22326e32cd573eea5 /include
parent1144181c1bc054dc5e001a6f10b4820167e6c883 (diff)
downloadlinux-333ba7325213f0a09dfa5ceeddb056d6ad74b3b5.tar.gz
linux-333ba7325213f0a09dfa5ceeddb056d6ad74b3b5.tar.bz2
linux-333ba7325213f0a09dfa5ceeddb056d6ad74b3b5.zip
cfg80211: don't drop p2p probe responses
Commit 0a35d36 ("cfg80211: Use capability info to detect mesh beacons") assumed that probe response with both ESS and IBSS bits cleared means that the frame was sent by a mesh sta. However, these capabilities are also being used in the p2p_find phase, and the mesh-validation broke it. Rename the WLAN_CAPABILITY_IS_MBSS macro, and verify that mesh ies exist before assuming this frame was sent by a mesh sta. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ieee80211.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index b2eee5879883..bf56b6f78270 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1003,8 +1003,12 @@ struct ieee80211_ht_info {
#define WLAN_CAPABILITY_ESS (1<<0)
#define WLAN_CAPABILITY_IBSS (1<<1)
-/* A mesh STA sets the ESS and IBSS capability bits to zero */
-#define WLAN_CAPABILITY_IS_MBSS(cap) \
+/*
+ * A mesh STA sets the ESS and IBSS capability bits to zero.
+ * however, this holds true for p2p probe responses (in the p2p_find
+ * phase) as well.
+ */
+#define WLAN_CAPABILITY_IS_STA_BSS(cap) \
(!((cap) & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)))
#define WLAN_CAPABILITY_CF_POLLABLE (1<<2)