update to the latest madwifi snapshot

SVN-Revision: 7864

1 files changed, 42 insertions, 36 deletions

diff --git a/package/madwifi/patches/300-napi_polling.patch b/package/madwifi/patches/300-napi_polling.patch
index 7990ed7092..bdaf9d078c 100644
--- a/package/madwifi/patches/300-napi_polling.patch
+++ b/package/madwifi/patches/300-napi_polling.patch
@@ -1,9 +1,9 @@
-Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+Index: madwifi-ng-r2525-20070630/ath/if_ath.c
 ===================================================================
---- madwifi-ng-r2420-20070602.orig/ath/if_ath.c	2007-06-04 13:21:58.130139544 +0200
-+++ madwifi-ng-r2420-20070602/ath/if_ath.c	2007-06-04 13:21:58.427094400 +0200
-@@ -167,7 +167,7 @@
- 	int, u_int32_t);
+--- madwifi-ng-r2525-20070630.orig/ath/if_ath.c	2007-07-03 23:02:32.178054750 +0200
++++ madwifi-ng-r2525-20070630/ath/if_ath.c	2007-07-03 23:02:32.998106000 +0200
+@@ -170,7 +170,7 @@
+ 	int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);
  static struct ath_txq *ath_txq_setup(struct ath_softc *, int, int);
 -static void ath_rx_tasklet(TQUEUE_ARG);
@@ -11,7 +11,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  static int ath_hardstart(struct sk_buff *, struct net_device *);
  static int ath_mgtstart(struct ieee80211com *, struct sk_buff *);
  #ifdef ATH_SUPERG_COMP
-@@ -442,7 +442,6 @@
+@@ -446,7 +446,6 @@
  	ATH_TXBUF_LOCK_INIT(sc);
  	ATH_RXBUF_LOCK_INIT(sc);
  
@@ -28,7 +28,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  #ifdef USE_HEADERLEN_RESV
  	dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
  				sizeof(struct llc) +
-@@ -1664,6 +1665,7 @@
+@@ -1668,6 +1669,7 @@
  	 */
  	ath_hal_getisr(ah, &status);		/* NB: clears ISR too */
  	DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, status);
@@ -36,21 +36,23 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	status &= sc->sc_imask;			/* discard unasked for bits */
  	if (status & HAL_INT_FATAL) {
  		sc->sc_stats.ast_hardware++;
-@@ -1699,7 +1701,12 @@
+@@ -1703,7 +1705,14 @@
  		if (status & HAL_INT_RX) {
  			sc->sc_tsf = ath_hal_gettsf64(ah);
  			ath_uapsd_processtriggers(sc);
 -			ATH_SCHEDULE_TQUEUE(&sc->sc_rxtq, &needmark);
 +			sc->sc_isr &= ~HAL_INT_RX;
 +			if (netif_rx_schedule_prep(dev)) {
++#ifndef ATH_PRECISE_TSF
 +				sc->sc_imask &= ~HAL_INT_RX;
 +				ath_hal_intrset(ah, sc->sc_imask);
++#endif
 +				__netif_rx_schedule(dev);
 +			}
  		}
  		if (status & HAL_INT_TX) {
  #ifdef ATH_SUPERG_DYNTURBO
-@@ -1725,6 +1732,11 @@
+@@ -1729,6 +1738,11 @@
  				}
  			}
  #endif
@@ -62,7 +64,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  			ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
  		}
  		if (status & HAL_INT_BMISS) {
-@@ -3295,10 +3307,10 @@
+@@ -3323,10 +3337,10 @@
  	 *
  	 * XXX Using in_softirq is not right since we might
  	 * be called from other soft irq contexts than
@@ -75,7 +77,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	netif_stop_queue(dev);
  }
  
-@@ -3311,7 +3323,7 @@
+@@ -3339,7 +3353,7 @@
  	DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
  	netif_start_queue(dev);
  	if (!in_softirq())		/* NB: see above */
