Skip to contentSkip to conversation

pull request: wireless-2.6 2011-02-14

PATCH John W. Linville 3 participants 5 messages Feb 14, 2011

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

Dave,

A handful of fixes intended for 2.6.38...

This includes a couple of bluetooth device IDs, a bluetooth one-liner to avoid multiple connection responses, a locking fix to avoid some log spam, and a patch to turn off PCLP health checking for iwl3945 (because the checking has not proven helpful and it kills performance).

Please let me know if there are problems!

Thanks,

John

---

The following changes since commit ddfdb508866b3c07b295f6c85c271981d88afe4c:

net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING (2011-02-14 11:44:01 -0800)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master

Bao Liang (1):
Bluetooth: Set conn state to BT_DISCONN to avoid multiple responses

Cho, Yu-Chen (1):
Bluetooth: add Atheros BT AR9285 fw supported

Eliad Peller (1):
mac80211: add missing locking in ieee80211_reconfig

John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6

Stanislaw Gruszka (1):
iwl3945: remove plcp check

 drivers/bluetooth/ath3k.c               |    2 ++
 drivers/bluetooth/btusb.c               |    3 +++
 drivers/net/wireless/iwlwifi/iwl-3945.c |    1 -
 net/bluetooth/l2cap.c                   |    1 +
 net/mac80211/util.c                     |    2 ++
 5 files changed, 8 insertions(+), 1 deletions(-)
drivers/bluetooth/ath3k.c +2 -0
index a126e61..333c212 100644
@@ -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
index 1da773f..4cefa91 100644
@@ -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
index a9b852b..3eb14fd 100644
@@ -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
index 7550abb..675614e 100644
@@ -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
index cf68700..d036597 100644
@@ -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;
Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
maintainer
#1 lore raw

From: "John W. Linville" <[email protected]>
Date: Mon, 14 Feb 2011 15:44:06 -0500

Quoted 8 lines

A handful of fixes intended for 2.6.38...

This includes a couple of bluetooth device IDs, a bluetooth one-liner to avoid multiple connection responses, a locking fix to avoid some log spam, and a patch to turn off PCLP health checking for iwl3945 (because the checking has not proven helpful and it kills performance).

Please let me know if there are problems!

Pulled, thanks John.

maintainer
#2 lore raw

From: David Miller <[email protected]>
Date: Mon, 14 Feb 2011 12:51:48 -0800 (PST)

Quoted 5 lines

From: "John W. Linville" <[email protected]>
Date: Mon, 14 Feb 2011 15:44:06 -0500

Quoted 2 lines

A handful of fixes intended for 2.6.38...

Quoted 8 lines
Quoted 6 lines

This includes a couple of bluetooth device IDs, a bluetooth one-liner to avoid multiple connection responses, a locking fix to avoid some log spam, and a patch to turn off PCLP health checking for iwl3945 (because the checking has not proven helpful and it kills performance).

Please let me know if there are problems!

Pulled, thanks John.

Please address this newly introduced warning in a future pull request, thanks:

drivers/net/wireless/iwlwifi/iwl-3945.c:411:13: warning: 'iwl3945_good_plcp_health' defined but not used

maintainer
#3 lore raw
Quoted 4 lines · David Miller

Please address this newly introduced warning in a future pull request, thanks:

drivers/net/wireless/iwlwifi/iwl-3945.c:411:13: warning: 'iwl3945_good_plcp_health' defined but not used

The function can simply be deleted.

johannes

maintainer
#4 lore raw

From: Johannes Berg <[email protected]>
Date: Mon, 14 Feb 2011 22:12:22 +0100

Quoted 8 lines · David Miller
Quoted 5 lines

Please address this newly introduced warning in a future pull request, thanks:

drivers/net/wireless/iwlwifi/iwl-3945.c:411:13: warning: 'iwl3945_good_plcp_health' defined but not used

The function can simply be deleted.

Done.