Commit e684ab76 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2023-06-06' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Kalle Valo says:

====================
wireless fixes for v6.4

Both rtw88 and rtw89 have a 802.11 powersave fix for a regression
introduced in v6.0. mt76 fixes a race and a null pointer dereference.
iwlwifi fixes an issue where not enough memory was allocated for a
firmware event. And finally the stack has several smaller fixes all
over.

* tag 'wireless-2023-06-06' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: cfg80211: fix locking in regulatory disconnect
  wifi: cfg80211: fix locking in sched scan stop work
  wifi: iwlwifi: mvm: Fix -Warray-bounds bug in iwl_mvm_wait_d3_notif()
  wifi: mac80211: fix switch count in EMA beacons
  wifi: mac80211: don't translate beacon/presp addrs
  wifi: mac80211: mlme: fix non-inheritence element
  wifi: cfg80211: reject bad AP MLD address
  wifi: mac80211: use correct iftype HE cap
  wifi: mt76: mt7996: fix possible NULL pointer dereference in mt7996_mac_write_txwi()
  wifi: rtw89: remove redundant check of entering LPS
  wifi: rtw89: correct PS calculation for SUPPORTS_DYNAMIC_PS
  wifi: rtw88: correct PS calculation for SUPPORTS_DYNAMIC_PS
  wifi: mt76: mt7615: fix possible race in mt7615_mac_sta_poll
====================

Link: https://lore.kernel.org/r/20230606150817.EC133C433D2@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents accc1bf2 f7e60032

drivers/net/wireless/intel/iwlwifi/mvm/d3.c

+2 −6
Original line number Diff line number Diff line
@@ -2732,17 +2732,13 @@ static bool iwl_mvm_wait_d3_notif(struct iwl_notif_wait_data *notif_wait, 
		if (wowlan_info_ver < 2) {

			struct iwl_wowlan_info_notif_v1 *notif_v1 = (void *)pkt->data;



			notif = kmemdup(notif_v1,

					offsetofend(struct iwl_wowlan_info_notif,

						    received_beacons),

					GFP_ATOMIC);



			notif = kmemdup(notif_v1, sizeof(*notif), GFP_ATOMIC);

			if (!notif)

				return false;



			notif->tid_tear_down = notif_v1->tid_tear_down;

			notif->station_id = notif_v1->station_id;



			memset_after(notif, 0, station_id);

		} else {

			notif = (void *)pkt->data;

		}

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+3 −0
Original line number Diff line number Diff line
@@ -914,7 +914,10 @@ void mt7615_mac_sta_poll(struct mt7615_dev *dev) 


		msta = list_first_entry(&sta_poll_list, struct mt7615_sta,

					poll_list);



		spin_lock_bh(&dev->sta_poll_lock);

		list_del_init(&msta->poll_list);

		spin_unlock_bh(&dev->sta_poll_lock);



		addr = mt7615_mac_wtbl_addr(dev, msta->wcid.idx) + 19 * 4;

drivers/net/wireless/mediatek/mt76/mt7996/mac.c

+12 −7
Original line number Diff line number Diff line
@@ -1004,10 +1004,10 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, 
{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_vif *vif = info->control.vif;

	struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;

	u8 band_idx = (info->hw_queue & MT_TX_HW_QUEUE_PHY) >> 2;

	u8 p_fmt, q_idx, omac_idx = 0, wmm_idx = 0;

	bool is_8023 = info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP;

	struct mt7996_vif *mvif;

	u16 tx_count = 15;

	u32 val;

	bool beacon = !!(changed & (BSS_CHANGED_BEACON |
@@ -1015,7 +1015,8 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, 
	bool inband_disc = !!(changed & (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP |

					 BSS_CHANGED_FILS_DISCOVERY));



	if (vif) {

	mvif = vif ? (struct mt7996_vif *)vif->drv_priv : NULL;

	if (mvif) {

		omac_idx = mvif->mt76.omac_idx;

		wmm_idx = mvif->mt76.wmm_idx;

		band_idx = mvif->mt76.band_idx;
@@ -1081,12 +1082,16 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, 
		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

		bool mcast = ieee80211_is_data(hdr->frame_control) &&

			     is_multicast_ether_addr(hdr->addr1);

		u8 idx = mvif->basic_rates_idx;

		u8 idx = MT7996_BASIC_RATES_TBL;



		if (mvif) {

			if (mcast && mvif->mcast_rates_idx)

				idx = mvif->mcast_rates_idx;

			else if (beacon && mvif->beacon_rates_idx)

				idx = mvif->beacon_rates_idx;

			else

				idx = mvif->basic_rates_idx;

		}



		txwi[6] |= cpu_to_le32(FIELD_PREP(MT_TXD6_TX_RATE, idx));

		txwi[3] |= cpu_to_le32(MT_TXD3_BA_DISABLE);

drivers/net/wireless/realtek/rtw88/mac80211.c

+5 −9
Original line number Diff line number Diff line
@@ -88,15 +88,6 @@ static int rtw_ops_config(struct ieee80211_hw *hw, u32 changed) 
		}

	}



	if (changed & IEEE80211_CONF_CHANGE_PS) {

		if (hw->conf.flags & IEEE80211_CONF_PS) {

			rtwdev->ps_enabled = true;

		} else {

			rtwdev->ps_enabled = false;

			rtw_leave_lps(rtwdev);

		}

	}



	if (changed & IEEE80211_CONF_CHANGE_CHANNEL)

		rtw_set_channel(rtwdev);
@@ -213,6 +204,7 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw, 
	config |= PORT_SET_BCN_CTRL;

	rtw_vif_port_config(rtwdev, rtwvif, config);

	rtw_core_port_switch(rtwdev, vif);

	rtw_recalc_lps(rtwdev, vif);



	mutex_unlock(&rtwdev->mutex);
@@ -244,6 +236,7 @@ static void rtw_ops_remove_interface(struct ieee80211_hw *hw, 
	config |= PORT_SET_BCN_CTRL;

	rtw_vif_port_config(rtwdev, rtwvif, config);

	clear_bit(rtwvif->port, rtwdev->hw_port);

	rtw_recalc_lps(rtwdev, NULL);



	mutex_unlock(&rtwdev->mutex);

}
@@ -438,6 +431,9 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, 
	if (changed & BSS_CHANGED_ERP_SLOT)

		rtw_conf_tx(rtwdev, rtwvif);



	if (changed & BSS_CHANGED_PS)

		rtw_recalc_lps(rtwdev, NULL);



	rtw_vif_port_config(rtwdev, rtwvif, config);



	mutex_unlock(&rtwdev->mutex);

drivers/net/wireless/realtek/rtw88/main.c

+2 −2
Original line number Diff line number Diff line
@@ -271,8 +271,8 @@ static void rtw_watch_dog_work(struct work_struct *work) 
	 * more than two stations associated to the AP, then we can not enter

	 * lps, because fw does not handle the overlapped beacon interval

	 *

	 * mac80211 should iterate vifs and determine if driver can enter

	 * ps by passing IEEE80211_CONF_PS to us, all we need to do is to

	 * rtw_recalc_lps() iterate vifs and determine if driver can enter

	 * ps by vif->type and vif->cfg.ps, all we need to do here is to

	 * get that vif and check if device is having traffic more than the

	 * threshold.

	 */