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

Commit e8573758 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 4e0168fa aeeab4ff

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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},

	{}

};