projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
forgot to bump up the release version from the patches the other day
[openwrt.git] / package / madwifi / patches / 300-napi_polling.patch
diff --git a/package/madwifi/patches/300-napi_polling.patch b/package/madwifi/patches/300-napi_polling.patch
index bdaf9d0..58c5d10 100644 (file)
--- a/package/madwifi/patches/300-napi_polling.patch
+++ b/package/madwifi/patches/300-napi_polling.patch
@@ -1,7 +1,7 @@
-Index: madwifi-ng-r2525-20070630/ath/if_ath.c
+Index: madwifi-ng-r2799-20071030/ath/if_ath.c
 ===================================================================
 ===================================================================
---- 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
+--- madwifi-ng-r2799-20071030.orig/ath/if_ath.c        2007-10-31 14:04:50.997527661 +0100
++++ madwifi-ng-r2799-20071030/ath/if_ath.c     2007-10-31 14:04:51.313545672 +0100
 @@ -170,7 +170,7 @@
        int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);
 @@ -170,7 +170,7 @@
        int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);
@@ -11,7 +11,7 @@ Index: madwifi-ng-r2525-20070630/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
  static int ath_hardstart(struct sk_buff *, struct net_device *);
  static int ath_mgtstart(struct ieee80211com *, struct sk_buff *);
  #ifdef ATH_SUPERG_COMP
-@@ -446,7 +446,6 @@
+@@ -445,7 +445,6 @@
        ATH_TXBUF_LOCK_INIT(sc);
        ATH_RXBUF_LOCK_INIT(sc);
  
        ATH_TXBUF_LOCK_INIT(sc);
        ATH_RXBUF_LOCK_INIT(sc);
  
@@ -19,7 +19,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
        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);
        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);
-@@ -699,6 +698,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 */
        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 */
@@ -28,17 +28,17 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
  #ifdef USE_HEADERLEN_RESV
        dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
                                sizeof(struct llc) +
  #ifdef USE_HEADERLEN_RESV
        dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
                                sizeof(struct llc) +
-@@ -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);
+@@ -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++;
 +      sc->sc_isr = status;
        status &= sc->sc_imask;                 /* discard unasked for bits */
        if (status & HAL_INT_FATAL) {
                sc->sc_stats.ast_hardware++;
-@@ -1703,7 +1705,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;
                        ath_uapsd_processtriggers(sc);
 -                      ATH_SCHEDULE_TQUEUE(&sc->sc_rxtq, &needmark);
 +                      sc->sc_isr &= ~HAL_INT_RX;
@@ -52,7 +52,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
                }
                if (status & HAL_INT_TX) {
  #ifdef ATH_SUPERG_DYNTURBO
                }
                if (status & HAL_INT_TX) {
  #ifdef ATH_SUPERG_DYNTURBO
-@@ -1729,6 +1738,11 @@
+@@ -1857,6 +1866,11 @@
                                }
                        }
  #endif
                                }
                        }
  #endif
@@ -64,7 +64,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
                        ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
                }
                if (status & HAL_INT_BMISS) {
                        ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
                }
                if (status & HAL_INT_BMISS) {
-@@ -3323,10 +3337,10 @@
+@@ -3450,10 +3464,10 @@
         *
         * XXX Using in_softirq is not right since we might
         * be called from other soft irq contexts than
         *
         * XXX Using in_softirq is not right since we might
         * be called from other soft irq contexts than
@@ -77,7 +77,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
        netif_stop_queue(dev);
  }
  
        netif_stop_queue(dev);
  }
  
-@@ -3339,7 +3353,7 @@
+@@ -3466,7 +3480,7 @@
        DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
        netif_start_queue(dev);
        if (!in_softirq())              /* NB: see above */
        DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
        netif_start_queue(dev);
        if (!in_softirq())              /* NB: see above */
@@ -86,7 +86,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
  }
  
  /*
  }
  
  /*
-@@ -5590,13 +5604,12 @@
+@@ -5707,13 +5721,12 @@
        sc->sc_rxotherant = 0;
  }
  
        sc->sc_rxotherant = 0;
  }
  
@@ -102,23 +102,20 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
        struct ath_buf *bf;
        struct ath_softc *sc = dev->priv;
        struct ieee80211com *ic = &sc->sc_ic;
        struct ath_buf *bf;
        struct ath_softc *sc = dev->priv;
        struct ieee80211com *ic = &sc->sc_ic;
-@@ -5609,12 +5622,15 @@
+@@ -5726,9 +5739,11 @@
        int type;
        u_int phyerr;
        u_int64_t rs_tsf;
        int type;
        u_int phyerr;
        u_int64_t rs_tsf;
+-
 +      u_int processed = 0, early_stop = 0;
 +      u_int rx_limit = dev->quota;
  
 +      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 */
        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 */
-@@ -5638,6 +5654,13 @@
+@@ -5752,6 +5767,13 @@
                        /* NB: never process the self-linked entry at the end */
                        break;
                }
                        /* NB: never process the self-linked entry at the end */
                        break;
                }
