Add softmac-remove-netif_tx_disable-when-scanning.patch to 2.6.18/19 queues

diff --git a/queue-2.6.18/series b/queue-2.6.18/series
new file mode 100644 (file)
index 0000000..385a37f
--- /dev/null
+++ b/queue-2.6.18/series
@@ -0,0 +1 @@
+softmac-remove-netif_tx_disable-when-scanning.patch

diff --git a/queue-2.6.18/softmac-remove-netif_tx_disable-when-scanning.patch b/queue-2.6.18/softmac-remove-netif_tx_disable-when-scanning.patch
new file mode 100644 (file)
index 0000000..037a3a5
--- /dev/null
+++ b/queue-2.6.18/softmac-remove-netif_tx_disable-when-scanning.patch
@@ -0,0 +1,41 @@
+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.18.5.orig/net/ieee80211/softmac/ieee80211softmac_scan.c
++++ linux-2.6.18.5/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);

diff --git a/queue-2.6.19/series b/queue-2.6.19/series
index d38897d50b655a1f10062924ce07cd60f9cc4fa6..459513f1000fd028d7cad36da2a043dfa324edf2 100644 (file)
--- a/queue-2.6.19/series
+++ b/queue-2.6.19/series
@@ -1 +1,2 @@
 ndisc-calculate-packet-length-correctly-for-allocation.patch
+softmac-remove-netif_tx_disable-when-scanning.patch

diff --git a/queue-2.6.19/softmac-remove-netif_tx_disable-when-scanning.patch b/queue-2.6.19/softmac-remove-netif_tx_disable-when-scanning.patch
new file mode 100644 (file)
index 0000000..f4f169d
--- /dev/null
+++ b/queue-2.6.19/softmac-remove-netif_tx_disable-when-scanning.patch
@@ -0,0 +1,41 @@
+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);