summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2017-02-08 09:32:05 -0500
committerJohannes Berg <johannes.berg@intel.com>2017-02-09 09:18:24 -0500
commitf181d6a3bcc35633facf5f3925699021c13492c5 (patch)
treea48ff9317b9b736188e73945b4a5704b36276485 /net/mac80211/ibss.c
parent8585989d146c61dd073d2135c5bb11d0f979d576 (diff)
mac80211: fix CSA in IBSS mode
Add the missing IBSS capability flag during capability init as it needs to be inserted into the generated beacon in order for CSA to work. Fixes: cd7760e62c2ac ("mac80211: add support for CSA in IBSS mode") Signed-off-by: Piotr Gawlowicz <gawlowicz@tkn.tu-berlin.de> Signed-off-by: MikoĊ‚aj Chwalisz <chwalisz@tkn.tu-berlin.de> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index a31d30713d08..98999d3d5262 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -487,14 +487,14 @@ int ieee80211_ibss_csa_beacon(struct ieee80211_sub_if_data *sdata,
487 struct beacon_data *presp, *old_presp; 487 struct beacon_data *presp, *old_presp;
488 struct cfg80211_bss *cbss; 488 struct cfg80211_bss *cbss;
489 const struct cfg80211_bss_ies *ies; 489 const struct cfg80211_bss_ies *ies;
490 u16 capability = 0; 490 u16 capability = WLAN_CAPABILITY_IBSS;
491 u64 tsf; 491 u64 tsf;
492 int ret = 0; 492 int ret = 0;
493 493
494 sdata_assert_lock(sdata); 494 sdata_assert_lock(sdata);
495 495
496 if (ifibss->privacy) 496 if (ifibss->privacy)
497 capability = WLAN_CAPABILITY_PRIVACY; 497 capability |= WLAN_CAPABILITY_PRIVACY;
498 498
499 cbss = cfg80211_get_bss(sdata->local->hw.wiphy, ifibss->chandef.chan, 499 cbss = cfg80211_get_bss(sdata->local->hw.wiphy, ifibss->chandef.chan,
500 ifibss->bssid, ifibss->ssid, 500 ifibss->bssid, ifibss->ssid,