pull request: wireless-2.6 2009-05-29
Subsystems (3)
Dave,
Here are a couple of fixes that would be nice to have for 2.6.30 -- nothing very controversial. Each has a bugzilla.kernel.org entry listed in the changelog.
Please let me know if there are problems!
Thanks,
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/
---
The following changes since commit 4d3383d0adb6d1047fb9ee3edd9dc05e4d2184f0:
David S. Miller (1):
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
John W. Linville (2):
at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan
rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle
drivers/net/wireless/Kconfig | 1 + drivers/net/wireless/at76c50x-usb.c | 12 ++++++------ drivers/net/wireless/rtl818x/rtl8187_dev.c | 2 ++ 3 files changed, 9 insertions(+), 6 deletions(-)
drivers/net/wireless/Kconfig +1 -0
@@ -430,6 +430,7 @@ config RTL8187 ASUS P5B Deluxe Toshiba Satellite Pro series of laptops Asus Wireless Link + Linksys WUSB54GC-EU Thanks to Realtek for their support!
drivers/net/wireless/at76c50x-usb.c +6 -6
@@ -1873,18 +1873,18 @@ static void at76_dwork_hw_scan(struct work_struct *work)if (ret !=CMD_STATUS_COMPLETE ) {queue_delayed_work (priv->hw->workqueue, &priv->dwork_hw_scan,SCAN_POLL_INTERVAL ); - goto exit; +mutex_unlock (&priv->mtx); +return ; } -ieee80211_scan_completed (priv->hw, false); -if (is_valid_ether_addr (priv->bssid))at76_join (priv); -ieee80211_wake_queues (priv->hw); - -exit:mutex_unlock (&priv->mtx); + +ieee80211_scan_completed (priv->hw, false); + +ieee80211_wake_queues (priv->hw); } static int at76_hw_scan(struct ieee80211_hw *hw,
drivers/net/wireless/rtl818x/rtl8187_dev.c +2 -0
@@ -71,6 +71,8 @@ static struct usb_device_id rtl8187_table[] __devinitdata = { {USB_DEVICE(0x18E8, 0x6232), .driver_info = DEVICE_RTL8187}, /* AirLive */ {USB_DEVICE(0x1b75, 0x8187), .driver_info = DEVICE_RTL8187}, + /* Linksys */ + {USB_DEVICE(0x1737, 0x0073), .driver_info = DEVICE_RTL8187B}, {} };
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Fri, 29 May 2009 15:28:59 +0200
Quoted 5 lines
Here are a couple of fixes that would be nice to have for 2.6.30 -- nothing very controversial. Each has a bugzilla.kernel.org entry listed in the changelog.
Please let me know if there are problems!
I know you're away and not at %100 but please do always CC:
netdev for your pull requests so that the attached patch gets reviewed by networking folks and more importantly logged at:
http://patchwork.ozlabs.org/project/netdev/list/
so that I can track it properly.
Thanks.
Quoted 9 lines · David Miller
From: "John W. Linville" <[email protected]>
Date: Fri, 29 May 2009 15:28:59 +0200Quoted 5 lines
Here are a couple of fixes that would be nice to have for 2.6.30 -- nothing very controversial. Each has a bugzilla.kernel.org entry listed in the changelog.
Please let me know if there are problems!
Quoted 7 lines
I know you're away and not at %100 but please do always CC:
netdev for your pull requests so that the attached patch gets reviewed by networking folks and more importantly logged at:http://patchwork.ozlabs.org/project/netdev/list/
so that I can track it properly.
Ooops! Sorry...yes, not at 100%... :-)
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Fri, 29 May 2009 15:28:59 +0200
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitmaster
Pulled, thanks a lot John.