update to the latest madwifi snapshot
[openwrt.git] / package / madwifi / patches / 118-txstop_workaround.patch
1 Index: madwifi-ng-r2525-20070630/ath/if_ath.c
2 ===================================================================
3 --- madwifi-ng-r2525-20070630.orig/ath/if_ath.c 2007-07-03 23:02:29.657897250 +0200
4 +++ madwifi-ng-r2525-20070630/ath/if_ath.c      2007-07-03 23:02:29.917913500 +0200
5 @@ -2253,6 +2253,17 @@
6                 txq->axq_link = &lastds->ds_link;
7                 ath_hal_txstart(ah, txq->axq_qnum);
8                 sc->sc_dev->trans_start = jiffies;
9 +               if ((sc->sc_opmode == HAL_M_IBSS) || (sc->sc_opmode == HAL_M_HOSTAP)) {
10 +                       if (sc->sc_tx_start && (ath_hal_numtxpending(ah, txq->axq_qnum) > 2)) {
11 +                               if (jiffies > sc->sc_tx_start + 2 * HZ) {
12 +                                       printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
13 +                                       ath_reset(sc->sc_dev);
14 +                                       sc->sc_tx_start = 0;
15 +                               }
16 +                       } else {
17 +                               sc->sc_tx_start = jiffies;
18 +                       }
19 +               }
20         }
21         ATH_TXQ_UNLOCK_IRQ(txq);
22  
23 @@ -7312,6 +7323,7 @@
24                         __func__, ds);
25  #else
26                 ds = bf->bf_desc;               /* NB: last descriptor */
27 +               sc->sc_tx_start = 0;
28  #endif
29                 ts = &bf->bf_dsstatus.ds_txstat;
30                 status = ath_hal_txprocdesc(ah, ds, ts);
31 Index: madwifi-ng-r2525-20070630/ath/if_athvar.h
32 ===================================================================
33 --- madwifi-ng-r2525-20070630.orig/ath/if_athvar.h      2007-07-03 23:02:25.669648000 +0200
34 +++ madwifi-ng-r2525-20070630/ath/if_athvar.h   2007-07-03 23:02:29.917913500 +0200
35 @@ -690,6 +690,14 @@
36         u_int sc_slottimeconf;                  /* manual override for slottime */
37         int16_t sc_channoise;                   /* Measured noise of current channel (dBm) */
38         u_int64_t sc_tsf;                       /* TSF at last rx interrupt */
39 +
40 +       /* 
41 +        * Several MiniPCI cards and most SoC revs frequently cease all transmission
42 +        * when operating in IBSS mode. The reason for this is unknown and could potentially
43 +        * be a hardware bug. This variable contains the timestamp of the last successful
44 +        * transmission and is checked when enqueueing new frames
45 +        */
46 +       unsigned long sc_tx_start;
47  };
48  
49  typedef void (*ath_callback) (struct ath_softc *);