diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-22 23:51:16 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-22 23:51:16 +0200 |
| commit | 41bf37117b47fc5ce2aae91f6a108e7e42e0b046 (patch) | |
| tree | d5c8f24075313edfe548256dd931527f1569921e /drivers/net/wireless/libertas/main.c | |
| parent | icmp: Fix regression in nexthop resolution during replies. (diff) | |
| parent | bcma: fix 'SSB_PCICORE_BFL_NOPCI' undeclared build breakage (diff) | |
| download | linux-41bf37117b47fc5ce2aae91f6a108e7e42e0b046.tar.xz linux-41bf37117b47fc5ce2aae91f6a108e7e42e0b046.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index c79aac4b1dae..94652c5a25de 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -512,7 +512,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); } } |