Commit 4dddbad8 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 v6.6. No major changes, only smaller fixes and
cleanups this time.
parents e8afebbf 4c2964ef

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

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev) 
	int ret;

	struct ath10k_bus_params bus_params = {};



	hw_rev = (enum ath10k_hw_rev)of_device_get_match_data(&pdev->dev);

	hw_rev = (uintptr_t)of_device_get_match_data(&pdev->dev);

	if (!hw_rev) {

		dev_err(&pdev->dev, "OF data missing\n");

		return -EINVAL;

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

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct htt_ver_req { 
 * The HTT tx descriptor is defined in two manners: by a struct with

 * bitfields, and by a series of [dword offset, bit mask, bit shift]

 * definitions.

 * The target should use the struct def, for simplicitly and clarity,

 * The target should use the struct def, for simplicity and clarity,

 * but the host shall use the bit-mast + bit-shift defs, to be endian-

 * neutral.  Specifically, the host shall use the get/set macros built

 * around the mask + shift defs.
@@ -2086,7 +2086,7 @@ static inline bool ath10k_htt_rx_proc_rx_frag_ind(struct ath10k_htt *htt, 
 * for correctly accessing rx descriptor data.

 */



/* base struct used for abstracting the rx descritor representation */

/* base struct used for abstracting the rx descriptor representation */

struct htt_rx_desc {

	union {

		/* This field is filled on the host using the msdu buffer

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

+1 −1
Original line number Diff line number Diff line
@@ -1636,7 +1636,7 @@ static int ath10k_pci_dump_memory_generic(struct ath10k *ar, 
						      buf,

						      current_region->len);



	/* No individiual memory sections defined so we can

	/* No individual memory sections defined so we can

	 * copy the entire memory region.

	 */

	ret = ath10k_pci_diag_read_mem(ar,

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

+1 −1
Original line number Diff line number Diff line
@@ -2389,7 +2389,7 @@ static int ath10k_sdio_dump_memory_generic(struct ath10k *ar, 
						      buf,

						      current_region->len);



	/* No individiual memory sections defined so we can

	/* No individual memory sections defined so we can

	 * copy the entire memory region.

	 */

	if (fast_dump)

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

+4 −4
Original line number Diff line number Diff line
@@ -3854,9 +3854,9 @@ enum wmi_pdev_param { 
	 * retransmitting frames.

	 */

	WMI_PDEV_PARAM_DYNAMIC_BW,

	/* Non aggregrate/ 11g sw retry threshold.0-disable */

	/* Non aggregate/ 11g sw retry threshold.0-disable */

	WMI_PDEV_PARAM_NON_AGG_SW_RETRY_TH,

	/* aggregrate sw retry threshold. 0-disable*/

	/* aggregate sw retry threshold. 0-disable*/

	WMI_PDEV_PARAM_AGG_SW_RETRY_TH,

	/* Station kickout threshold (non of consecutive failures).0-disable */

	WMI_PDEV_PARAM_STA_KICKOUT_TH,
@@ -3953,9 +3953,9 @@ enum wmi_10x_pdev_param { 
	WMI_10X_PDEV_PARAM_PROTECTION_MODE,

	/* Dynamic bandwidth 0: disable 1: enable */

	WMI_10X_PDEV_PARAM_DYNAMIC_BW,

	/* Non aggregrate/ 11g sw retry threshold.0-disable */

	/* Non aggregate/ 11g sw retry threshold.0-disable */

	WMI_10X_PDEV_PARAM_NON_AGG_SW_RETRY_TH,

	/* aggregrate sw retry threshold. 0-disable*/

	/* aggregate sw retry threshold. 0-disable*/

	WMI_10X_PDEV_PARAM_AGG_SW_RETRY_TH,

	/* Station kickout threshold (non of consecutive failures).0-disable */

	WMI_10X_PDEV_PARAM_STA_KICKOUT_TH,