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

Merge tag 'wireless-next-2022-07-13' of... 

Merge tag 'wireless-next-2022-07-13' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next



Johannes Berg says:

====================
A fairly large set of updates for next, highlights:

ath10k
 * ethernet frame format support

rtw89
 * TDLS support

cfg80211/mac80211
 * airtime fairness fixes
 * EHT support continued, especially in AP mode
 * initial (and still major) rework for multi-link
   operation (MLO) from 802.11be/wifi 7

As usual, also many small updates/cleanups/fixes/etc.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cfc6c2fc 58b6259d

drivers/net/wireless/admtek/adm8211.c

+1 −1
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ static int adm8211_config(struct ieee80211_hw *dev, u32 changed) 
static void adm8211_bss_info_changed(struct ieee80211_hw *dev,

				     struct ieee80211_vif *vif,

				     struct ieee80211_bss_conf *conf,

				     u32 changes)

				     u64 changes)

{

	struct adm8211_priv *priv = dev->priv;

drivers/net/wireless/ath/ar5523/ar5523.c

+6 −6
Original line number Diff line number Diff line
@@ -1256,14 +1256,14 @@ static int ar5523_create_connection(struct ar5523 *ar, 
				sizeof(create), 0);

}



static int ar5523_write_associd(struct ar5523 *ar,

				struct ieee80211_bss_conf *bss)

static int ar5523_write_associd(struct ar5523 *ar, struct ieee80211_vif *vif)

{

	struct ieee80211_bss_conf *bss = &vif->bss_conf;

	struct ar5523_cmd_set_associd associd;



	memset(&associd, 0, sizeof(associd));

	associd.defaultrateix = cpu_to_be32(0);	/* XXX */

	associd.associd = cpu_to_be32(bss->aid);

	associd.associd = cpu_to_be32(vif->cfg.aid);

	associd.timoffset = cpu_to_be32(0x3b);	/* XXX */

	memcpy(associd.bssid, bss->bssid, ETH_ALEN);

	return ar5523_cmd_write(ar, WDCMSG_WRITE_ASSOCID, &associd,
@@ -1273,7 +1273,7 @@ static int ar5523_write_associd(struct ar5523 *ar, 
static void ar5523_bss_info_changed(struct ieee80211_hw *hw,

				    struct ieee80211_vif *vif,

				    struct ieee80211_bss_conf *bss,

				    u32 changed)

				    u64 changed)

{

	struct ar5523 *ar = hw->priv;

	int error;
@@ -1284,7 +1284,7 @@ static void ar5523_bss_info_changed(struct ieee80211_hw *hw, 
	if (!(changed & BSS_CHANGED_ASSOC))

		goto out_unlock;



	if (bss->assoc) {

	if (vif->cfg.assoc) {

		error = ar5523_create_connection(ar, vif, bss);

		if (error) {

			ar5523_err(ar, "could not create connection\n");
@@ -1297,7 +1297,7 @@ static void ar5523_bss_info_changed(struct ieee80211_hw *hw, 
			goto out_unlock;

		}



		error = ar5523_write_associd(ar, bss);

		error = ar5523_write_associd(ar, vif);

		if (error) {

			ar5523_err(ar, "could not set association\n");

			goto out_unlock;

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

+7 −4
Original line number Diff line number Diff line
@@ -33,9 +33,11 @@ EXPORT_SYMBOL(ath10k_debug_mask); 
static unsigned int ath10k_cryptmode_param;

static bool uart_print;

static bool skip_otp;

static bool rawmode;

static bool fw_diag_log;



/* frame mode values are mapped as per enum ath10k_hw_txrx_mode */

unsigned int ath10k_frame_mode = ATH10K_HW_TXRX_NATIVE_WIFI;



unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |

				     BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
@@ -44,15 +46,16 @@ module_param_named(debug_mask, ath10k_debug_mask, uint, 0644); 
module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644);

module_param(uart_print, bool, 0644);

module_param(skip_otp, bool, 0644);

module_param(rawmode, bool, 0644);

module_param(fw_diag_log, bool, 0644);

module_param_named(frame_mode, ath10k_frame_mode, uint, 0644);

module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);



MODULE_PARM_DESC(debug_mask, "Debugging mask");

MODULE_PARM_DESC(uart_print, "Uart target debugging");

MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");

MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software");

MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");

MODULE_PARM_DESC(frame_mode,

		 "Datapath frame mode (0: raw, 1: native wifi (default), 2: ethernet)");

MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");

MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
@@ -2599,7 +2602,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
	ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT;

	ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT;



	if (rawmode) {

	if (ath10k_frame_mode == ATH10K_HW_TXRX_RAW) {

		if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT,

			      fw_file->fw_features)) {

			ath10k_err(ar, "rawmode = 1 requires support from firmware");

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

+1 −0
Original line number Diff line number Diff line
@@ -1314,6 +1314,7 @@ static inline bool ath10k_peer_stats_enabled(struct ath10k *ar) 
	return false;

}



extern unsigned int ath10k_frame_mode;

extern unsigned long ath10k_coredump_mask;



void ath10k_core_napi_sync_disable(struct ath10k *ar);

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

+6 −2
Original line number Diff line number Diff line
@@ -3563,7 +3563,7 @@ static void ath10k_htt_rx_tx_mode_switch_ind(struct ath10k *ar, 
	threshold = MS(info1, HTT_TX_MODE_SWITCH_IND_INFO1_THRESHOLD);



	ath10k_dbg(ar, ATH10K_DBG_HTT,

		   "htt rx tx mode switch ind info0 0x%04hx info1 0x%04x enable %d num records %zd mode %d threshold %u\n",

		   "htt rx tx mode switch ind info0 0x%04x info1 0x%04x enable %d num records %zd mode %d threshold %u\n",

		   info0, info1, enable, num_records, mode, threshold);



	len += sizeof(resp->tx_mode_switch_ind.records[0]) * num_records;
@@ -3840,7 +3840,7 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar, 
	switch (txrate.flags) {

	case WMI_RATE_PREAMBLE_OFDM:

		if (arsta->arvif && arsta->arvif->vif)

			conf = rcu_dereference(arsta->arvif->vif->chanctx_conf);

			conf = rcu_dereference(arsta->arvif->vif->bss_conf.chanctx_conf);

		if (conf && conf->def.chan->band == NL80211_BAND_5GHZ)

			arsta->tx_info.status.rates[0].idx = rate_idx - 4;

		break;
@@ -3884,6 +3884,10 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar, 
		arsta->tx_info.status.rates[0].flags |=

				IEEE80211_TX_RC_80_MHZ_WIDTH;

		break;

	case RATE_INFO_BW_160:

		arsta->tx_info.status.rates[0].flags |=

				IEEE80211_TX_RC_160_MHZ_WIDTH;

		break;

	}



	if (peer_stats->succ_pkts) {