-Index: madwifi-ng-r2568-20070710/ath/if_ath.c
+Index: madwifi-ng-r2834-20071106/ath/if_ath.c
===================================================================
---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:44.466514171 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:45.030546315 +0200
+--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c 2007-11-07 14:02:04.537629461 +0100
++++ madwifi-ng-r2834-20071106/ath/if_ath.c 2007-11-07 14:02:04.865648150 +0100
@@ -170,7 +170,7 @@
int, u_int64_t);
static void ath_setdefantenna(struct ath_softc *, u_int);
static int ath_hardstart(struct sk_buff *, struct net_device *);
static int ath_mgtstart(struct ieee80211com *, struct sk_buff *);
#ifdef ATH_SUPERG_COMP
-@@ -444,7 +444,6 @@
+@@ -445,7 +445,6 @@
ATH_TXBUF_LOCK_INIT(sc);
ATH_RXBUF_LOCK_INIT(sc);
ATH_INIT_TQUEUE(&sc->sc_txtq, ath_tx_tasklet, dev);
ATH_INIT_TQUEUE(&sc->sc_bmisstq, ath_bmiss_tasklet, dev);
ATH_INIT_TQUEUE(&sc->sc_bstucktq, ath_bstuck_tasklet, dev);
-@@ -691,6 +690,8 @@
+@@ -696,6 +695,8 @@
dev->set_mac_address = ath_set_mac_address;
dev->change_mtu = ath_change_mtu;
dev->tx_queue_len = ATH_TXBUF - 1; /* 1 for mgmt frame */
#ifdef USE_HEADERLEN_RESV
dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
sizeof(struct llc) +
-@@ -1667,6 +1668,7 @@
- */
- ath_hal_getisr(ah, &status); /* NB: clears ISR too */
- DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, status);
+@@ -1794,6 +1795,7 @@
+ (status & HAL_INT_RXPHY) ? " HAL_INT_RXPHY" : "",
+ (status & HAL_INT_SWBA) ? " HAL_INT_SWBA" : "");
+
+ sc->sc_isr = status;
status &= sc->sc_imask; /* discard unasked for bits */
if (status & HAL_INT_FATAL) {
sc->sc_stats.ast_hardware++;
-@@ -1702,7 +1704,14 @@
- if (status & HAL_INT_RX) {
- sc->sc_tsf = ath_hal_gettsf64(ah);
+@@ -1831,7 +1833,14 @@
+ }
+ if (status & (HAL_INT_RX | HAL_INT_RXPHY)) {
ath_uapsd_processtriggers(sc);
- ATH_SCHEDULE_TQUEUE(&sc->sc_rxtq, &needmark);
+ sc->sc_isr &= ~HAL_INT_RX;
}
if (status & HAL_INT_TX) {
#ifdef ATH_SUPERG_DYNTURBO
-@@ -1728,6 +1737,11 @@
+@@ -1857,6 +1866,11 @@
}
}
#endif
ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
}
if (status & HAL_INT_BMISS) {
-@@ -3315,10 +3329,10 @@
+@@ -3450,10 +3464,10 @@
*
* XXX Using in_softirq is not right since we might
* be called from other soft irq contexts than
netif_stop_queue(dev);
}
-@@ -3331,7 +3345,7 @@
+@@ -3466,7 +3480,7 @@
DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
netif_start_queue(dev);
if (!in_softirq()) /* NB: see above */
}
/*
-@@ -5586,13 +5600,12 @@
+@@ -5707,13 +5721,12 @@
sc->sc_rxotherant = 0;
}
struct ath_buf *bf;
struct ath_softc *sc = dev->priv;
struct ieee80211com *ic = &sc->sc_ic;
-@@ -5605,12 +5618,15 @@
+@@ -5726,9 +5739,11 @@
int type;
u_int phyerr;
u_int64_t rs_tsf;
+-
+ u_int processed = 0, early_stop = 0;
+ u_int rx_limit = dev->quota;
- /* Let the 802.11 layer know about the new noise floor */
- sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
- ic->ic_channoise = sc->sc_channoise;
-
DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__);
+process_rx_again:
do {
bf = STAILQ_FIRST(&sc->sc_rxbuf);
if (bf == NULL) { /* XXX ??? can this happen */
-@@ -5634,6 +5650,13 @@
+@@ -5752,6 +5767,13 @@
/* NB: never process the self-linked entry at the end */
break;
}
skb = bf->bf_skb;
if (skb == NULL) { /* XXX ??? can this happen */
printk("%s: no skbuff (%s)\n", DEV_NAME(dev), __func__);
-@@ -5672,6 +5695,7 @@
+@@ -5796,6 +5818,7 @@
sc->sc_stats.ast_rx_phyerr++;
phyerr = rs->rs_phyerr & 0x1f;
sc->sc_stats.ast_rx_phy[phyerr]++;
}
if (rs->rs_status & HAL_RXERR_DECRYPT) {
/*
-@@ -5889,9 +5913,33 @@
+@@ -6011,9 +6034,33 @@
STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
ATH_RXBUF_UNLOCK_IRQ(sc);
} while (ath_rxbuf_init(sc, bf) == 0);
#undef PA2DESC
}
-@@ -7514,11 +7562,22 @@
+@@ -7635,11 +7682,22 @@
struct net_device *dev = (struct net_device *)data;
struct ath_softc *sc = dev->priv;
netif_wake_queue(dev);
if (sc->sc_softled)
-@@ -7535,6 +7594,7 @@
+@@ -7656,6 +7714,7 @@
struct net_device *dev = (struct net_device *)data;
struct ath_softc *sc = dev->priv;
/*
* Process each active queue.
*/
-@@ -7555,6 +7615,16 @@
+@@ -7676,6 +7735,16 @@
if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum))
ath_tx_processq(sc, sc->sc_uapsdq);
netif_wake_queue(dev);
if (sc->sc_softled)
-@@ -7572,6 +7642,7 @@
+@@ -7693,6 +7762,7 @@
unsigned int i;
/* Process each active queue. */
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]);
-@@ -7580,6 +7651,16 @@
+@@ -7701,6 +7771,16 @@
ath_tx_processq(sc, sc->sc_xrtxq);
#endif
netif_wake_queue(dev);
if (sc->sc_softled)
-@@ -7678,6 +7759,7 @@
+@@ -7799,6 +7879,7 @@
ath_draintxq(struct ath_softc *sc)
{
struct ath_hal *ah = sc->sc_ah;
unsigned int i;
/* XXX return value */
-@@ -9186,9 +9268,9 @@
+@@ -9343,9 +9424,9 @@
dev->mtu = mtu;
if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
/* NB: the rx buffers may need to be reallocated */
}
ATH_UNLOCK(sc);
-Index: madwifi-ng-r2568-20070710/ath/if_athvar.h
+Index: madwifi-ng-r2834-20071106/ath/if_athvar.h
===================================================================
---- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-23 01:48:43.126437804 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-23 01:48:45.030546315 +0200
-@@ -49,6 +49,10 @@
- #include "net80211/ieee80211.h" /* XXX for WME_NUM_AC */
+--- madwifi-ng-r2834-20071106.orig/ath/if_athvar.h 2007-11-07 14:02:03.557573608 +0100
++++ madwifi-ng-r2834-20071106/ath/if_athvar.h 2007-11-07 14:02:04.865648150 +0100
+@@ -50,6 +50,10 @@
#include <asm/io.h>
+ #include <linux/list.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#define irqs_disabled() 0
/*
* Deduce if tasklets are available. If not then
* fall back to using the immediate work queue.
-@@ -635,7 +639,6 @@
+@@ -642,7 +646,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_rxorntq; /* rxorn intr tasklet */
u_int8_t sc_defant; /* current default antenna */
u_int8_t sc_rxotherant; /* RXs on non-default antenna */
-@@ -648,6 +651,7 @@
+@@ -655,6 +658,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 */
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 */
-@@ -720,6 +724,8 @@
+@@ -727,6 +731,8 @@
#define ATH_TXBUF_LOCK_ASSERT(_sc) \
KASSERT(spin_is_locked(&(_sc)->sc_txbuflock), ("txbuf not locked!"))
#define ATH_RXBUF_LOCK_INIT(_sc) spin_lock_init(&(_sc)->sc_rxbuflock)
#define ATH_RXBUF_LOCK_DESTROY(_sc)
-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_input.c
===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-23 01:48:44.214499810 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-23 01:48:45.030546315 +0200
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_input.c 2007-11-07 14:02:02.873534629 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_input.c 2007-11-07 14:02:04.873648608 +0100
@@ -1128,8 +1128,9 @@
if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
/* attach vlan tag */
projects / openwrt.git / blobdiff