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 8719a6d..3133c41 100644 (file)
--- a/package/madwifi/patches/118-txstop_workaround.patch
+++ b/package/madwifi/patches/118-txstop_workaround.patch
@@ -1,7 +1,8 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c   2007-05-21 07:45:03.185429104 +0200
-+++ madwifi.dev/ath/if_ath.c   2007-05-21 07:45:55.867420224 +0200
-@@ -2206,6 +2206,17 @@
+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;
@@ -17,9 +18,9 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 +                      }
 +              }
        }
-       ATH_TXQ_UNLOCK(txq);
+       ATH_TXQ_UNLOCK_IRQ(txq);
  
-@@ -7246,6 +7257,7 @@
+@@ -7285,6 +7296,7 @@
                        __func__, ds);
  #else
                ds = bf->bf_desc;               /* NB: last descriptor */
@@ -27,13 +28,14 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
  #endif
                ts = &bf->bf_dsstatus.ds_txstat;
                status = ath_hal_txprocdesc(ah, ds, ts);
-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
---- madwifi.old/ath/if_athvar.h        2007-05-18 13:19:16.000000000 +0200
-+++ madwifi.dev/ath/if_athvar.h        2007-05-21 07:45:37.720179024 +0200
-@@ -684,6 +684,14 @@
- #endif
+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