| From stable-bounces@linux.kernel.org Wed Nov 29 16:56:17 2006 |
| Date: Wed, 29 Nov 2006 18:51:12 -0600 |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| To: stable@kernel.org |
| Message-ID: <456E2B00.mail8SQ129K0F@lwfinger.net> |
| Cc: Michael Buesch <mb@bu3sch.de> |
| Subject: softmac: remove netif_tx_disable when scanning |
| |
| From: Michael Buesch <mb@bu3sch.de> |
| |
| In the scan section of ieee80211softmac, network transmits are disabled. |
| When SoftMAC re-enables transmits, it may override the wishes of a driver |
| that may have very good reasons for disabling transmits. At least one failure |
| in bcm43xx can be traced to this problem. In addition, several unexplained |
| problems may arise from the unexpected enabling of transmits. |
| |
| Signed-off-by: Michael Buesch <mb@bu3sch.de> |
| Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| --- |
| net/ieee80211/softmac/ieee80211softmac_scan.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- linux-2.6.19.orig/net/ieee80211/softmac/ieee80211softmac_scan.c |
| +++ linux-2.6.19/net/ieee80211/softmac/ieee80211softmac_scan.c |
| @@ -47,7 +47,6 @@ ieee80211softmac_start_scan(struct ieee8 |
| 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(stru |
| 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); |