@@ -84,7 +86,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  }
  
  /*
-@@ -5569,13 +5581,12 @@
+@@ -5590,13 +5604,12 @@
  	sc->sc_rxotherant = 0;
  }
  
@@ -100,10 +102,10 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	struct ath_buf *bf;
  	struct ath_softc *sc = dev->priv;
  	struct ieee80211com *ic = &sc->sc_ic;
-@@ -5587,12 +5598,15 @@
- 	unsigned int len;
+@@ -5609,12 +5622,15 @@
  	int type;
  	u_int phyerr;
+ 	u_int64_t rs_tsf;
 +	u_int processed = 0, early_stop = 0;
 +	u_int rx_limit = dev->quota;
  
@@ -116,7 +118,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	do {
  		bf = STAILQ_FIRST(&sc->sc_rxbuf);
  		if (bf == NULL) {		/* XXX ??? can this happen */
-@@ -5616,6 +5630,13 @@
+@@ -5638,6 +5654,13 @@
  			/* NB: never process the self-linked entry at the end */
  			break;
  		}
@@ -130,7 +132,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  		skb = bf->bf_skb;
  		if (skb == NULL) {		/* XXX ??? can this happen */
  			printk("%s: no skbuff (%s)\n", DEV_NAME(dev), __func__);
-@@ -5654,6 +5675,7 @@
+@@ -5676,6 +5699,7 @@
  				sc->sc_stats.ast_rx_phyerr++;
  				phyerr = rs->rs_phyerr & 0x1f;
  				sc->sc_stats.ast_rx_phy[phyerr]++;
@@ -138,7 +140,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  			}
  			if (rs->rs_status & HAL_RXERR_DECRYPT) {
  				/*
-@@ -5865,9 +5887,29 @@
+@@ -5892,9 +5916,33 @@
  		STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
  		ATH_RXBUF_UNLOCK_IRQ(sc);
  	} while (ath_rxbuf_init(sc, bf) == 0);
@@ -146,6 +148,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
 +		/* Check if more data is received while we were
 +		 * processing the descriptor chain.
 +		 */
++#ifndef ATH_PRECISE_TSF
 +		ATH_DISABLE_INTR();
 +		if (sc->sc_isr & HAL_INT_RX) {
 +			sc->sc_isr &= ~HAL_INT_RX;
@@ -153,11 +156,14 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
 +			ath_uapsd_processtriggers(sc);
 +			goto process_rx_again;
 +		}
++#endif
 +		netif_rx_complete(dev);
 +
++#ifndef ATH_PRECISE_TSF
 +		sc->sc_imask |= HAL_INT_RX;
 +		ath_hal_intrset(ah, sc->sc_imask);
 +		ATH_ENABLE_INTR();
++#endif
 +	}
 +
 +	*budget -= processed;
@@ -168,7 +174,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  #undef PA2DESC
  }
  
-@@ -7484,11 +7526,22 @@
+@@ -7513,11 +7561,22 @@
  	struct net_device *dev = (struct net_device *)data;
  	struct ath_softc *sc = dev->priv;
  
@@ -191,7 +197,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	netif_wake_queue(dev);
  
  	if (sc->sc_softled)
-@@ -7505,6 +7558,7 @@
+@@ -7534,6 +7593,7 @@
  	struct net_device *dev = (struct net_device *)data;
  	struct ath_softc *sc = dev->priv;
  
@@ -199,7 +205,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	/*
  	 * Process each active queue.
  	 */
-@@ -7525,6 +7579,16 @@
+@@ -7554,6 +7614,16 @@
  	if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum))
  		ath_tx_processq(sc, sc->sc_uapsdq);
  
@@ -216,7 +222,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	netif_wake_queue(dev);
  
  	if (sc->sc_softled)
-@@ -7542,6 +7606,7 @@
+@@ -7571,6 +7641,7 @@
  	unsigned int i;
  
  	/* Process each active queue. */
@@ -224,7 +230,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	for (i = 0; i < HAL_NUM_TX_QUEUES; i++)
  		if (ATH_TXQ_SETUP(sc, i) && txqactive(sc->sc_ah, i))
  			ath_tx_processq(sc, &sc->sc_txq[i]);
-@@ -7550,6 +7615,16 @@
+@@ -7579,6 +7650,16 @@
  		ath_tx_processq(sc, sc->sc_xrtxq);
  #endif
  
