From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 30 Oct 2018 08:17:44 +0000 (+0100)
Subject: cfg80211/mac80211: fix FTM settings across CSA
X-Git-Tag: v4.20-rc6~1^2~14^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c177db2d0d5e751d52d3827b8cfdb6ef92a95a2d;p=thirdparty%2Fkernel%2Flinux.git

cfg80211/mac80211: fix FTM settings across CSA

When FTM is enabled, doing a CSA will unexpectedly lose it since
the value of ftm_responder may be initialized to 0 instead of -1,
so fix that.

Fixes: 81e54d08d9d8 ("cfg80211: support FTM responder configuration/statistics")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 744b5851bbf90..8d763725498c1 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7870,6 +7870,7 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
 	}
 
 	memset(&params, 0, sizeof(params));
+	params.beacon_csa.ftm_responder = -1;
 
 	if (!info->attrs[NL80211_ATTR_WIPHY_FREQ] ||
 	    !info->attrs[NL80211_ATTR_CH_SWITCH_COUNT])