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

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

Merge tag 'master-2014-12-15' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-12-16

Please pull this batch of fixes intended for the 3.19 stream!

For the Bluetooth bits, Johan says:

"The patches consist of:

 - Coccinelle warning fix
 - hci_dev_lock/unlock fixes
 - Fixes for pending mgmt command handling
 - Fixes for properly following the force_lesc_support switch
 - Fix for a Microsoft branded Broadcom adapter
 - New device id for Atheros AR3012
 - Fix for BR/EDR Secure Connections enabling"

Along with that...

Brian Norris avoids leaking some kernel memory contents via printk in brcmsmac.

Julia Lawall corrects some misspellings in a few drivers.

Larry Finger gives us one more rtlwifi fix to correct a porting oversight.

Wei Yongjun fixes a sparse warning in rtlwifi.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6539c44d 9a1dce3a

drivers/bluetooth/ath3k.c

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

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x04CA, 0x3010) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x0220) },

	{ USB_DEVICE(0x0930, 0x0227) },
@@ -140,6 +141,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ 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(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },

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

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

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

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ 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(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },

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

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

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

drivers/net/wireless/brcm80211/brcmsmac/main.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static const u16 xmtfifo_sz[][NFIFO] = { 
static const char * const fifo_names[] = {

	"AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" };

#else

static const char fifo_names[6][0];

static const char fifo_names[6][1];

#endif



#ifdef DEBUG

drivers/net/wireless/hostap/hostap_cs.c

+5 −10
Original line number Diff line number Diff line
@@ -381,18 +381,15 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr) 


	res = pcmcia_read_config_byte(hw_priv->link, CISREG_COR, &old_cor);

	if (res != 0) {

		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "

		       "(%d)\n", res);

		printk(KERN_DEBUG "%s failed 1 (%d)\n", __func__, res);

		return;

	}

	printk(KERN_DEBUG "prism2_pccard_genesis_sreset: original COR %02x\n",

		old_cor);

	printk(KERN_DEBUG "%s: original COR %02x\n", __func__, old_cor);



	res = pcmcia_write_config_byte(hw_priv->link, CISREG_COR,

				old_cor | COR_SOFT_RESET);

	if (res != 0) {

		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "

		       "(%d)\n", res);

		printk(KERN_DEBUG "%s failed 2 (%d)\n", __func__, res);

		return;

	}
@@ -401,8 +398,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr) 
	/* Setup Genesis mode */

	res = pcmcia_write_config_byte(hw_priv->link, CISREG_CCSR, hcr);

	if (res != 0) {

		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "

		       "(%d)\n", res);

		printk(KERN_DEBUG "%s failed 3 (%d)\n", __func__, res);

		return;

	}

	mdelay(10);
@@ -410,8 +406,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr) 
	res = pcmcia_write_config_byte(hw_priv->link, CISREG_COR,

				old_cor & ~COR_SOFT_RESET);

	if (res != 0) {

		printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "

		       "(%d)\n", res);

		printk(KERN_DEBUG "%s failed 4 (%d)\n", __func__, res);

		return;

	}

drivers/net/wireless/rtlwifi/rtl8192ce/hw.c

+2 −0
Original line number Diff line number Diff line
@@ -955,6 +955,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw) 
	local_save_flags(flags);

	local_irq_enable();



	rtlhal->fw_ready = false;

	rtlpriv->intf_ops->disable_aspm(hw);

	rtstatus = _rtl92ce_init_mac(hw);

	if (!rtstatus) {
@@ -971,6 +972,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw) 
		goto exit;

	}



	rtlhal->fw_ready = true;

	rtlhal->last_hmeboxnum = 0;

	rtl92c_phy_mac_config(hw);

	/* because last function modify RCR, so we update