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

Commit 7b868fed authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2017-06-06' of... 

Merge tag 'wireless-drivers-for-davem-2017-06-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.12

It has been a slow start of cycle and this the first set of fixes for
4.12. Nothing really major here.

wcn36xx

* fix an issue with module reload

brcmfmac

* fix aligment regression on 64 bit systems

iwlwifi

* fixes for memory leaks, runtime PM, memory initialisation and other
  smaller problems

* fix IBSS on devices using DQA mode (7260 and up)

* fix the minimum firmware API requirement for 7265D, 3168, 8000 and
  8265
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 80971dfb dc89481b

drivers/net/wireless/ath/wcn36xx/main.c

+2 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,8 @@ static int wcn36xx_remove(struct platform_device *pdev) 
	qcom_smem_state_put(wcn->tx_enable_state);

	qcom_smem_state_put(wcn->tx_rings_empty_state);



	rpmsg_destroy_ept(wcn->smd_channel);



	iounmap(wcn->dxe_base);

	iounmap(wcn->ccu_base);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -3422,7 +3422,7 @@ static int brcmf_sdio_bus_preinit(struct device *dev) 
		/* otherwise, set txglomalign */

		value = sdiodev->settings->bus.sdio.sd_sgentry_align;

		/* SDIO ADMA requires at least 32 bit alignment */

		value = max_t(u32, value, 4);

		value = max_t(u32, value, ALIGNMENT);

		err = brcmf_iovar_data_set(dev, "bus:txglomalign", &value,

					   sizeof(u32));

	}

drivers/net/wireless/intel/iwlwifi/iwl-7000.c

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ 
/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	17

#define IWL7265_UCODE_API_MIN	17

#define IWL7265D_UCODE_API_MIN	17

#define IWL3168_UCODE_API_MIN	20

#define IWL7265D_UCODE_API_MIN	22

#define IWL3168_UCODE_API_MIN	22



/* NVM versions */

#define IWL7260_NVM_VERSION		0x0a1d

drivers/net/wireless/intel/iwlwifi/iwl-8000.c

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ 
#define IWL8265_UCODE_API_MAX	30



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	17

#define IWL8265_UCODE_API_MIN	20

#define IWL8000_UCODE_API_MIN	22

#define IWL8265_UCODE_API_MIN	22



/* NVM versions */

#define IWL8000_NVM_VERSION		0x0a1d

drivers/net/wireless/intel/iwlwifi/iwl-prph.h

+1 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ 
#define MON_DMARB_RD_DATA_ADDR		(0xa03c5c)



#define DBGC_IN_SAMPLE			(0xa03c00)

#define DBGC_OUT_CTRL			(0xa03c0c)



/* enable the ID buf for read */

#define WFPM_PS_CTL_CLR			0xA0300C