Skip to content

Commit bb8428f

Browse files
Koen Vandeputtegregkh
authored andcommitted
mac80211: fix CSA in IBSS mode
commit f181d6a3bcc35633facf5f3925699021c13492c5 upstream. 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: cd7760e ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5f1f390 commit bb8428f

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/mac80211/ibss.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,14 +486,14 @@ int ieee80211_ibss_csa_beacon(struct ieee80211_sub_if_data *sdata,
486486
struct beacon_data *presp, *old_presp;
487487
struct cfg80211_bss *cbss;
488488
const struct cfg80211_bss_ies *ies;
489-
u16 capability = 0;
489+
u16 capability = WLAN_CAPABILITY_IBSS;
490490
u64 tsf;
491491
int ret = 0;
492492

493493
sdata_assert_lock(sdata);
494494

495495
if (ifibss->privacy)
496-
capability = WLAN_CAPABILITY_PRIVACY;
496+
capability |= WLAN_CAPABILITY_PRIVACY;
497497

498498
cbss = cfg80211_get_bss(sdata->local->hw.wiphy, ifibss->chandef.chan,
499499
ifibss->bssid, ifibss->ssid,

0 commit comments

Comments
 (0)