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

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-05-01

Please pull the following batch of fixes intended for the 3.15 stream!

For the Bluetooth bits, Gustavo says:

"Some fixes for 3.15. There is a revert for the intel driver, a new
device id, and two important SSP fixes from Johan."

On top of that...

Ben Hutchings gives us a fix for an unbalanced irq enable in an
rtl8192cu error path.

Colin Ian King provides an rtlwifi fix for an uninitialized variable.

Felix Fietkau brings a pair of ath9k fixes, one that corrects a
hardware initialization value and another that removes an (unnecessary)
flag that was being used in a way that led to a software tx queue
hang in ath9k.

Gertjan van Wingerde pushes a MAINTAINERS change to remove himself
from the rt2x00 maintainer team.

Hans de Goede fixes a brcmfmac firmware load hang.

Larry Finger changes rtlwifi to use the correct queue for V0 traffic
on rtl8192se.

Rajkumar Manoharan corrects a race in ath9k driver initialization.

Stanislaw Gruszka fixes an rt2x00 bug in which disabling beaconing
once on USB devices led to permanently disabling beaconing for those
devices.

Tim Harvey provides fixes for a pair of ath9k issues that can lead
to soft lockups in that driver.

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f6a082fe 812e4daf

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7277,7 +7277,6 @@ F: drivers/video/aty/aty128fb.c 
RALINK RT2X00 WIRELESS LAN DRIVER

P:	rt2x00 project

M:	Ivo van Doorn <IvDoorn@gmail.com>

M:	Gertjan van Wingerde <gwingerde@gmail.com>

M:	Helmut Schaa <helmut.schaa@googlemail.com>

L:	linux-wireless@vger.kernel.org

L:	users@rt2x00.serialmonkey.com (moderated for non-subscribers)

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x3004) },

	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x04CA, 0x3006) },

	{ USB_DEVICE(0x04CA, 0x3007) },

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x0930, 0x0219) },
@@ -131,6 +132,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+2 −3
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
@@ -1485,10 +1486,8 @@ static int btusb_probe(struct usb_interface *intf, 
	if (id->driver_info & BTUSB_BCM92035)

		hdev->setup = btusb_setup_bcm92035;



	if (id->driver_info & BTUSB_INTEL) {

		usb_enable_autosuspend(data->udev);

	if (id->driver_info & BTUSB_INTEL)

		hdev->setup = btusb_setup_intel;

	}



	/* Interface numbers are hardcoded in the specification */

	data->isoc = usb_ifnum_to_if(data->udev, 1);

drivers/net/wireless/ath/ath9k/ahb.c

+0 −4
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ static int ath_ahb_probe(struct platform_device *pdev) 
	int irq;

	int ret = 0;

	struct ath_hw *ah;

	struct ath_common *common;

	char hw_name[64];



	if (!dev_get_platdata(&pdev->dev)) {
@@ -146,9 +145,6 @@ static int ath_ahb_probe(struct platform_device *pdev) 
	wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",

		   hw_name, (unsigned long)mem, irq);



	common = ath9k_hw_common(sc->sc_ah);

	/* Will be cleared in ath9k_start() */

	set_bit(ATH_OP_INVALID, &common->op_flags);

	return 0;



 err_irq:

drivers/net/wireless/ath/ath9k/ani.c

+6 −0
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel, 
		ATH9K_ANI_RSSI_THR_LOW,

		ATH9K_ANI_RSSI_THR_HIGH);



	if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_OFDM_DEF_LEVEL)

		immunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;



	if (!scan)

		aniState->ofdmNoiseImmunityLevel = immunityLevel;
@@ -235,6 +238,9 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel, 
		BEACON_RSSI(ah), ATH9K_ANI_RSSI_THR_LOW,

		ATH9K_ANI_RSSI_THR_HIGH);



	if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_CCK_DEF_LEVEL)

		immunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;



	if (ah->opmode == NL80211_IFTYPE_STATION &&

	    BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW &&

	    immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)

CRA Git | Maintained and supported by SUSTech CRA and CCSE