Commit c7723917 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 v5.18. Major changes:

ath11k

* debugfs interface to configure firmware debug log level

* debugfs interface to test Target Wake Time (TWT)

* provide 802.11ax High Efficiency (HE) data via radiotap

ath9k

* use hw_random API instead of directly dumping into random.c

wcn36xx

* fix wcn3660 to work on 5 GHz band
parents b865273b 49ffac59

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

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, 
				RX_MSDU_END_INFO0_LAST_MSDU;



		/* FIXME: why are we skipping the first part of the rx_desc? */

		trace_ath10k_htt_rx_desc(ar, rx_desc + sizeof(u32),

		trace_ath10k_htt_rx_desc(ar, (void *)rx_desc + sizeof(u32),

					 hw->rx_desc_ops->rx_desc_size - sizeof(u32));



		if (last_msdu)

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct ath10k_fw_file; 
struct ath10k_swap_code_seg_tlv {

	__le32 address;

	__le32 length;

	u8 data[0];

	u8 data[];

} __packed;



struct ath10k_swap_code_seg_tail {

drivers/net/wireless/ath/ath11k/ahb.c

+4 −2
Original line number Diff line number Diff line
@@ -391,6 +391,8 @@ static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab) 


		for (j = 0; j < irq_grp->num_irq; j++)

			free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp);



		netif_napi_del(&irq_grp->napi);

	}

}
@@ -466,7 +468,7 @@ static irqreturn_t ath11k_ahb_ext_interrupt_handler(int irq, void *arg) 
	return IRQ_HANDLED;

}



static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab)

static int ath11k_ahb_config_ext_irq(struct ath11k_base *ab)

{

	struct ath11k_hw_params *hw = &ab->hw_params;

	int i, j;
@@ -574,7 +576,7 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab) 
	}



	/* Configure external interrupts */

	ret = ath11k_ahb_ext_irq_config(ab);

	ret = ath11k_ahb_config_ext_irq(ab);



	return ret;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct ath11k_ce_ring { 
	u32 hal_ring_id;



	/* keep last */

	struct sk_buff *skb[0];

	struct sk_buff *skb[];

};



struct ath11k_ce_pipe {

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

+6 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_rssi_stats = false,

		.fw_wmi_diag_event = false,

		.current_cc_support = false,

		.dbr_debug_support = true,

	},

	{

		.hw_rev = ATH11K_HW_IPQ6018_HW10,
@@ -164,6 +165,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_rssi_stats = false,

		.fw_wmi_diag_event = false,

		.current_cc_support = false,

		.dbr_debug_support = true,

	},

	{

		.name = "qca6390 hw2.0",
@@ -228,6 +230,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_rssi_stats = true,

		.fw_wmi_diag_event = true,

		.current_cc_support = true,

		.dbr_debug_support = false,

	},

	{

		.name = "qcn9074 hw1.0",
@@ -292,6 +295,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_rssi_stats = false,

		.fw_wmi_diag_event = false,

		.current_cc_support = false,

		.dbr_debug_support = true,

	},

	{

		.name = "wcn6855 hw2.0",
@@ -356,6 +360,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_rssi_stats = true,

		.fw_wmi_diag_event = true,

		.current_cc_support = true,

		.dbr_debug_support = false,

	},

	{

		.name = "wcn6855 hw2.1",
@@ -419,6 +424,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_rssi_stats = true,

		.fw_wmi_diag_event = true,

		.current_cc_support = true,

		.dbr_debug_support = false,

	},

};