aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2007-05-25 12:13:24 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-06-11 14:28:39 -0400
commit0583e8ef149700ede2aa181509e217c39e565f28 (patch)
tree563408ecc4cd17d7403c43ff8dc7697c7615dd42 /drivers
parent0601e7ee463f2736586de9a24025f8791db7f5a8 (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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/scan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 80284e609ce..48317503360 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,
wlan_scan_process_results(priv);
if (priv->adapter->connect_status == libertas_connected) {
+ netif_carrier_on(priv->wlan_dev.netdev);
+ netif_wake_queue(priv->wlan_dev.netdev);
netif_carrier_on(priv->mesh_dev);
netif_wake_queue(priv->mesh_dev);
}