diff options
author | Chris Ball <cjb@laptop.org> | 2007-05-25 12:13:24 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-06-11 14:28:39 -0400 |
commit | 0583e8ef149700ede2aa181509e217c39e565f28 (patch) | |
tree | 563408ecc4cd17d7403c43ff8dc7697c7615dd42 | |
parent | 0601e7ee463f2736586de9a24025f8791db7f5a8 (diff) |
[PATCH] libertas: wakeup both mesh and normal wakeup when getting out of scan
The previous patch wakes up the mesh device *instead* of the wlan device
when coming out of scan. We need to wake up both of them.
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/libertas/scan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index 80284e609ce5..48317503360a 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c | |||
@@ -827,6 +827,8 @@ int wlan_scan_networks(wlan_private * priv, | |||
827 | wlan_scan_process_results(priv); | 827 | wlan_scan_process_results(priv); |
828 | 828 | ||
829 | if (priv->adapter->connect_status == libertas_connected) { | 829 | if (priv->adapter->connect_status == libertas_connected) { |
830 | netif_carrier_on(priv->wlan_dev.netdev); | ||
831 | netif_wake_queue(priv->wlan_dev.netdev); | ||
830 | netif_carrier_on(priv->mesh_dev); | 832 | netif_carrier_on(priv->mesh_dev); |
831 | netif_wake_queue(priv->mesh_dev); | 833 | netif_wake_queue(priv->mesh_dev); |
832 | } | 834 | } |