huge madwifi update - use a madwifi-ng-refcount snapshot as base, includes lots of...
[openwrt-10.03/.git] / package / madwifi / patches / 118-txstop_workaround.patch
1 diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
2 --- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c 2007-05-13 18:17:56.196025944 +0200
3 +++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c 2007-05-13 18:17:56.284012568 +0200
4 @@ -1711,6 +1711,7 @@
5                         } 
6  #endif
7                         ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
8 +                       sc->sc_tx_start = 0;
9                 }
10                 if (status & HAL_INT_BMISS) {
11                         sc->sc_stats.ast_bmiss++;
12 @@ -2264,6 +2265,15 @@
13                 txq->axq_link = &lastds->ds_link;
14                 ath_hal_txstart(ah, txq->axq_qnum);
15                 sc->sc_dev->trans_start = jiffies;
16 +               if (sc->sc_tx_start) {
17 +                       if (jiffies > sc->sc_tx_start + 2 * HZ) {
18 +                               printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
19 +                               ath_reset(sc->sc_dev);
20 +                               sc->sc_tx_start = 0;
21 +                       }
22 +               } else {
23 +                       sc->sc_tx_start = jiffies;
24 +               }
25         }
26         ATH_TXQ_UNLOCK(txq);
27  
28 diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_athvar.h madwifi-ng-refcount-r2313-20070505.dev/ath/if_athvar.h
29 --- madwifi-ng-refcount-r2313-20070505.old/ath/if_athvar.h      2007-05-04 23:09:29.000000000 +0200
30 +++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_athvar.h      2007-05-13 18:17:56.285012416 +0200
31 @@ -689,6 +689,14 @@
32  #endif
33         u_int sc_slottimeconf;                  /* manual override for slottime */
34         int16_t sc_channoise;                   /* Measured noise of current channel (dBm) */
35 +
36 +       /* 
37 +        * Several MiniPCI cards and most SoC revs frequently cease all transmission
38 +        * when operating in IBSS mode. The reason for this is unknown and could potentially
39 +        * be a hardware bug. This variable contains the timestamp of the last successful
40 +        * transmission and is checked when enqueueing new frames
41 +        */
42 +       unsigned long sc_tx_start;
43  };
44  
45  typedef void (*ath_callback) (struct ath_softc *);