@@ -241,7 +247,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	netif_wake_queue(dev);
  
  	if (sc->sc_softled)
-@@ -7648,6 +7723,7 @@
+@@ -7677,6 +7758,7 @@
  ath_draintxq(struct ath_softc *sc)
  {
  	struct ath_hal *ah = sc->sc_ah;
@@ -249,7 +255,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	unsigned int i;
  
  	/* XXX return value */
-@@ -9167,9 +9243,9 @@
+@@ -9195,9 +9277,9 @@
  	dev->mtu = mtu;
  	if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
  		/* NB: the rx buffers may need to be reallocated */
@@ -261,13 +267,13 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  	}
  	ATH_UNLOCK(sc);
  
-Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
+Index: madwifi-ng-r2525-20070630/ath/if_athvar.h
 ===================================================================
---- madwifi-ng-r2420-20070602.orig/ath/if_athvar.h	2007-06-04 13:21:57.500235304 +0200
-+++ madwifi-ng-r2420-20070602/ath/if_athvar.h	2007-06-04 13:21:58.428094248 +0200
-@@ -48,6 +48,10 @@
- #include "if_athioctl.h"
+--- madwifi-ng-r2525-20070630.orig/ath/if_athvar.h	2007-07-03 23:02:30.957978500 +0200
++++ madwifi-ng-r2525-20070630/ath/if_athvar.h	2007-07-03 23:02:33.002106250 +0200
+@@ -49,6 +49,10 @@
  #include "net80211/ieee80211.h"		/* XXX for WME_NUM_AC */
+ #include <asm/io.h>
  
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 +#define irqs_disabled()			0
@@ -276,15 +282,15 @@ Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
  /*
   * Deduce if tasklets are available.  If not then
   * fall back to using the immediate work queue.
-@@ -621,7 +625,6 @@
+@@ -625,7 +629,6 @@
  	struct ath_buf *sc_rxbufcur;		/* current rx buffer */
  	u_int32_t *sc_rxlink;			/* link ptr in last RX desc */
  	spinlock_t sc_rxbuflock;
 -	struct ATH_TQ_STRUCT sc_rxtq;		/* rx intr tasklet */
  	struct ATH_TQ_STRUCT sc_rxorntq;	/* rxorn intr tasklet */
  	u_int8_t sc_defant;			/* current default antenna */
- 	u_int8_t sc_rxotherant;			/* rx's on non-default antenna*/
-@@ -634,6 +637,7 @@
+ 	u_int8_t sc_rxotherant;			/* RXs on non-default antenna */
+@@ -638,6 +641,7 @@
  	u_int sc_txintrperiod;			/* tx interrupt batching */
  	struct ath_txq sc_txq[HAL_NUM_TX_QUEUES];
  	struct ath_txq *sc_ac2q[WME_NUM_AC];	/* WME AC -> h/w qnum */
@@ -292,7 +298,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
  	struct ATH_TQ_STRUCT sc_txtq;		/* tx intr tasklet */
  	u_int8_t sc_grppoll_str[GRPPOLL_RATE_STR_LEN];
  	struct ath_descdma sc_bdma;		/* beacon descriptors */
-@@ -714,6 +718,8 @@
+@@ -718,6 +722,8 @@
  #define	ATH_TXBUF_LOCK_ASSERT(_sc) \
  	KASSERT(spin_is_locked(&(_sc)->sc_txbuflock), ("txbuf not locked!"))
  
@@ -301,10 +307,10 @@ Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
  
  #define	ATH_RXBUF_LOCK_INIT(_sc)	spin_lock_init(&(_sc)->sc_rxbuflock)
  #define	ATH_RXBUF_LOCK_DESTROY(_sc)
-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
+Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c	2007-06-04 13:21:57.502235000 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c	2007-06-04 13:21:58.461089232 +0200
+--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_input.c	2007-07-03 23:02:31.926039000 +0200
++++ madwifi-ng-r2525-20070630/net80211/ieee80211_input.c	2007-07-03 23:02:33.002106250 +0200
 @@ -1128,8 +1128,9 @@
  		if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
  			/* attach vlan tag */