cleanup

[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 e50e9a8..de0085f 100644 (file)
--- a/package/madwifi/patches/118-txstop_workaround.patch
+++ b/package/madwifi/patches/118-txstop_workaround.patch
@@ -1,6 +1,6 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
---- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c        2007-05-13 18:17:56.196025944 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c        2007-05-13 18:17:56.284012568 +0200
+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
 @@ -1711,6 +1711,7 @@
                        } 
  #endif


@@ -9,13 +9,15 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
                }
                if (status & HAL_INT_BMISS) {
                        sc->sc_stats.ast_bmiss++;
                }
                if (status & HAL_INT_BMISS) {
                        sc->sc_stats.ast_bmiss++;

-@@ -2264,6 +2265,17 @@
+@@ -2261,11 +2262,25 @@

                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)) {
                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)) {

-+                      if (sc->sc_tx_start) {
-+                              if (jiffies > sc->sc_tx_start + 2 * HZ) {
++                      unsigned long last;
++                      last = sc->sc_tx_start;
++                      if (last) {
++                              if (jiffies > last + 2 * HZ) {

 +                                      printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
 +                                      ath_reset(sc->sc_dev);
 +                                      sc->sc_tx_start = 0;
 +                                      printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
 +                                      ath_reset(sc->sc_dev);
 +                                      sc->sc_tx_start = 0;


@@ -27,9 +29,24 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
        }
        ATH_TXQ_UNLOCK(txq);
  
        }
        ATH_TXQ_UNLOCK(txq);
  

-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_athvar.h madwifi-ng-refcount-r2313-20070505.dev/ath/if_athvar.h
---- madwifi-ng-refcount-r2313-20070505.old/ath/if_athvar.h     2007-05-04 23:09:29.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_athvar.h     2007-05-13 18:17:56.285012416 +0200
+       sc->sc_devstats.tx_packets++;
+       sc->sc_devstats.tx_bytes += framelen;
++      sc->sc_tx_start = 0;
+ }
+ 
+ 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 @@
  #endif
        u_int sc_slottimeconf;                  /* manual override for slottime */
 @@ -689,6 +689,14 @@
  #endif
        u_int sc_slottimeconf;                  /* manual override for slottime */