Merge tag 'mac80211-for-net-2020-12-04' of... (a1cdfbe8) · Commits · 戴 / test

Merge tag 'mac80211-for-net-2020-12-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 Johannes Berg says: ==================== Three small fixes: * initialize some data to avoid using stack garbage * fix 6 GHz channel selection in mac80211 * correctly restart monitor mode interfaces in mac80211 * tag 'mac80211-for-net-2020-12-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211: mac80211: set SDATA_STATE_RUNNING for monitor interfaces cfg80211: initialize rekey_data mac80211: fix return value of ieee80211_chandef_he_6ghz_oper ==================== Link: https://lore.kernel.org/r/20201204122017.118099-1-johannes@sipsolutions.net Signed-off-by:

net/mac80211/iface.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -948,6 +948,8 @@ int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
		return ret;
		}

		set_bit(SDATA_STATE_RUNNING, &sdata->state);

		ret = ieee80211_check_queues(sdata, NL80211_IFTYPE_MONITOR);
		if (ret) {
		kfree(sdata);

+1 −1

Original line number	Diff line number	Diff line
		@@ -3455,7 +3455,7 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,

		*chandef = he_chandef;

		return false;
		return true;
		}

		bool ieee80211_chandef_s1g_oper(const struct ieee80211_s1g_oper_ie *oper,

+1 −1

Original line number	Diff line number	Diff line
		@@ -12634,7 +12634,7 @@ static int nl80211_set_rekey_data(struct sk_buff skb, struct genl_info info)
		struct net_device *dev = info->user_ptr[1];
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		struct nlattr *tb[NUM_NL80211_REKEY_DATA];
		struct cfg80211_gtk_rekey_data rekey_data;
		struct cfg80211_gtk_rekey_data rekey_data = {};
		int err;

		if (!info->attrs[NL80211_ATTR_REKEY_DATA])