cfg80211/mac80211: fix FTM settings across CSA

jmberg-intel · jmberg-intel · commit c177db2d0d5e · 2018-11-09T08:56:58.000+01:00
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: 81e54d0 ("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
@@ -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])

Original file line number	Diff line number	Diff line change
`@@ -7870,6 +7870,7 @@ static int nl80211_channel_switch(struct sk_buff skb, struct genl_info info)`
`7870`	`7870`	`}`
`7871`	`7871`
`7872`	`7872`	`memset(&params, 0, sizeof(params));`
	`7873`	`+ params.beacon_csa.ftm_responder = -1;`
`7873`	`7874`
`7874`	`7875`	`if (!info->attrs[NL80211_ATTR_WIPHY_FREQ] \|\|`
`7875`	`7876`	`!info->attrs[NL80211_ATTR_CH_SWITCH_COUNT])`