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

Merge tag 'wireless-next-2024-09-11' of... 

Merge tag 'wireless-next-2024-09-11' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Kalle Valo says:

====================
wireless-next patches for v6.12

The last -next "new features" pull request for v6.12. The stack now
supports DFS on MLO but otherwise nothing really standing out.

Major changes:

cfg80211/mac80211
 * EHT rate support in AQL airtime
 * DFS support for MLO

rtw89
 * complete BT-coexistence code for RTL8852BT
 * RTL8922A WoWLAN net-detect support

* tag 'wireless-next-2024-09-11' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (105 commits)
  wifi: brcmfmac: cfg80211: Convert comma to semicolon
  wifi: rsi: Remove an unused field in struct rsi_debugfs
  wifi: libertas: Cleanup unused declarations
  wifi: wilc1000: Convert using devm_clk_get_optional_enabled() in wilc_bus_probe()
  wifi: wilc1000: Convert using devm_clk_get_optional_enabled() in wilc_sdio_probe()
  wifi: wilc1000: fix potential RCU dereference issue in wilc_parse_join_bss_param
  wifi: mwifiex: Fix memcpy() field-spanning write warning in mwifiex_cmd_802_11_scan_ext()
  wifi: mac80211: use two-phase skb reclamation in ieee80211_do_stop()
  wifi: cfg80211: fix two more possible UBSAN-detected off-by-one errors
  wifi: cfg80211: fix kernel-doc for per-link data
  wifi: mt76: mt7925: replace chan config with extend txpower config for clc
  wifi: mt76: mt7925: fix a potential array-index-out-of-bounds issue for clc
  wifi: mt76: mt7615: check devm_kasprintf() returned value
  wifi: mt76: mt7925: convert comma to semicolon
  wifi: mt76: mt7925: fix a potential association failure upon resuming
  wifi: mt76: Avoid multiple -Wflex-array-member-not-at-end warnings
  wifi: mt76: mt7921: Check devm_kasprintf() returned value
  wifi: mt76: mt7915: check devm_kasprintf() returned value
  wifi: mt76: mt7915: avoid long MCU command timeouts during SER
  wifi: mt76: mt7996: fix uninitialized TLV data
  ...
====================

Link: https://patch.msgid.link/20240911084147.A205DC4AF0F@smtp.kernel.org


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

drivers/net/wireless/ath/ath10k/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (c) 2005-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/module.h>
@@ -1774,7 +1774,7 @@ static ssize_t ath10k_write_simulate_radar(struct file *file, 
	if (!arvif->is_started)

		return -EINVAL;



	ieee80211_radar_detected(ar->hw);

	ieee80211_radar_detected(ar->hw, NULL);



	return count;

}

drivers/net/wireless/ath/ath10k/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -1437,7 +1437,7 @@ static void ath10k_recalc_radar_detection(struct ath10k *ar) 
		 * by indicating that radar was detected.

		 */

		ath10k_warn(ar, "failed to start CAC: %d\n", ret);

		ieee80211_radar_detected(ar->hw);

		ieee80211_radar_detected(ar->hw, NULL);

	}

}

drivers/net/wireless/ath/ath10k/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -3990,7 +3990,7 @@ static void ath10k_radar_detected(struct ath10k *ar) 
	if (ar->dfs_block_radar_events)

		ath10k_info(ar, "DFS Radar detected, but ignored as requested\n");

	else

		ieee80211_radar_detected(ar->hw);

		ieee80211_radar_detected(ar->hw, NULL);

}



static void ath10k_radar_confirmation_work(struct work_struct *work)

drivers/net/wireless/ath/ath11k/core.h

+7 −1
Original line number Diff line number Diff line
@@ -407,11 +407,17 @@ struct ath11k_vif { 
	bool wpaie_present;

	bool bcca_zero_sent;

	bool do_not_send_tmpl;

	struct ieee80211_chanctx_conf chanctx;

	struct ath11k_arp_ns_offload arp_ns_offload;

	struct ath11k_rekey_data rekey_data;



	struct ath11k_reg_tpc_power_info reg_tpc_info;



	/* Must be last - ends in a flexible-array member.

	 *

	 * FIXME: Driver should not copy struct ieee80211_chanctx_conf,

	 * especially because it has a flexible array. Find a better way.

	 */

	struct ieee80211_chanctx_conf chanctx;

};



struct ath11k_vif_iter {

drivers/net/wireless/ath/ath11k/dp.h

+0 −23
Original line number Diff line number Diff line
@@ -1305,18 +1305,6 @@ struct htt_ppdu_stats_user_rate { 
#define HTT_TX_INFO_PEERID(_flags) \

			FIELD_GET(HTT_PPDU_STATS_TX_INFO_FLAGS_PEERID_M, _flags)



struct htt_tx_ppdu_stats_info {

	struct htt_tlv tlv_hdr;

	u32 tx_success_bytes;

	u32 tx_retry_bytes;

	u32 tx_failed_bytes;

	u32 flags; /* %HTT_PPDU_STATS_TX_INFO_FLAGS_ */

	u16 tx_success_msdus;

	u16 tx_retry_msdus;

	u16 tx_failed_msdus;

	u16 tx_duration; /* united in us */

} __packed;



enum  htt_ppdu_stats_usr_compln_status {

	HTT_PPDU_STATS_USER_STATUS_OK,

	HTT_PPDU_STATS_USER_STATUS_FILTERED,
@@ -1364,17 +1352,6 @@ struct htt_ppdu_stats_usr_cmpltn_ack_ba_status { 
	u32 success_bytes;

} __packed;



struct htt_ppdu_stats_usr_cmn_array {

	struct htt_tlv tlv_hdr;

	u32 num_ppdu_stats;

	/* tx_ppdu_stats_info is filled by multiple struct htt_tx_ppdu_stats_info

	 * elements.

	 * tx_ppdu_stats_info is variable length, with length =

	 *     number_of_ppdu_stats * sizeof (struct htt_tx_ppdu_stats_info)

	 */

	struct htt_tx_ppdu_stats_info tx_ppdu_info[];

} __packed;



struct htt_ppdu_user_stats {

	u16 peer_id;

	u32 tlv_flags;