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

Merge tag 'wireless-next-2023-12-22' of... 

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



Kalle Valo says:

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

The third "new features" pull request for v6.8. This is a smaller one
to clear up our tree before the break and nothing really noteworthy
this time.

Major changes:

stack

* cfg80211: introduce cfg80211_ssid_eq() for SSID matching

* cfg80211: support P2P operation on DFS channels

* mac80211: allow 64-bit radiotap timestamps

iwlwifi

* AX210: allow concurrent P2P operation on DFS channels
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8146c3f9 96850912

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

+1 −1
Original line number Diff line number Diff line
@@ -1295,7 +1295,7 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar, 
		status->encoding = RX_ENC_LEGACY;

		status->bw = RATE_INFO_BW_20;



		status->flag &= ~RX_FLAG_MACTIME_END;

		status->flag &= ~RX_FLAG_MACTIME;

		status->flag |= RX_FLAG_NO_SIGNAL_VAL;



		status->flag &= ~(RX_FLAG_AMPDU_IS_LAST);

drivers/net/wireless/intel/iwlwifi/fw/api/debug.h

+6 −0
Original line number Diff line number Diff line
@@ -59,6 +59,12 @@ enum iwl_debug_cmds { 
	 * &struct iwl_dbg_dump_complete_cmd

	 */

	FW_DUMP_COMPLETE_CMD = 0xB,

	/**

	 * @FW_CLEAR_BUFFER:

	 * clears the firmware's internal buffer

	 * no payload

	 */

	FW_CLEAR_BUFFER = 0xD,

	/**

	 * @MFU_ASSERT_DUMP_NTF:

	 * &struct iwl_mfu_assert_dump_notif

drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h

+3 −0
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ struct iwl_nvm_access_complete_cmd { 
	__le32 reserved;

} __packed; /* NVM_ACCESS_COMPLETE_CMD_API_S_VER_1 */



#define IWL_MCC_US	0x5553

#define IWL_MCC_CANADA	0x4341



/**

 * struct iwl_mcc_update_cmd - Request the device to update geographic

 * regulatory profile according to the given MCC (Mobile Country Code).

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+9 −0
Original line number Diff line number Diff line
@@ -3401,6 +3401,15 @@ void iwl_fw_dbg_clear_monitor_buf(struct iwl_fw_runtime *fwrt) 
	struct iwl_fw_dbg_params params = {0};



	iwl_fw_dbg_stop_sync(fwrt);



	if (fw_has_api(&fwrt->fw->ucode_capa,

		       IWL_UCODE_TLV_API_INT_DBG_BUF_CLEAR)) {

		struct iwl_host_cmd hcmd = {

			.id = WIDE_ID(DEBUG_GROUP, FW_CLEAR_BUFFER),

		};

		iwl_trans_send_cmd(fwrt->trans, &hcmd);

	}



	iwl_dbg_tlv_init_cfg(fwrt);

	iwl_fw_dbg_stop_restart_recording(fwrt, &params, false);

}

drivers/net/wireless/intel/iwlwifi/fw/file.h

+4 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t; 
 *  SCAN_CONFIG_DB_CMD_API_S.

 * @IWL_UCODE_TLV_API_NO_HOST_DISABLE_TX: Firmware offloaded the station disable tx

 *	logic.

 * @IWL_UCODE_TLV_API_INT_DBG_BUF_CLEAR: Firmware supports clearing the debug

 *	internal buffer

 *

 * @NUM_IWL_UCODE_TLV_API: number of bits used

 */
@@ -282,7 +284,9 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_ADWELL_HB_DEF_N_AP	= (__force iwl_ucode_tlv_api_t)57,

	IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER	= (__force iwl_ucode_tlv_api_t)58,

	IWL_UCODE_TLV_API_BAND_IN_RX_DATA	= (__force iwl_ucode_tlv_api_t)59,

	/* API Set 2 */

	IWL_UCODE_TLV_API_NO_HOST_DISABLE_TX	= (__force iwl_ucode_tlv_api_t)66,

	IWL_UCODE_TLV_API_INT_DBG_BUF_CLEAR     = (__force iwl_ucode_tlv_api_t)67,



	NUM_IWL_UCODE_TLV_API

/*