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

Merge tag 'wireless-drivers-next-for-davem-2015-10-27' of... 

Merge tag 'wireless-drivers-next-for-davem-2015-10-27' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
here's a bigger pull request for 4.4. The diffstat looks scary as we
created a new directory realtek for all realtek drivers. In the future
I'm planning to create similar directories for all vendors, currently we
just have ath, mediatek and realtek. This change has been in linux-next
for a couple of weeks so it should be safe, but of course you never
know.

There's also a new driver rtl8xxxu for few realtek USB devices. This
just made it to the last linux-next build.

Otherwise there's nothing really special, more info below. If time
permits, and it's ok for you, I'm hoping to send you a one more pull
request this week.

brcmfmac

* using netdev carrier state
* add and rework some cfg80211 callbacks mainly for AP mode
* use devcoredump when triggered by firmware event

realtek

* create new directory drivers/net/wireless/realtek/ for all realtek
  drivers, not visible to users (no kconfig changes etc)
* add rtl8xxxu, a new mac80211 driver for RTL8723AU, RTL8188CU,
  RTL8188RU, RTL8191CU, RTL8192CU and hopefully more in the future

ath10k

* add board 2 API support for automatically choosing correct board file
* data path optimisations
* disable PCI power save for qca988x and QCA99x0 due to interop reasons

wil6210

* BlockAckReq support
* firmware crashdump using devcoredump
* capture all frames with sniffer
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f8e529ed c0963772

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -8901,6 +8901,13 @@ S: Maintained 
F:	drivers/net/wireless/rtlwifi/

F:	drivers/net/wireless/rtlwifi/rtl8192ce/



RTL8XXXU WIRELESS DRIVER (rtl8xxxu)

M:	Jes Sorensen <Jes.Sorensen@redhat.com>

L:	linux-wireless@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8723au-mac80211

S:	Maintained

F:	drivers/net/wireless/realtek/rtl8xxxu/



S3 SAVAGE FRAMEBUFFER DRIVER

M:	Antonino Daplas <adaplas@gmail.com>

L:	linux-fbdev@vger.kernel.org

drivers/net/wireless/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -214,8 +214,6 @@ config USB_NET_RNDIS_WLAN 


	  If you choose to build a module, it'll be called rndis_wlan.



source "drivers/net/wireless/rtl818x/Kconfig"



config ADM8211

	tristate "ADMtek ADM8211 support"

	depends on MAC80211 && PCI
@@ -243,6 +241,8 @@ config ADM8211 


	  Thanks to Infineon-ADMtek for their support of this driver.



source "drivers/net/wireless/realtek/rtl818x/Kconfig"



config MAC80211_HWSIM

	tristate "Simulated radio testing tool for mac80211"

	depends on MAC80211
@@ -278,7 +278,8 @@ source "drivers/net/wireless/orinoco/Kconfig" 
source "drivers/net/wireless/p54/Kconfig"

source "drivers/net/wireless/rt2x00/Kconfig"

source "drivers/net/wireless/mediatek/Kconfig"

source "drivers/net/wireless/rtlwifi/Kconfig"

source "drivers/net/wireless/realtek/rtlwifi/Kconfig"

source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"

source "drivers/net/wireless/ti/Kconfig"

source "drivers/net/wireless/zd1211rw/Kconfig"

source "drivers/net/wireless/mwifiex/Kconfig"

drivers/net/wireless/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ obj-$(CONFIG_HOSTAP) += hostap/ 
obj-$(CONFIG_B43)		+= b43/

obj-$(CONFIG_B43LEGACY)		+= b43legacy/

obj-$(CONFIG_ZD1211RW)		+= zd1211rw/

obj-$(CONFIG_RTL8180)		+= rtl818x/

obj-$(CONFIG_RTL8187)		+= rtl818x/

obj-$(CONFIG_RTLWIFI)		+= rtlwifi/

obj-$(CONFIG_WLAN)		+= realtek/



# 16-bit wireless PCMCIA client drivers

obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o

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

+10 −0
Original line number Diff line number Diff line
@@ -82,6 +82,16 @@ enum bmi_cmd_id { 


#define BMI_NVRAM_SEG_NAME_SZ 16



#define BMI_PARAM_GET_EEPROM_BOARD_ID 0x10



#define ATH10K_BMI_BOARD_ID_FROM_OTP_MASK   0x7c00

#define ATH10K_BMI_BOARD_ID_FROM_OTP_LSB    10



#define ATH10K_BMI_CHIP_ID_FROM_OTP_MASK    0x18000

#define ATH10K_BMI_CHIP_ID_FROM_OTP_LSB     15



#define ATH10K_BMI_BOARD_ID_STATUS_MASK 0xff



struct bmi_cmd {

	__le32 id; /* enum bmi_cmd_id */

	union {

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

+4 −6
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ int __ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, u32 paddr) 
	lockdep_assert_held(&ar_pci->ce_lock);



	if (CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) == 0)

		return -EIO;

		return -ENOSPC;



	desc->addr = __cpu_to_le32(paddr);

	desc->nbytes = 0;
@@ -1076,9 +1076,7 @@ void ath10k_ce_deinit_pipe(struct ath10k *ar, unsigned int ce_id) 
}



int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id,

			 const struct ce_attr *attr,

			 void (*send_cb)(struct ath10k_ce_pipe *),

			 void (*recv_cb)(struct ath10k_ce_pipe *))

			 const struct ce_attr *attr)

{

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

	struct ath10k_ce_pipe *ce_state = &ar_pci->ce_states[ce_id];
@@ -1104,10 +1102,10 @@ int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id, 
	ce_state->src_sz_max = attr->src_sz_max;



	if (attr->src_nentries)

		ce_state->send_cb = send_cb;

		ce_state->send_cb = attr->send_cb;



	if (attr->dest_nentries)

		ce_state->recv_cb = recv_cb;

		ce_state->recv_cb = attr->recv_cb;



	if (attr->src_nentries) {

		ce_state->src_ring = ath10k_ce_alloc_src_ring(ar, ce_id, attr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE