From c4f310734595256b7a4c0885fa49e1c8477a4666 Mon Sep 17 00:00:00 2001 From: "johannes@sipsolutions.net" Date: Tue, 11 Apr 2006 10:58:07 +0200 Subject: [PATCH] --- yaml --- r: 26087 b: refs/heads/master c: fc242746ea8d87b3032c7a1c9b8eb71c149488a8 h: refs/heads/master i: 26085: cdc62303cc021b445ff103c3c6293c7e14100efa 26083: 3fc71273676ae16e489759ca5ee1f98844182641 26079: a4bfeb340bef6315b6145d2d699e3347377495c4 v: v3 --- [refs] | 2 +- trunk/net/ieee80211/softmac/ieee80211softmac_scan.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 28c6359ff642..98a487031fdb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba2f8c18756b4a99c8cd3ab6526b2ed7a8f18ead +refs/heads/master: fc242746ea8d87b3032c7a1c9b8eb71c149488a8 diff --git a/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c b/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c index bb9ab8b45d09..2b9e7edfa3ce 100644 --- a/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c +++ b/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c @@ -47,6 +47,7 @@ ieee80211softmac_start_scan(struct ieee80211softmac_device *sm) sm->scanning = 1; spin_unlock_irqrestore(&sm->lock, flags); + netif_tx_disable(sm->ieee->dev); ret = sm->start_scan(sm->dev); if (ret) { spin_lock_irqsave(&sm->lock, flags); @@ -239,6 +240,7 @@ void ieee80211softmac_scan_finished(struct ieee80211softmac_device *sm) if (net) sm->set_channel(sm->dev, net->channel); } + netif_wake_queue(sm->ieee->dev); ieee80211softmac_call_events(sm, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, NULL); } EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished);