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

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

Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of... 

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



Kalle Valo says:

====================
new driver mt7601u for MediaTek Wi-Fi devices MT7601U

ath10k:

* qca6174 power consumption improvements, enable ASPM etc (Michal)

wil6210:

* support Wi-Fi Simple Configuration in STA mode

iwlwifi:

* a few fixes (re-enablement of interrupts for certain new
  platforms that have special power states)
* Rework completely the RBD allocation model towards new
  multi RX hardware.
* cleanups
* scan reworks continuation (Luca)

mwifiex:

* improve firmware debug functionality

rtlwifi:

* update regulatory database

brcmfmac:

* cleanup and new feature support in PCIe code
* alternative nvram loading for router support
====================

Conflicts:
	drivers/net/wireless/iwlwifi/Kconfig

Trivial conflict in iwlwifi Kconfig, two commits adding
the same two chip numbers to the help text, but order
transposed.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 22793e5d 1690faef

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -6372,6 +6372,12 @@ F: include/uapi/linux/meye.h 
F:	include/uapi/linux/ivtv*

F:	include/uapi/linux/uvcvideo.h



MEDIATEK MT7601U WIRELESS LAN DRIVER

M:	Jakub Kicinski <kubakici@wp.pl>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/mediatek/mt7601u/



MEGARAID SCSI/SAS DRIVERS

M:	Kashyap Desai <kashyap.desai@avagotech.com>

M:	Sumit Saxena <sumit.saxena@avagotech.com>

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ source "drivers/net/wireless/libertas/Kconfig" 
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/ti/Kconfig"

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

drivers/net/wireless/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ obj-$(CONFIG_IWLWIFI) += iwlwifi/ 
obj-$(CONFIG_IWLEGACY)	+= iwlegacy/

obj-$(CONFIG_RT2X00)	+= rt2x00/



obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/



obj-$(CONFIG_P54_COMMON)	+= p54/



obj-$(CONFIG_ATH_CARDS)		+= ath/

drivers/net/wireless/adm8211.c

+12 −8
Original line number Diff line number Diff line
@@ -1098,13 +1098,17 @@ static void adm8211_hw_init(struct ieee80211_hw *dev) 
		pci_read_config_byte(priv->pdev, PCI_CACHE_LINE_SIZE, &cline);



		switch (cline) {

		case  0x8: reg |= (0x1 << 14);

		case  0x8:

			reg |= (0x1 << 14);

			break;

		case 0x16: reg |= (0x2 << 14);

		case 0x10:

			reg |= (0x2 << 14);

			break;

		case 0x32: reg |= (0x3 << 14);

		case 0x20:

			reg |= (0x3 << 14);

			break;

		  default: reg |= (0x0 << 14);

		default:

			reg |= (0x0 << 14);

			break;

		}

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -387,7 +387,9 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) 


	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot otp execute result %d\n", result);



	if (!skip_otp && result != 0) {

	if (!(skip_otp || test_bit(ATH10K_FW_FEATURE_IGNORE_OTP_RESULT,

				   ar->fw_features))

	    && result != 0) {

		ath10k_err(ar, "otp calibration failed: %d", result);

		return -EINVAL;

	}