update to latest madwifi snapshot - fixes some noderef bugs
[openwrt/openwrt.git] / package / madwifi / patches / 300-napi_polling.patch
index 8300225..d5d8ef8 100644 (file)
@@ -1,8 +1,8 @@
-Index: madwifi-ng-r2834-20071106/ath/if_ath.c
+Index: madwifi-ng-r2978-20071127/ath/if_ath.c
 ===================================================================
---- madwifi-ng-r2834-20071106.orig/ath/if_ath.c        2007-11-26 12:29:04.313083193 +0100
-+++ madwifi-ng-r2834-20071106/ath/if_ath.c     2007-11-26 12:29:04.341084793 +0100
-@@ -170,7 +170,7 @@
+--- madwifi-ng-r2978-20071127.orig/ath/if_ath.c        2007-11-27 21:47:06.136758995 +0100
++++ madwifi-ng-r2978-20071127/ath/if_ath.c     2007-11-27 21:49:11.439899616 +0100
+@@ -183,7 +183,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);
@@ -11,7 +11,7 @@ Index: madwifi-ng-r2834-20071106/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
-@@ -445,7 +445,6 @@
+@@ -552,7 +552,6 @@
        ATH_TXBUF_LOCK_INIT(sc);
        ATH_RXBUF_LOCK_INIT(sc);
  
@@ -19,16 +19,16 @@ Index: madwifi-ng-r2834-20071106/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);
-@@ -696,6 +695,8 @@
+@@ -807,6 +806,8 @@
        dev->set_mac_address = ath_set_mac_address;
-       dev->change_mtu = ath_change_mtu;
+       dev->change_mtu = ath_change_mtu;
        dev->tx_queue_len = ATH_TXBUF - 1;              /* 1 for mgmt frame */
 +      dev->poll = ath_rx_poll;
 +      dev->weight = 64;
  #ifdef USE_HEADERLEN_RESV
        dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
                                sizeof(struct llc) +
-@@ -1794,6 +1795,7 @@
+@@ -2014,6 +2015,7 @@
                (status & HAL_INT_RXPHY)   ? " HAL_INT_RXPHY"   : "",
                (status & HAL_INT_SWBA)    ? " HAL_INT_SWBA"    : "");
  
@@ -36,7 +36,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
        status &= sc->sc_imask;                 /* discard unasked for bits */
        if (status & HAL_INT_FATAL) {
                sc->sc_stats.ast_hardware++;
-@@ -1831,7 +1833,14 @@
+@@ -2051,7 +2053,14 @@
                }
                if (status & (HAL_INT_RX | HAL_INT_RXPHY)) {
                        ath_uapsd_processtriggers(sc);
@@ -52,7 +52,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
                }
                if (status & HAL_INT_TX) {
  #ifdef ATH_SUPERG_DYNTURBO
-@@ -1857,6 +1866,11 @@
+@@ -2077,6 +2086,11 @@
                                }
                        }
  #endif
@@ -64,7 +64,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
                        ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
                }
                if (status & HAL_INT_BMISS) {
-@@ -3450,10 +3464,10 @@
+@@ -3750,10 +3764,10 @@
         *
         * 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-r2834-20071106/ath/if_ath.c
        netif_stop_queue(dev);
  }
  
-@@ -3466,7 +3480,7 @@
+@@ -3766,7 +3780,7 @@
        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-r2834-20071106/ath/if_ath.c
  }
  
  /*
-@@ -5707,13 +5721,12 @@
+@@ -6050,13 +6064,12 @@
        sc->sc_rxotherant = 0;
  }
  
@@ -102,11 +102,10 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
        struct ath_buf *bf;
        struct ath_softc *sc = dev->priv;
        struct ieee80211com *ic = &sc->sc_ic;
-@@ -5726,9 +5739,11 @@
+@@ -6068,8 +6081,11 @@
+       unsigned int len;
        int type;
        u_int phyerr;
-       u_int64_t rs_tsf;
--
 +      u_int processed = 0, early_stop = 0;
 +      u_int rx_limit = dev->quota;
  
@@ -115,7 +114,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
        do {
                bf = STAILQ_FIRST(&sc->sc_rxbuf);
                if (bf == NULL) {               /* XXX ??? can this happen */
