2017-02-08 14:41:50

by Koen Vandeputte

Subject: [PATCH] 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.

Signed-off-by: Piotr Gawlowicz <[email protected]>
Signed-off-by: Mikołaj Chwalisz <[email protected]>
Tested-by: Koen Vandeputte <[email protected]>
---
net/mac80211/ibss.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index a31d307..98999d3 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,
struct beacon_data *presp, *old_presp;
struct cfg80211_bss *cbss;
const struct cfg80211_bss_ies *ies;
- u16 capability = 0;
+ u16 capability = WLAN_CAPABILITY_IBSS;
u64 tsf;
int ret = 0;

sdata_assert_lock(sdata);

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

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

2017-02-09 14:51:10

by Johannes Berg

Subject: Re: [PATCH] mac80211: fix CSA in IBSS mode

On Wed, 2017-02-08 at 15:32 +0100, Koen Vandeputte wrote:
> 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.
>

Applied, thanks.

johannes