@@ -132,7 +129,7 @@ Index: madwifi-ng-r2525-20070630/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__);
                skb = bf->bf_skb;
                if (skb == NULL) {              /* XXX ??? can this happen */
                        printk("%s: no skbuff (%s)\n", DEV_NAME(dev), __func__);
-@@ -5676,6 +5699,7 @@
+@@ -5796,6 +5818,7 @@
                                sc->sc_stats.ast_rx_phyerr++;
                                phyerr = rs->rs_phyerr & 0x1f;
                                sc->sc_stats.ast_rx_phy[phyerr]++;
                                sc->sc_stats.ast_rx_phyerr++;
                                phyerr = rs->rs_phyerr & 0x1f;
                                sc->sc_stats.ast_rx_phy[phyerr]++;
@@ -140,7 +137,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
                        }
                        if (rs->rs_status & HAL_RXERR_DECRYPT) {
                                /*
                        }
                        if (rs->rs_status & HAL_RXERR_DECRYPT) {
                                /*
-@@ -5892,9 +5916,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);
                STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
                ATH_RXBUF_UNLOCK_IRQ(sc);
        } while (ath_rxbuf_init(sc, bf) == 0);
@@ -174,7 +171,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
  #undef PA2DESC
  }
  
  #undef PA2DESC
  }
  
-@@ -7513,11 +7561,22 @@
+@@ -7635,11 +7682,22 @@
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
  
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
  
@@ -197,7 +194,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -7534,6 +7593,7 @@
+@@ -7656,6 +7714,7 @@
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
  
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
  
@@ -205,7 +202,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
        /*
         * Process each active queue.
         */
        /*
         * Process each active queue.
         */
-@@ -7554,6 +7614,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);
  
        if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum))
                ath_tx_processq(sc, sc->sc_uapsdq);
  
@@ -222,7 +219,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -7571,6 +7641,7 @@
+@@ -7693,6 +7762,7 @@
        unsigned int i;
  
        /* Process each active queue. */
        unsigned int i;
  
        /* Process each active queue. */
@@ -230,7 +227,7 @@ Index: madwifi-ng-r2525-20070630/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]);
        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]);
-@@ -7579,6 +7650,16 @@
+@@ -7701,6 +7771,16 @@
                ath_tx_processq(sc, sc->sc_xrtxq);
  #endif
  
                ath_tx_processq(sc, sc->sc_xrtxq);
  #endif
  
@@ -247,7 +244,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -7677,6 +7758,7 @@
+@@ -7799,6 +7879,7 @@
  ath_draintxq(struct ath_softc *sc)
  {
        struct ath_hal *ah = sc->sc_ah;
  ath_draintxq(struct ath_softc *sc)
  {
        struct ath_hal *ah = sc->sc_ah;
@@ -255,7 +252,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
        unsigned int i;
  
        /* XXX return value */
        unsigned int i;
  
        /* XXX return value */
-@@ -9195,9 +9277,9 @@
+@@ -9336,9 +9417,9 @@
        dev->mtu = mtu;
        if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
                /* NB: the rx buffers may need to be reallocated */
        dev->mtu = mtu;
        if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
                /* NB: the rx buffers may need to be reallocated */
@@ -267,13 +264,13 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
        }
        ATH_UNLOCK(sc);
  
        }
        ATH_UNLOCK(sc);
  
-Index: madwifi-ng-r2525-20070630/ath/if_athvar.h
+Index: madwifi-ng-r2799-20071030/ath/if_athvar.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 */
+--- madwifi-ng-r2799-20071030.orig/ath/if_athvar.h     2007-10-31 14:04:50.117477510 +0100
++++ madwifi-ng-r2799-20071030/ath/if_athvar.h  2007-10-31 14:04:51.317545898 +0100
+@@ -50,6 +50,10 @@
  #include <asm/io.h>
  #include <asm/io.h>
+ #include <linux/list.h>
  
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 +#define irqs_disabled()                       0
  
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 +#define irqs_disabled()                       0
@@ -282,7 +279,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_athvar.h
  /*
   * Deduce if tasklets are available.  If not then
   * fall back to using the immediate work queue.
  /*
   * Deduce if tasklets are available.  If not then
   * fall back to using the immediate work queue.
-@@ -625,7 +629,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_buf *sc_rxbufcur;            /* current rx buffer */
        u_int32_t *sc_rxlink;                   /* link ptr in last RX desc */
        spinlock_t sc_rxbuflock;
@@ -290,7 +287,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_athvar.h
        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 */
        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 */
-@@ -638,6 +641,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 */
        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 */
@@ -298,7 +295,7 @@ Index: madwifi-ng-r2525-20070630/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 */
        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 */
-@@ -718,6 +722,8 @@
+@@ -727,6 +731,8 @@
  #define       ATH_TXBUF_LOCK_ASSERT(_sc) \
        KASSERT(spin_is_locked(&(_sc)->sc_txbuflock), ("txbuf not locked!"))
  
  #define       ATH_TXBUF_LOCK_ASSERT(_sc) \
        KASSERT(spin_is_locked(&(_sc)->sc_txbuflock), ("txbuf not locked!"))
  
@@ -307,10 +304,10 @@ Index: madwifi-ng-r2525-20070630/ath/if_athvar.h
  
  #define       ATH_RXBUF_LOCK_INIT(_sc)        spin_lock_init(&(_sc)->sc_rxbuflock)
  #define       ATH_RXBUF_LOCK_DESTROY(_sc)
  
  #define       ATH_RXBUF_LOCK_INIT(_sc)        spin_lock_init(&(_sc)->sc_rxbuflock)
  #define       ATH_RXBUF_LOCK_DESTROY(_sc)
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c
+Index: madwifi-ng-r2799-20071030/net80211/ieee80211_input.c
 ===================================================================
 ===================================================================
---- 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
+--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_input.c  2007-10-31 14:04:49.437438757 +0100
++++ madwifi-ng-r2799-20071030/net80211/ieee80211_input.c       2007-10-31 14:04:51.325546356 +0100
 @@ -1128,8 +1128,9 @@
                if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
                        /* attach vlan tag */
 @@ -1128,8 +1128,9 @@
                if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
                        /* attach vlan tag */
Personal OpenWRT clone
This page took 0.028404 seconds and 4 git commands to generate.