bcm47xx compile fix for .21, thanks to noz

[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 8cab1a4..8719a6d 100644 (file)
--- a/package/madwifi/patches/118-txstop_workaround.patch
+++ b/package/madwifi/patches/118-txstop_workaround.patch
@@ -1,7 +1,7 @@
 diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c   2007-05-21 05:40:18.320301560 +0200
-+++ madwifi.dev/ath/if_ath.c   2007-05-21 05:49:40.132893064 +0200
-@@ -2264,6 +2264,17 @@
+--- 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 @@
                txq->axq_link = &lastds->ds_link;
                ath_hal_txstart(ah, txq->axq_qnum);
                sc->sc_dev->trans_start = jiffies;
@@ -19,18 +19,18 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
        }
        ATH_TXQ_UNLOCK(txq);
  
-@@ -7299,6 +7310,7 @@
+@@ -7246,6 +7257,7 @@
+                       __func__, ds);
  #else
                ds = bf->bf_desc;               /* NB: last descriptor */
- #endif
 +              sc->sc_tx_start = 0;
-               status = ath_hal_txprocdesc(ah, ds);
- #ifdef AR_DEBUG
-               if (sc->sc_debug & ATH_DEBUG_XMIT_DESC)
+ #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-04 23:09:29.000000000 +0200
-+++ madwifi.dev/ath/if_athvar.h        2007-05-21 05:40:32.958076280 +0200
-@@ -689,6 +689,14 @@
+--- 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
        u_int sc_slottimeconf;                  /* manual override for slottime */
        int16_t sc_channoise;                   /* Measured noise of current channel (dBm) */