[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>

diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 80284e609ce510808f8d9ac8729be884bdf0e9a2..48317503360aff4585e4e4dca6321b12d650ddac 100644 (file)
--- 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);
        }