Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ae7a397 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2019-04-26' of... 

Merge tag 'mac80211-for-davem-2019-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
 * fix use-after-free in mac80211 TXQs
 * fix RX STBC byte order
 * fix debugfs rename crashing due to ERR_PTR()
 * fix missing regulatory notification
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 21f1b8a6 51787914

net/mac80211/debugfs_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata) 


	dir = sdata->vif.debugfs_dir;



	if (!dir)

	if (IS_ERR_OR_NULL(dir))

		return;



	sprintf(buf, "netdev:%s", sdata->name);

net/mac80211/ht.c

+3 −2
Original line number Diff line number Diff line
@@ -112,8 +112,9 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata, 
			     IEEE80211_HT_CAP_TX_STBC);



	/* Allow user to configure RX STBC bits */

	if (ht_capa_mask->cap_info & IEEE80211_HT_CAP_RX_STBC)

		ht_cap->cap |= ht_capa->cap_info & IEEE80211_HT_CAP_RX_STBC;

	if (ht_capa_mask->cap_info & cpu_to_le16(IEEE80211_HT_CAP_RX_STBC))

		ht_cap->cap |= le16_to_cpu(ht_capa->cap_info) &

					IEEE80211_HT_CAP_RX_STBC;



	/* Allow user to decrease AMPDU factor */

	if (ht_capa_mask->ampdu_params_info &

net/mac80211/iface.c

+3 −0
Original line number Diff line number Diff line
@@ -1908,6 +1908,9 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) 
	list_del_rcu(&sdata->list);

	mutex_unlock(&sdata->local->iflist_mtx);



	if (sdata->vif.txq)

		ieee80211_txq_purge(sdata->local, to_txq_info(sdata->vif.txq));



	synchronize_rcu();



	if (sdata->dev) {

net/wireless/reg.c

+2 −3
Original line number Diff line number Diff line
@@ -3778,10 +3778,9 @@ void wiphy_regulatory_register(struct wiphy *wiphy) 
		/*

		 * The last request may have been received before this

		 * registration call. Call the driver notifier if

		 * initiator is USER and user type is CELL_BASE.

		 * initiator is USER.

		 */

		if (lr->initiator == NL80211_REGDOM_SET_BY_USER &&

		    lr->user_reg_hint_type == NL80211_USER_REG_HINT_CELL_BASE)

		if (lr->initiator == NL80211_REGDOM_SET_BY_USER)

			reg_call_notifier(wiphy, lr);

	}