diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 09:22:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 09:22:34 +0100 |
| commit | c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563 (patch) | |
| tree | d04a7861e542665bb7c03aac729a72c957be8abc /net/wireless/nl80211.c | |
| parent | Merge tag 'soundwire-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Linux 4.20-rc6 (diff) | |
| download | linux-c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563.tar.xz linux-c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563.zip | |
Merge 4.20-rc6 into char-misc-next
This should resolve the hv driver merge conflict.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/wireless/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 744b5851bbf9..8d763725498c 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(¶ms, 0, sizeof(params)); + params.beacon_csa.ftm_responder = -1; if (!info->attrs[NL80211_ATTR_WIPHY_FREQ] || !info->attrs[NL80211_ATTR_CH_SWITCH_COUNT]) |