summaryrefslogtreecommitdiff
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-05-15 14:55:26 +0400
committerJohn W. Linville <linville@tuxdriver.com>2008-05-22 05:48:08 +0400
commit36d6825b91bc492b65b6333c369cd96a2fc8c903 (patch)
tree9113754ce110d593da8019a329c4afb229a036b3 /net/mac80211/main.c
parentc4680470a34a4f39af3d0a5c40f70befd8701908 (diff)
downloadlinux-36d6825b91bc492b65b6333c369cd96a2fc8c903.tar.xz
mac80211: let drivers wake but not start queues
Having drivers start queues is just confusing, their ->start() callback can block and do whatever is necessary, so let mac80211 start queues and have drivers wake queues when necessary (to get packets flowing again right away.) Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index b0fddb7de549..9761d9bd5a79 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -110,7 +110,13 @@ static int ieee80211_master_open(struct net_device *dev)
break;
}
}
- return res;
+
+ if (res)
+ return res;
+
+ netif_start_queue(local->mdev);
+
+ return 0;
}
static int ieee80211_master_stop(struct net_device *dev)