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

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

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

parents ddfdb508 a7b545f7

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ static struct usb_device_id ath3k_table[] = { 
	/* Atheros AR3011 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3002) },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },

	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ static struct usb_device_id blacklist_table[] = { 
	/* Atheros 3011 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },

drivers/net/wireless/iwlwifi/iwl-3945.c

+0 −1
Original line number Diff line number Diff line
@@ -2734,7 +2734,6 @@ static struct iwl_lib_ops iwl3945_lib = { 
	.isr_ops = {

		.isr = iwl_isr_legacy,

	},

	.check_plcp_health = iwl3945_good_plcp_health,



	.debugfs_ops = {

		.rx_stats_read = iwl3945_ucode_rx_stats_read,

net/bluetooth/l2cap.c

+1 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ static void __l2cap_sock_close(struct sock *sk, int reason) 
				result = L2CAP_CR_SEC_BLOCK;

			else

				result = L2CAP_CR_BAD_PSM;

			sk->sk_state = BT_DISCONN;



			rsp.scid   = cpu_to_le16(l2cap_pi(sk)->dcid);

			rsp.dcid   = cpu_to_le16(l2cap_pi(sk)->scid);

net/mac80211/util.c

+2 −0
Original line number Diff line number Diff line
@@ -1210,7 +1210,9 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
		switch (sdata->vif.type) {

		case NL80211_IFTYPE_STATION:

			changed |= BSS_CHANGED_ASSOC;

			mutex_lock(&sdata->u.mgd.mtx);

			ieee80211_bss_info_change_notify(sdata, changed);

			mutex_unlock(&sdata->u.mgd.mtx);

			break;

		case NL80211_IFTYPE_ADHOC:

			changed |= BSS_CHANGED_IBSS;