Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b7d8287 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2018-01-19' of... 

Merge tag 'wireless-drivers-next-for-davem-2018-01-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.16

Final few patches before the merge window, nothing really special.

ath9k

* add MSI support (not enabled by default yet)

rtlwifi

* support A-MSDU in A-MPDU aggregation
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ef58ca38 5f906693

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -14771,9 +14771,9 @@ S: Maintained 
F:	drivers/hid/hid-wiimote*



WILOCITY WIL6210 WIRELESS DRIVER

M:	Maya Erez <qca_merez@qca.qualcomm.com>

M:	Maya Erez <merez@codeaurora.org>

L:	linux-wireless@vger.kernel.org

L:	wil6210@qca.qualcomm.com

L:	wil6210@qti.qualcomm.com

S:	Supported

W:	http://wireless.kernel.org/en/users/Drivers/wil6210

F:	drivers/net/wireless/ath/wil6210/

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

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ struct ath10k_ce_ops { 
			      dma_addr_t buffer, u32 nbytes,

			      u32 transfer_id, u32 flags);

};



static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned int ce_id)

{

	return CE0_BASE_ADDRESS + (CE1_BASE_ADDRESS - CE0_BASE_ADDRESS) * ce_id;

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

+7 −7
Original line number Diff line number Diff line
@@ -1276,7 +1276,10 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, 
		len -= sizeof(*hdr);

		data = hdr->data;



		if (len < ALIGN(ie_len, 4)) {

		/* jump over the padding */

		ie_len = ALIGN(ie_len, 4);



		if (len < ie_len) {

			ath10k_err(ar, "invalid length for board ie_id %d ie_len %zu len %zu\n",

				   ie_id, ie_len, len);

			ret = -EINVAL;
@@ -1315,9 +1318,6 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, 
			goto out;

		}



		/* jump over the padding */

		ie_len = ALIGN(ie_len, 4);



		len -= ie_len;

		data += ie_len;

	}
@@ -1448,6 +1448,9 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, 
		len -= sizeof(*hdr);

		data += sizeof(*hdr);



		/* jump over the padding */

		ie_len = ALIGN(ie_len, 4);



		if (len < ie_len) {

			ath10k_err(ar, "invalid length for FW IE %d (%zu < %zu)\n",

				   ie_id, len, ie_len);
@@ -1553,9 +1556,6 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, 
			break;

		}



		/* jump over the padding */

		ie_len = ALIGN(ie_len, 4);



		len -= ie_len;

		data += ie_len;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -1856,6 +1856,7 @@ struct ath10k_htt_rx_ops { 
	void* (*htt_get_vaddr_ring)(struct ath10k_htt *htt);

	void (*htt_reset_paddrs_ring)(struct ath10k_htt *htt, int idx);

};



#define RX_HTT_HDR_STATUS_LEN 64



/* This structure layout is programmed via rx ring setup

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

+1 −4
Original line number Diff line number Diff line
@@ -1478,13 +1478,10 @@ static int ath10k_pci_dump_memory_section(struct ath10k *ar, 
	if (!mem_region || !buf)

		return 0;



	if (mem_region->section_table.size < 0)

		return 0;



	cur_section = &mem_region->section_table.sections[0];



	if (mem_region->start > cur_section->start) {

		ath10k_warn(ar, "incorrect memdump region 0x%x with section start addrress 0x%x.\n",

		ath10k_warn(ar, "incorrect memdump region 0x%x with section start address 0x%x.\n",

			    mem_region->start, cur_section->start);

		return 0;

	}