-@@ -5752,6 +5767,13 @@
+@@ -6093,6 +6109,13 @@
                        /* NB: never process the self-linked entry at the end */
                        break;
                }
@@ -127,9 +126,9 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
 +              }
 +
                skb = bf->bf_skb;
-               if (skb == NULL) {              /* XXX ??? can this happen */
+               if (skb == NULL) {
                        printk("%s: no skbuff (%s)\n", DEV_NAME(dev), __func__);
-@@ -5796,6 +5818,7 @@
+@@ -6137,6 +6160,7 @@
                                sc->sc_stats.ast_rx_phyerr++;
                                phyerr = rs->rs_phyerr & 0x1f;
                                sc->sc_stats.ast_rx_phy[phyerr]++;
@@ -137,7 +136,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
                        }
                        if (rs->rs_status & HAL_RXERR_DECRYPT) {
                                /*
-@@ -6011,9 +6034,33 @@
+@@ -6342,9 +6366,33 @@
                STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
                ATH_RXBUF_UNLOCK_IRQ(sc);
        } while (ath_rxbuf_init(sc, bf) == 0);
@@ -171,7 +170,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
  #undef PA2DESC
  }
  
-@@ -7635,11 +7682,22 @@
+@@ -7964,11 +8012,22 @@
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
  
@@ -194,7 +193,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -7656,6 +7714,7 @@
+@@ -7985,6 +8044,7 @@
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
  
@@ -202,7 +201,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
        /*
         * Process each active queue.
         */
-@@ -7676,6 +7735,16 @@
+@@ -8005,6 +8065,16 @@
        if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum))
                ath_tx_processq(sc, sc->sc_uapsdq);
  
@@ -219,7 +218,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -7693,6 +7762,7 @@
+@@ -8022,6 +8092,7 @@
        unsigned int i;
  
        /* Process each active queue. */
@@ -227,7 +226,7 @@ Index: madwifi-ng-r2834-20071106/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]);
-@@ -7701,6 +7771,16 @@
+@@ -8030,6 +8101,16 @@
                ath_tx_processq(sc, sc->sc_xrtxq);
  #endif
  
@@ -244,7 +243,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -7799,6 +7879,7 @@
+@@ -8101,6 +8182,7 @@
  ath_draintxq(struct ath_softc *sc)
  {
        struct ath_hal *ah = sc->sc_ah;
@@ -252,7 +251,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
        unsigned int i;
  
        /* XXX return value */
-@@ -9343,9 +9424,9 @@
+@@ -9675,9 +9757,9 @@
        dev->mtu = mtu;
        if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
                /* NB: the rx buffers may need to be reallocated */
@@ -264,10 +263,10 @@ Index: madwifi-ng-r2834-20071106/ath/if_ath.c
        }
        ATH_UNLOCK(sc);
  
-Index: madwifi-ng-r2834-20071106/ath/if_athvar.h
+Index: madwifi-ng-r2978-20071127/ath/if_athvar.h
 ===================================================================
---- madwifi-ng-r2834-20071106.orig/ath/if_athvar.h     2007-11-26 12:29:04.233078645 +0100
-+++ madwifi-ng-r2834-20071106/ath/if_athvar.h  2007-11-26 12:29:04.341084793 +0100
+--- madwifi-ng-r2978-20071127.orig/ath/if_athvar.h     2007-11-27 21:43:39.616990105 +0100
++++ madwifi-ng-r2978-20071127/ath/if_athvar.h  2007-11-27 21:48:18.536884841 +0100
 @@ -50,6 +50,10 @@
  #include <asm/io.h>
  #include <linux/list.h>
@@ -279,7 +278,7 @@ Index: madwifi-ng-r2834-20071106/ath/if_athvar.h
  /*
   * Deduce if tasklets are available.  If not then
   * fall back to using the immediate work queue.
-@@ -642,7 +646,6 @@
+@@ -699,7 +703,6 @@
        struct ath_buf *sc_rxbufcur;            /* current rx buffer */
        u_int32_t *sc_rxlink;                   /* link ptr in last RX desc */
        spinlock_t sc_rxbuflock;
