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

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

Merge branch 'wireless' 



John W. Linville says:

====================
For now I have dropped the mac80211 tree from this request.
We are developing a little backlog of fixes and I would like to
avoid introducing any more uncertainty to this pull request for the
3.10 stream.  All the other bits are the same as what was in the
2013-06-06 request, including the ath9k fixes intended to address
the problems observed by Linus w/ his Pixel, and a CVE fix for a
potential security issue in the b43 driver.

Regarding the wl12xx bits, Luca says:

"Here are three patches that I'd like to get into 3.10.  Two of them, by
me, are related to the firmware version checks in our driver.  Without
them, the firmwares fail to load.  The other one, by Eliad, fixes a typo
bug in our 5GHz scanning code."

And as for the Bluetooth bits, Gustavo says:

"The following patches are important bug fixes for 3.10, plus the
support for a new device. We do have three fixes from Johan. The first
one is a fix to avoid LE-only devices to rely on the (inexistent)
extended features data. The second patch fixes length checks on
incoming L2CAP signalling PDUs so we can discard PDU whose size
doesn't match the one reported in the header.  The last one fixes
the handling of power on failures, we now report proper errors to
mgmt when hci_dev_open()."

Along with that...

Larry Finger corrects an rtlwifi problem that caused some devices to
refuse to connect to non-WPA2 networks if the device had previously
assocated with a WPA2 network.  He also adds a one-line fix to prevent
false reports from kmemleak.

Mark A. Greer fixes an out of bounds array access in mwifiex.

Felix Fietkau reverts an earlier ath9k initval patch that reduced rx
sensitivity in a number of ath9k devices with no corresponding benefit.

Kees Cook fixes a potential uid-0 to ring-0 escalation in b43
(CVE-2013-2852).

Sujith Manoharan turns-off powersave mode by default for ath9k, and
also defaults ath9k to use the minstrel_ht rate control algorithm.
Both of these are believed to contribute to greater stability/usability
of ath9k in real-world situations.

Yijing Wang fixes an iwlegacy build error for il_pm_ops if CONFIG_PM
is set but CONFIG_PM_SLEEP is not set.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b79462a8 42d887a6

drivers/bluetooth/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ config BT_MRVL 
	  The core driver to support Marvell Bluetooth devices.



	  This driver is required if you want to support

	  Marvell Bluetooth devices, such as 8688/8787/8797.

	  Marvell Bluetooth devices, such as 8688/8787/8797/8897.



	  Say Y here to compile Marvell Bluetooth driver

	  into the kernel or say M to compile it as module.
@@ -214,7 +214,7 @@ config BT_MRVL_SDIO 
	  The driver for Marvell Bluetooth chipsets with SDIO interface.



	  This driver is required if you want to use Marvell Bluetooth

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8897

	  chipsets are supported.



	  Say Y here to compile support for Marvell BT-over-SDIO driver

drivers/bluetooth/btmrvl_sdio.c

+28 −0
Original line number Diff line number Diff line
@@ -82,6 +82,23 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = { 
	.io_port_2 = 0x7a,

};



static const struct btmrvl_sdio_card_reg btmrvl_reg_88xx = {

	.cfg = 0x00,

	.host_int_mask = 0x02,

	.host_intstatus = 0x03,

	.card_status = 0x50,

	.sq_read_base_addr_a0 = 0x60,

	.sq_read_base_addr_a1 = 0x61,

	.card_revision = 0xbc,

	.card_fw_status0 = 0xc0,

	.card_fw_status1 = 0xc1,

	.card_rx_len = 0xc2,

	.card_rx_unit = 0xc3,

	.io_port_0 = 0xd8,

	.io_port_1 = 0xd9,

	.io_port_2 = 0xda,

};



static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {

	.helper		= "mrvl/sd8688_helper.bin",

	.firmware	= "mrvl/sd8688.bin",
@@ -103,6 +120,13 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = { 
	.sd_blksz_fw_dl	= 256,

};



static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = {

	.helper		= NULL,

	.firmware	= "mrvl/sd8897_uapsta.bin",

	.reg		= &btmrvl_reg_88xx,

	.sd_blksz_fw_dl	= 256,

};



static const struct sdio_device_id btmrvl_sdio_ids[] = {

	/* Marvell SD8688 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),
@@ -116,6 +140,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = { 
	/* Marvell SD8797 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8797 },

	/* Marvell SD8897 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8897 },



	{ }	/* Terminating entry */

};
@@ -1194,3 +1221,4 @@ MODULE_FIRMWARE("mrvl/sd8688_helper.bin"); 
MODULE_FIRMWARE("mrvl/sd8688.bin");

MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin");

drivers/net/wireless/ath/ath9k/Kconfig

+7 −3
Original line number Diff line number Diff line
@@ -92,13 +92,17 @@ config ATH9K_MAC_DEBUG 
	  This option enables collection of statistics for Rx/Tx status

	  data and some other MAC related statistics



config ATH9K_RATE_CONTROL

config ATH9K_LEGACY_RATE_CONTROL

	bool "Atheros ath9k rate control"

	depends on ATH9K

	default y

	default n

	---help---

	  Say Y, if you want to use the ath9k specific rate control

	  module instead of minstrel_ht.

	  module instead of minstrel_ht. Be warned that there are various

	  issues with the ath9k RC and minstrel is a more robust algorithm.

	  Note that even if this option is selected, "ath9k_rate_control"

	  has to be passed to mac80211 using the module parameter,

	  ieee80211_default_rc_algo.



config ATH9K_HTC

       tristate "Atheros HTC based wireless cards support"

drivers/net/wireless/ath/ath9k/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ath9k-y += beacon.o \ 
		antenna.o



ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o

ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o

ath9k-$(CONFIG_ATH9K_LEGACY_RATE_CONTROL) += rc.o

ath9k-$(CONFIG_ATH9K_PCI) += pci.o

ath9k-$(CONFIG_ATH9K_AHB) += ahb.o

ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o

drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h

+5 −5
Original line number Diff line number Diff line
@@ -958,11 +958,11 @@ static const u32 ar9300Common_rx_gain_table_2p2[][2] = { 
	{0x0000a074, 0x00000000},

	{0x0000a078, 0x00000000},

	{0x0000a07c, 0x00000000},

	{0x0000a080, 0x1a1a1a1a},

	{0x0000a084, 0x1a1a1a1a},

	{0x0000a088, 0x1a1a1a1a},

	{0x0000a08c, 0x1a1a1a1a},

	{0x0000a090, 0x171a1a1a},

	{0x0000a080, 0x22222229},

	{0x0000a084, 0x1d1d1d1d},

	{0x0000a088, 0x1d1d1d1d},

	{0x0000a08c, 0x1d1d1d1d},

	{0x0000a090, 0x171d1d1d},

	{0x0000a094, 0x11111717},

	{0x0000a098, 0x00030311},

	{0x0000a09c, 0x00000000},