Commit b1cb6ad7 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.8. Major changes:

ath10k

* SDIO and SNOC are not experimental anymore
parents 50ce4c09 25ca180a

drivers/net/wireless/ath/ath10k/Kconfig

+3 −4
Original line number Diff line number Diff line
@@ -28,11 +28,10 @@ config ATH10K_AHB 
	  This module adds support for AHB bus



config ATH10K_SDIO

	tristate "Atheros ath10k SDIO support (EXPERIMENTAL)"

	tristate "Atheros ath10k SDIO support"

	depends on ATH10K && MMC

	---help---

	  This module adds experimental support for SDIO/MMC bus. Currently

	  work in progress and will not fully work.

	  This module adds support for SDIO/MMC bus.



config ATH10K_USB

	tristate "Atheros ath10k USB support (EXPERIMENTAL)"
@@ -42,7 +41,7 @@ config ATH10K_USB 
	  work in progress and will not fully work.



config ATH10K_SNOC

	tristate "Qualcomm ath10k SNOC support (EXPERIMENTAL)"

	tristate "Qualcomm ath10k SNOC support"

	depends on ATH10K

	depends on ARCH_QCOM || COMPILE_TEST

	select QCOM_QMI_HELPERS

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

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ struct ath10k_ce_ring { 
	struct ce_desc_64 *shadow_base;



	/* keep last */

	void *per_transfer_context[0];

	void *per_transfer_context[];

};



struct ath10k_ce_pipe {

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

+1 −1
Original line number Diff line number Diff line
@@ -1262,7 +1262,7 @@ struct ath10k { 
	int coex_gpio_pin;



	/* must be last */

	u8 drv_priv[0] __aligned(sizeof(void *));

	u8 drv_priv[] __aligned(sizeof(void *));

};



static inline bool ath10k_peer_stats_enabled(struct ath10k *ar)

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

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct ath10k_dump_file_data { 
	u8 unused[128];



	/* struct ath10k_tlv_dump_data + more */

	u8 data[0];

	u8 data[];

} __packed;



struct ath10k_dump_ram_data_hdr {
@@ -100,7 +100,7 @@ struct ath10k_dump_ram_data_hdr { 
	/* length of payload data, not including this header */

	__le32 length;



	u8 data[0];

	u8 data[];

};



/* magic number to fill the holes not copied due to sections in regions */

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

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct ath10k_pktlog_hdr { 
	__le16 log_type; /* Type of log information foll this header */

	__le16 size; /* Size of variable length log information in bytes */

	__le32 timestamp;

	u8 payload[0];

	u8 payload[];

} __packed;



/* FIXME: How to calculate the buffer size sanely? */