diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-11-30 06:01:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-11-30 06:01:04 -0500 |
| commit | c1cb0b77f905a2f5f297e91fafbe766acc143891 (patch) | |
| tree | 64fdce32842a8fd0d0765745df7aaf207e34b07f /net/ieee80211/softmac/ieee80211softmac_scan.c | |
| parent | f2b67c7945e8d709444884633670fef498218639 (diff) | |
| parent | a88556a4b24baff99f5d2a2a05202c4aca44ea05 (diff) | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_scan.c')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_scan.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c index d31cf77498c4..ad67368b58ed 100644 --- a/net/ieee80211/softmac/ieee80211softmac_scan.c +++ b/net/ieee80211/softmac/ieee80211softmac_scan.c @@ -47,7 +47,6 @@ 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); @@ -248,7 +247,6 @@ 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); |