upgrade a few packages to newer versions (includes patch by kaloz) - preparation...

[openwrt.git] / package / madwifi / patches / 118-txstop_workaround.patch

diff --git a/package/madwifi/patches/118-txstop_workaround.patch b/package/madwifi/patches/118-txstop_workaround.patch
index de0085f..3133c41 100644 (file)
--- a/package/madwifi/patches/118-txstop_workaround.patch
+++ b/package/madwifi/patches/118-txstop_workaround.patch
@@ -1,23 +1,14 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c   2007-05-15 16:26:02.721036296 +0200
-+++ madwifi.dev/ath/if_ath.c   2007-05-20 21:33:53.269103736 +0200
-@@ -1711,6 +1711,7 @@
-                       } 
- #endif
-                       ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
-+                      sc->sc_tx_start = 0;
-               }
-               if (status & HAL_INT_BMISS) {
-                       sc->sc_stats.ast_bmiss++;
-@@ -2261,11 +2262,25 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c        2007-06-04 13:21:56.713354928 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c     2007-06-04 13:21:56.911324832 +0200
+@@ -2242,6 +2242,17 @@
                txq->axq_link = &lastds->ds_link;
                ath_hal_txstart(ah, txq->axq_qnum);
                sc->sc_dev->trans_start = jiffies;
 +              if ((sc->sc_opmode == HAL_M_IBSS) || (sc->sc_opmode == HAL_M_HOSTAP)) {
-+                      unsigned long last;
-+                      last = sc->sc_tx_start;
-+                      if (last) {
-+                              if (jiffies > last + 2 * HZ) {
++                      if (sc->sc_tx_start && (ath_hal_numtxpending(ah, txq->axq_qnum) > 2)) {
++                              if (jiffies > sc->sc_tx_start + 2 * HZ) {
 +                                      printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
 +                                      ath_reset(sc->sc_dev);
 +                                      sc->sc_tx_start = 0;
@@ -27,30 +18,24 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 +                      }
 +              }
        }
-       ATH_TXQ_UNLOCK(txq);
- 
-       sc->sc_devstats.tx_packets++;
-       sc->sc_devstats.tx_bytes += framelen;
-+      sc->sc_tx_start = 0;
- }
+       ATH_TXQ_UNLOCK_IRQ(txq);
  
- static int 
-@@ -7272,7 +7287,7 @@
-               DPRINTF(sc, ATH_DEBUG_UAPSD, "%s: reaping U-APSD txq\n", __func__);
-               uapsdq = 1;
-       }
--
-+      
-       for (;;) {
-               if (uapsdq)
-                       ATH_TXQ_UAPSDQ_LOCK_IRQ(txq);
-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
---- madwifi.old/ath/if_athvar.h        2007-05-04 23:09:29.000000000 +0200
-+++ madwifi.dev/ath/if_athvar.h        2007-05-15 16:26:28.911054808 +0200
-@@ -689,6 +689,14 @@
+@@ -7285,6 +7296,7 @@
+                       __func__, ds);
+ #else
+               ds = bf->bf_desc;               /* NB: last descriptor */
++              sc->sc_tx_start = 0;
  #endif
+               ts = &bf->bf_dsstatus.ds_txstat;
+               status = ath_hal_txprocdesc(ah, ds, ts);
+Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_athvar.h     2007-06-04 13:21:53.369863216 +0200
++++ madwifi-ng-r2420-20070602/ath/if_athvar.h  2007-06-04 13:21:56.911324832 +0200
+@@ -686,6 +686,14 @@
        u_int sc_slottimeconf;                  /* manual override for slottime */
        int16_t sc_channoise;                   /* Measured noise of current channel (dBm) */
+       u_int64_t sc_tsf;                       /* TSF at last rx interrupt */
 +
 +      /* 
 +       * Several MiniPCI cards and most SoC revs frequently cease all transmission