@@ -287,7 +286,7 @@ Index: madwifi-ng-r2834-20071106/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 */
-@@ -655,6 +658,7 @@
+@@ -712,6 +715,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 */
@@ -295,50 +294,60 @@ Index: madwifi-ng-r2834-20071106/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 */
-@@ -727,6 +731,8 @@
- #define       ATH_TXBUF_LOCK_ASSERT(_sc) \
-       KASSERT(spin_is_locked(&(_sc)->sc_txbuflock), ("txbuf not locked!"))
+@@ -800,6 +804,8 @@
+ #define       ATH_TXBUF_LOCK_CHECK(_sc)
+ #endif
  
 +#define ATH_DISABLE_INTR              local_irq_disable
 +#define ATH_ENABLE_INTR               local_irq_enable
  
  #define       ATH_RXBUF_LOCK_INIT(_sc)        spin_lock_init(&(_sc)->sc_rxbuflock)
  #define       ATH_RXBUF_LOCK_DESTROY(_sc)
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_input.c
+Index: madwifi-ng-r2978-20071127/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_input.c  2007-11-26 12:29:04.197076583 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_input.c       2007-11-26 12:29:54.727956181 +0100
-@@ -1128,8 +1128,9 @@
-               if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
+--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_input.c  2007-11-27 21:18:30.038964155 +0100
++++ madwifi-ng-r2978-20071127/net80211/ieee80211_input.c       2007-11-27 21:50:39.616924535 +0100
+@@ -1173,7 +1173,7 @@
                        /* attach vlan tag */
-                       vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan);
--              } else
--                      netif_rx(skb);
-+              } else {
-+                      netif_receive_skb(skb);
-+              }
-               dev->last_rx = jiffies;
-       }
- }
-@@ -2235,7 +2236,7 @@
-               skb1->pkt_type = PACKET_OTHERHOST;
+                       struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
+                       if (vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan) == NET_RX_DROP) {
+-                              /* If netif_rx dropped the packet because 
++                              /* If netif_receive_skb dropped the packet because 
+                                * device was too busy */
+                               if (ni_tmp != NULL) {
+                                       /* node reference was leaked */
+@@ -1184,8 +1184,8 @@
+                       skb = NULL; /* SKB is no longer ours */
+               } else {
+                       struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
+-                      if (netif_rx(skb) == NET_RX_DROP) {
+-                              /* If netif_rx dropped the packet because 
++                      if (netif_receive_skb(skb) == NET_RX_DROP) {
++                              /* If netif_receive_skb dropped the packet because 
+                                * device was too busy */
+                               if (ni_tmp != NULL) {
+                                       /* node reference was leaked */
+@@ -2294,8 +2294,8 @@
                skb1->protocol = __constant_htons(0x0019);  /* ETH_P_80211_RAW */
  
--              netif_rx(skb1);
-+              netif_receive_skb(skb1);
-       }
- }
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_monitor.c
+               ni_tmp = SKB_CB(skb1)->ni;
+-              if (netif_rx(skb1) == NET_RX_DROP) {
+-                      /* If netif_rx dropped the packet because 
++              if (netif_receive_skb(skb1) == NET_RX_DROP) {
++                      /* If netif_receive_skb dropped the packet because 
+                        * device was too busy */
+                       if (ni_tmp != NULL) {
+                               /* node reference was leaked */
+Index: madwifi-ng-r2978-20071127/net80211/ieee80211_monitor.c
 ===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_monitor.c        2007-11-26 12:29:24.998261983 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_monitor.c     2007-11-26 12:29:32.962715851 +0100
-@@ -567,7 +567,7 @@
-                       skb1->pkt_type = pkttype;
+--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_monitor.c        2007-11-22 03:08:35.000000000 +0100
++++ madwifi-ng-r2978-20071127/net80211/ieee80211_monitor.c     2007-11-27 21:49:58.518582476 +0100
+@@ -568,7 +568,7 @@
                        skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */
  
--                      netif_rx(skb1);
-+                      netif_receive_skb(skb1);
-                       vap->iv_devstats.rx_packets++;
-                       vap->iv_devstats.rx_bytes += skb1->len;
+                       ni_tmp = SKB_CB(skb1)->ni;
+-                      if (netif_rx(skb1) == NET_RX_DROP) {
++                      if (netif_receive_skb(skb1) == NET_RX_DROP) {
+                               /* If netif_rx dropped the packet because 
+                                * device was too busy */
+                               if (ni_tmp != NULL) {