git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
libertas
/
main.c
diff --git
a/drivers/net/wireless/libertas/main.c
b/drivers/net/wireless/libertas/main.c
index
c79aac4
..
94652c5
100644
(file)
--- 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(pri
v))
+
netif_running(priv->mesh_de
v))
netif_wake_queue(priv->mesh_dev);
}
}