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

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

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

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



Kalle Valo says:

====================
wireless-drivers-next patches for 4.13

The first pull request for 4.13. We have a new driver qtnfmac, but
also rsi driver got a support for new firmware and supporting ath10k
SDIO devices was started.

Major changes:

ath10k

* add initial SDIO support (still work in progress)

rsi

* new loading for the new firmware version

rtlwifi

* final patches for the new btcoex support

rt2x00

* add device ID for Epson WN7512BEP

qtnfmac

* new driver for Quantenna QSR10G chipsets
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 073cf9e2 219569ad

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -10634,6 +10634,14 @@ L: qemu-devel@nongnu.org 
S:	Maintained

F:	drivers/firmware/qemu_fw_cfg.c



QUANTENNA QTNFMAC WIRELESS DRIVER

M:   Igor Mitsyanko <imitsyanko@quantenna.com>

M:   Avinash Patil <avinashp@quantenna.com>

M:   Sergey Matyukevich <smatyukevich@quantenna.com>

L:   linux-wireless@vger.kernel.org

S:   Maintained

F:   drivers/net/wireless/quantenna



RADOS BLOCK DEVICE (RBD)

M:	Ilya Dryomov <idryomov@gmail.com>

M:	Sage Weil <sage@redhat.com>

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ source "drivers/net/wireless/rsi/Kconfig" 
source "drivers/net/wireless/st/Kconfig"

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

source "drivers/net/wireless/zydas/Kconfig"

source "drivers/net/wireless/quantenna/Kconfig"



config PCMCIA_RAYCS

	tristate "Aviator/Raytheon 2.4GHz wireless support"

drivers/net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/ 
obj-$(CONFIG_WLAN_VENDOR_ST) += st/

obj-$(CONFIG_WLAN_VENDOR_TI) += ti/

obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/

obj-$(CONFIG_WLAN_VENDOR_QUANTENNA) += quantenna/



# 16-bit wireless PCMCIA client drivers

obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o

drivers/net/wireless/ath/ath10k/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ config ATH10K_AHB 
	---help---

	  This module adds support for AHB bus



config ATH10K_SDIO

	tristate "Atheros ath10k SDIO support (EXPERIMENTAL)"

	depends on ATH10K && MMC

	---help---

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

	  work in progress and will not fully work.



config ATH10K_DEBUG

	bool "Atheros ath10k debugging"

	depends on ATH10K

drivers/net/wireless/ath/ath10k/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -27,5 +27,8 @@ ath10k_pci-y += pci.o \ 


ath10k_pci-$(CONFIG_ATH10K_AHB) += ahb.o



obj-$(CONFIG_ATH10K_SDIO) += ath10k_sdio.o

ath10k_sdio-y += sdio.o



# for tracing framework to find trace.h

CFLAGS_trace.o := -I$(src)