summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/main.c
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-07-20 17:53:56 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-07-20 15:04:41 -0400
commitd931998669c3e0e917bd9983880f3498c27de0af (patch)
tree927b6529e158a70ffd5a06766970015363dd9861 /drivers/net/wireless/libertas/main.c
parent3db4f989384c90f5f6be14e88c19732bfb0ac331 (diff)
downloadblackbird-op-linux-d931998669c3e0e917bd9983880f3498c27de0af.tar.gz
blackbird-op-linux-d931998669c3e0e917bd9983880f3498c27de0af.zip
libertas: only enable mesh when interface is active
Previously, the mesh was running whenever the appropriate hardware and firmware was present. Now we only run the mesh when the interface is running. Also simplifies interface management a little. Signed-off-by: Daniel Drake <dsd@laptop.org> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r--drivers/net/wireless/libertas/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index a839de06fa67..62b8dcbb4c23 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -511,7 +511,7 @@ static int lbs_thread(void *data)
if (priv->connect_status == LBS_CONNECTED)
netif_wake_queue(priv->dev);
if (priv->mesh_dev &&
- lbs_mesh_connected(priv))
+ netif_running(priv->mesh_dev))
netif_wake_queue(priv->mesh_dev);
}
}
OpenPOWER on IntegriCloud