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

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



John W. Linville says:

====================
pull request: wireless 2014-08-28

Please pull this batch of fixes intended for the 3.17 stream.

For the Bluetooth/6LowPAN/802.15.4 bits, Johan says:

'It contains a connection reference counting fix for LE where a
connection might stay up even though it should get disconnected.

The other 802.15.4 6LoWPAN related patches were sent to the bluetooth
tree by Alexander Aring and described as follows by him:

"
these patches contains patches for the bluetooth branch.

This series includes memory leak fixes and an errno value fix.
Also there are two patches for sending and receiving 1280 6LoWPAN
packets, which makes the IEEE 802.15.4 6LoWPAN stack more RFC
compliant.
"'

Along with that...

Alexey Khoroshilov fixes a use-after-free bug on at76c50x-usb.

Hauke Mehrtens adds a PCI ID to bcma.

Himangi Saraogi fixes a silly "A || A" test in rtlwifi.

Larry Finger adds a device ID to rtl8192cu.

Maks Naumov fixes a strncmp argument in ath9k.

Álvaro Fernández Rojas adds a PCI ID to ssb.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2bb71b69 c6651716

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },	/* 0xA8DB */

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);

drivers/net/wireless/at76c50x-usb.c

+1 −2
Original line number Diff line number Diff line
@@ -2423,8 +2423,6 @@ static void at76_delete_device(struct at76_priv *priv) 


	kfree_skb(priv->rx_skb);



	usb_put_dev(priv->udev);



	at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/ieee80211_hw",

		 __func__);

	ieee80211_free_hw(priv->hw);
@@ -2558,6 +2556,7 @@ static void at76_disconnect(struct usb_interface *interface) 


	wiphy_info(priv->hw->wiphy, "disconnecting\n");

	at76_delete_device(priv);

	usb_put_dev(priv->udev);

	dev_info(&interface->dev, "disconnected\n");

}

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

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static ssize_t write_file_spec_scan_ctl(struct file *file, 


	if (strncmp("trigger", buf, 7) == 0) {

		ath9k_spectral_scan_trigger(sc->hw);

	} else if (strncmp("background", buf, 9) == 0) {

	} else if (strncmp("background", buf, 10) == 0) {

		ath9k_spectral_scan_config(sc->hw, SPECTRAL_BACKGROUND);

		ath_dbg(common, CONFIG, "spectral scan: background mode enabled\n");

	} else if (strncmp("chanscan", buf, 8) == 0) {

drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static bool halbtc_legacy(struct rtl_priv *adapter) 


	bool is_legacy = false;



	if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_B))

	if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_G))

		is_legacy = true;



	return is_legacy;

drivers/net/wireless/rtlwifi/rtl8192cu/sw.c

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = { 
	{RTL_USB_DEVICE(0x0bda, 0x5088, rtl92cu_hal_cfg)}, /*Thinkware-CC&C*/

	{RTL_USB_DEVICE(0x0df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/

	{RTL_USB_DEVICE(0x0df6, 0x005c, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/

	{RTL_USB_DEVICE(0x0df6, 0x0070, rtl92cu_hal_cfg)}, /*Sitecom - 150N */

	{RTL_USB_DEVICE(0x0df6, 0x0077, rtl92cu_hal_cfg)}, /*Sitecom-WLA2100V2*/

	{RTL_USB_DEVICE(0x0eb0, 0x9071, rtl92cu_hal_cfg)}, /*NO Brand - Etop*/

	{RTL_USB_DEVICE(0x4856, 0x0091, rtl92cu_hal_cfg)}, /*NetweeN - Feixun*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE