Commit 83e3a672 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for 5.5. Major changes:

wil6210

* add SPDX license identifiers
parents a3ead21d 6dea30b4

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

+2 −1
Original line number Diff line number Diff line
@@ -1516,7 +1516,7 @@ static void ath10k_tpc_stats_print(struct ath10k_tpc_stats *tpc_stats, 
	*len += scnprintf(buf + *len, buf_len - *len,

			  "No.  Preamble Rate_code ");



	for (i = 0; i < WMI_TPC_TX_N_CHAIN; i++)

	for (i = 0; i < tpc_stats->num_tx_chain; i++)

		*len += scnprintf(buf + *len, buf_len - *len,

				  "tpc_value%d ", i);
@@ -2532,6 +2532,7 @@ void ath10k_debug_destroy(struct ath10k *ar) 
	ath10k_debug_fw_stats_reset(ar);



	kfree(ar->debug.tpc_stats);

	kfree(ar->debug.tpc_stats_final);

}



int ath10k_debug_register(struct ath10k *ar)

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

+1 −1
Original line number Diff line number Diff line
@@ -2073,7 +2073,7 @@ static void ath10k_htt_rx_mpdu_desc_pn_hl(struct htt_hl_rx_desc *rx_desc, 
	case 24:

		pn->pn24 = __le32_to_cpu(rx_desc->pn_31_0);

		break;

	};

	}

}



static bool ath10k_htt_rx_pn_cmp48(union htt_rx_pn_t *new_pn,

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

+1 −0
Original line number Diff line number Diff line
@@ -1148,6 +1148,7 @@ static bool ath10k_qca99x0_rx_desc_msdu_limit_error(struct htt_rx_desc *rxd) 
const struct ath10k_hw_ops qca99x0_ops = {

	.rx_desc_get_l3_pad_bytes = ath10k_qca99x0_rx_desc_get_l3_pad_bytes,

	.rx_desc_get_msdu_limit_error = ath10k_qca99x0_rx_desc_msdu_limit_error,

	.is_rssi_enable = ath10k_htt_tx_rssi_enable,

};



const struct ath10k_hw_ops qca6174_ops = {

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

+3 −1
Original line number Diff line number Diff line
@@ -3904,8 +3904,10 @@ void ath10k_mgmt_over_wmi_tx_work(struct work_struct *work) 
			     ar->running_fw->fw_file.fw_features)) {

			paddr = dma_map_single(ar->dev, skb->data,

					       skb->len, DMA_TO_DEVICE);

			if (!paddr)

			if (dma_mapping_error(ar->dev, paddr)) {

				ieee80211_free_txskb(ar->hw, skb);

				continue;

			}

			ret = ath10k_wmi_mgmt_tx_send(ar, skb, paddr);

			if (ret) {

				ath10k_warn(ar, "failed to transmit management frame by ref via WMI: %d\n",

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

+1 −1
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ static void ath10k_msa_dump_memory(struct ath10k *ar, 
	size_t buf_len;

	u8 *buf;



	if (!crash_data && !crash_data->ramdump_buf)

	if (!crash_data || !crash_data->ramdump_buf)

		return;



	mem_layout = ath10k_coredump_get_mem_layout(ar);