projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Delete 2.6.24 files for OLPC
[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 04e6906..fae35b5 100644 (file)
--- a/package/madwifi/patches/300-napi_polling.patch
+++ b/package/madwifi/patches/300-napi_polling.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:56:33.725243076 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:57:34.912729951 +0100
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -184,7 +184,11 @@
        struct sk_buff *, int, int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);
 @@ -184,7 +184,11 @@
        struct sk_buff *, int, int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);
@@ -15,7 +13,7 @@ Index: madwifi-trunk-r3314/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
-@@ -374,6 +378,9 @@
+@@ -376,6 +380,9 @@
                u_int32_t new_clamped_maxtxpower);
  static u_int32_t ath_get_real_maxtxpower(struct ath_softc *sc);
  
                u_int32_t new_clamped_maxtxpower);
  static u_int32_t ath_get_real_maxtxpower(struct ath_softc *sc);
  
@@ -25,7 +23,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  /* calibrate every 30 secs in steady state but check every second at first. */
  static int ath_calinterval = ATH_SHORT_CALINTERVAL;
  static int ath_countrycode = CTRY_DEFAULT;    /* country code */
  /* calibrate every 30 secs in steady state but check every second at first. */
  static int ath_calinterval = ATH_SHORT_CALINTERVAL;
  static int ath_countrycode = CTRY_DEFAULT;    /* country code */
-@@ -545,7 +552,6 @@
+@@ -547,7 +554,6 @@
  
        atomic_set(&sc->sc_txbuf_counter, 0);
  
  
        atomic_set(&sc->sc_txbuf_counter, 0);
  
@@ -33,7 +31,7 @@ Index: madwifi-trunk-r3314/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);
-@@ -819,6 +825,12 @@
+@@ -821,6 +827,12 @@
        dev->set_mac_address = ath_set_mac_address;
        dev->change_mtu = ath_change_mtu;
        dev->tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED;
        dev->set_mac_address = ath_set_mac_address;
        dev->change_mtu = ath_change_mtu;
        dev->tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED;
@@ -46,7 +44,7 @@ Index: madwifi-trunk-r3314/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) +
-@@ -2213,6 +2225,7 @@
+@@ -2220,6 +2232,7 @@
                (status & HAL_INT_GLOBAL)       ? " HAL_INT_GLOBAL"     : ""
                );
  
                (status & HAL_INT_GLOBAL)       ? " HAL_INT_GLOBAL"     : ""
                );
  
@@ -54,7 +52,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        status &= sc->sc_imask;                 /* discard unasked for bits */
        /* As soon as we know we have a real interrupt we intend to service, 
         * we will check to see if we need an initial hardware TSF reading. 
        status &= sc->sc_imask;                 /* discard unasked for bits */
        /* As soon as we know we have a real interrupt we intend to service, 
         * we will check to see if we need an initial hardware TSF reading. 
-@@ -2270,7 +2283,23 @@
+@@ -2277,7 +2290,23 @@
                }
                if (status & (HAL_INT_RX | HAL_INT_RXPHY)) {
                        ath_uapsd_processtriggers(sc, hw_tsf);
                }
                if (status & (HAL_INT_RX | HAL_INT_RXPHY)) {
                        ath_uapsd_processtriggers(sc, hw_tsf);
@@ -79,7 +77,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                }
                if (status & HAL_INT_TX) {
  #ifdef ATH_SUPERG_DYNTURBO
                }
                if (status & HAL_INT_TX) {
  #ifdef ATH_SUPERG_DYNTURBO
-@@ -2296,6 +2325,11 @@
+@@ -2303,6 +2332,11 @@
                                }
                        }
  #endif
                                }
                        }
  #endif
@@ -91,7 +89,7 @@ Index: madwifi-trunk-r3314/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) {
-@@ -2508,6 +2542,7 @@
+@@ -2515,6 +2549,7 @@
        if (sc->sc_tx99 != NULL)
                sc->sc_tx99->start(sc->sc_tx99);
  #endif
        if (sc->sc_tx99 != NULL)
                sc->sc_tx99->start(sc->sc_tx99);
  #endif
@@ -99,7 +97,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
  done:
        ATH_UNLOCK(sc);
  
  done:
        ATH_UNLOCK(sc);
-@@ -2548,6 +2583,9 @@
+@@ -2555,6 +2590,9 @@
                if (sc->sc_tx99 != NULL)
                        sc->sc_tx99->stop(sc->sc_tx99);
  #endif
                if (sc->sc_tx99 != NULL)
                        sc->sc_tx99->stop(sc->sc_tx99);
  #endif
@@ -109,7 +107,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                netif_stop_queue(dev);  /* XXX re-enabled by ath_newstate */
                dev->flags &= ~IFF_RUNNING;     /* NB: avoid recursion */
                ieee80211_stop_running(ic);     /* stop all VAPs */
                netif_stop_queue(dev);  /* XXX re-enabled by ath_newstate */
                dev->flags &= ~IFF_RUNNING;     /* NB: avoid recursion */
                ieee80211_stop_running(ic);     /* stop all VAPs */
-@@ -4006,6 +4044,39 @@
+@@ -4013,12 +4051,47 @@
        return ath_keyset(sc, k, mac, vap->iv_bss);
  }
  
        return ath_keyset(sc, k, mac, vap->iv_bss);
  }
  
@@ -149,7 +147,15 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  /*
   * Block/unblock tx+rx processing while a key change is done.
   * We assume the caller serializes key management operations
  /*
   * Block/unblock tx+rx processing while a key change is done.
   * We assume the caller serializes key management operations
-@@ -4023,13 +4094,7 @@
+  * so we only need to worry about synchronization with other
+  * uses that originate in the driver.
+  */
++#define       IS_UP(_dev) \
++      (((_dev)->flags & (IFF_RUNNING|IFF_UP)) == (IFF_RUNNING|IFF_UP))
+ static void
+ ath_key_update_begin(struct ieee80211vap *vap)
+ {
+@@ -4032,14 +4105,9 @@
         * When called from the rx tasklet we cannot use
         * tasklet_disable because it will block waiting
         * for us to complete execution.
         * When called from the rx tasklet we cannot use
         * tasklet_disable because it will block waiting
         * for us to complete execution.
@@ -160,23 +166,26 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
         */
 -      if (!in_softirq())
 -              tasklet_disable(&sc->sc_rxtq);
         */
 -      if (!in_softirq())
 -              tasklet_disable(&sc->sc_rxtq);
-       netif_stop_queue(dev);
+-      netif_stop_queue(dev);
++      if (IS_UP(vap->iv_dev))
++              netif_stop_queue(dev);
  }
  
  }
  
-@@ -4040,9 +4105,9 @@
-       struct ath_softc *sc = dev->priv;
+ static void
+@@ -4051,9 +4119,9 @@
+ #endif
  
        DPRINTF(sc, ATH_DEBUG_KEYCACHE, "End\n");
 -      netif_wake_queue(dev);
 -      if (!in_softirq())              /* NB: see above */
 -              tasklet_enable(&sc->sc_rxtq);
 +
  
        DPRINTF(sc, ATH_DEBUG_KEYCACHE, "End\n");
 -      netif_wake_queue(dev);
 -      if (!in_softirq())              /* NB: see above */
 -              tasklet_enable(&sc->sc_rxtq);
 +
-+      if (dev->flags&IFF_RUNNING)
++      if (IS_UP(vap->iv_dev))
 +              netif_wake_queue(dev);
  }
  
  /*
 +              netif_wake_queue(dev);
  }
  
  /*
-@@ -6347,13 +6412,23 @@
+@@ -6360,15 +6428,25 @@
        sc->sc_rxotherant = 0;
  }
  
        sc->sc_rxotherant = 0;
  }
  
@@ -193,17 +202,20 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        ((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc + \
                ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr)))
 -      struct net_device *dev = (struct net_device *)data;
        ((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc + \
                ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr)))
 -      struct net_device *dev = (struct net_device *)data;
+-      struct ath_buf *bf;
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
 +      struct ath_softc *sc = container_of(napi, struct ath_softc, sc_napi);
 +      struct net_device *dev = sc->sc_dev;
 +      u_int rx_limit = budget;
 +#else
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
 +      struct ath_softc *sc = container_of(napi, struct ath_softc, sc_napi);
 +      struct net_device *dev = sc->sc_dev;
 +      u_int rx_limit = budget;
 +#else
-+      u_int rx_limit = dev->quota;
-+#endif
-       struct ath_buf *bf;
        struct ath_softc *sc = dev->priv;
        struct ath_softc *sc = dev->priv;
++      u_int rx_limit = min(dev->quota, *budget);
++#endif
++      struct ath_buf *bf;
        struct ieee80211com *ic = &sc->sc_ic;
        struct ieee80211com *ic = &sc->sc_ic;
-@@ -6365,8 +6440,10 @@
+       struct ath_hal *ah = sc ? sc->sc_ah : NULL;
+       struct ath_desc *ds;
+@@ -6378,8 +6456,10 @@
        unsigned int len;
        int type;
        u_int phyerr;
        unsigned int len;
        int type;
        u_int phyerr;
@@ -214,23 +226,23 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        do {
                bf = STAILQ_FIRST(&sc->sc_rxbuf);
                if (bf == NULL) {               /* XXX ??? can this happen */
        do {
                bf = STAILQ_FIRST(&sc->sc_rxbuf);
                if (bf == NULL) {               /* XXX ??? can this happen */
-@@ -6390,6 +6467,15 @@
+@@ -6403,6 +6483,15 @@
                        /* NB: never process the self-linked entry at the end */
                        break;
                }
 +
                        /* NB: never process the self-linked entry at the end */
                        break;
                }
 +
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
-+              processed++;
-+#endif
-+              if (rx_limit-- < 0) {
++              if (rx_limit-- < 2) {
 +                      early_stop = 1;
 +                      break;
 +              }
 +                      early_stop = 1;
 +                      break;
 +              }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
++              processed++;
++#endif
 +
                skb = bf->bf_skb;
                if (skb == NULL) {
                        EPRINTF(sc, "Dropping; buffer contains NULL skbuff.\n");
 +
                skb = bf->bf_skb;
                if (skb == NULL) {
                        EPRINTF(sc, "Dropping; buffer contains NULL skbuff.\n");
-@@ -6437,6 +6523,7 @@
+@@ -6450,6 +6539,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]++;
@@ -238,7 +250,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        }
                        if (rs->rs_status & HAL_RXERR_DECRYPT) {
                                /*
                        }
                        if (rs->rs_status & HAL_RXERR_DECRYPT) {
                                /*
-@@ -6632,9 +6719,38 @@
+@@ -6645,9 +6735,43 @@
                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);
@@ -269,15 +281,20 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
 +#else
 +      netif_rx_complete(dev);
 +      *budget -= processed;
 +#else
 +      netif_rx_complete(dev);
 +      *budget -= processed;
++      dev->quota -= processed;
 +#endif
  
        /* rx signal state monitoring */
        ath_hal_rxmonitor(ah, &sc->sc_halstats, &sc->sc_curchan);
 +#endif
  
        /* rx signal state monitoring */
        ath_hal_rxmonitor(ah, &sc->sc_halstats, &sc->sc_curchan);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
++      return processed;
++#else
 +      return early_stop;
 +      return early_stop;
++#endif
  #undef PA2DESC
  }
  
  #undef PA2DESC
  }
  
-@@ -8285,12 +8401,24 @@
+@@ -8298,12 +8422,24 @@
  {
        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;
@@ -302,7 +319,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -8306,7 +8434,9 @@
+@@ -8319,7 +8455,9 @@
  {
        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;
@@ -312,7 +329,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        /*
         * Process each active queue.
         */
        /*
         * Process each active queue.
         */
-@@ -8327,6 +8457,16 @@
+@@ -8340,6 +8478,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);
  
@@ -329,7 +346,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -8342,13 +8482,25 @@
+@@ -8355,13 +8503,25 @@
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
        unsigned int i;
        struct net_device *dev = (struct net_device *)data;
        struct ath_softc *sc = dev->priv;
        unsigned int i;
@@ -355,15 +372,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
        netif_wake_queue(dev);
  
        if (sc->sc_softled)
-@@ -8423,6 +8575,7 @@
- ath_draintxq(struct ath_softc *sc)
- {
-       struct ath_hal *ah = sc->sc_ah;
-+      int npend = 0;
-       unsigned int i;
- 
-       /* XXX return value */
-@@ -10281,9 +10434,9 @@
+@@ -10296,9 +10456,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 */
@@ -375,10 +384,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        }
        ATH_UNLOCK(sc);
  
        }
        ATH_UNLOCK(sc);
  
-Index: madwifi-trunk-r3314/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-02-20 21:56:33.733243528 +0100
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-02-20 21:57:34.892728811 +0100
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -53,6 +53,10 @@
  # include     <asm/bitops.h>
  #endif
 @@ -53,6 +53,10 @@
  # include     <asm/bitops.h>
  #endif
@@ -425,10 +432,8 @@ Index: madwifi-trunk-r3314/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-trunk-r3314/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-02-20 21:56:33.741243986 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-02-20 21:57:34.896729040 +0100
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -1198,7 +1198,7 @@
                        /* attach vlan tag */
                        struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
 @@ -1198,7 +1198,7 @@
                        /* attach vlan tag */
                        struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
@@ -460,10 +465,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
                         * device was too busy */
                        if (ni_tmp != NULL) {
                                /* node reference was leaked */
                         * device was too busy */
                        if (ni_tmp != NULL) {
                                /* node reference was leaked */
-Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_monitor.c      2008-02-20 21:56:33.749244442 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_monitor.c   2008-02-20 21:57:34.900729266 +0100
+--- a/net80211/ieee80211_monitor.c
++++ b/net80211/ieee80211_monitor.c
 @@ -584,8 +584,8 @@
                        skb1->protocol = 
                                __constant_htons(0x0019); /* ETH_P_80211_RAW */
 @@ -584,8 +584,8 @@
                        skb1->protocol = 
                                __constant_htons(0x0019); /* ETH_P_80211_RAW */
@@ -475,10 +478,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c
                                 * device was too busy, reclaim the ref. in 
                                 * the skb. */
                                if (SKB_CB(skb1)->ni != NULL)
                                 * device was too busy, reclaim the ref. in 
                                 * the skb. */
                                if (SKB_CB(skb1)->ni != NULL)
-Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.c  2008-02-20 21:56:33.757244897 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_skb.c       2008-02-20 21:57:34.904729495 +0100
+--- a/net80211/ieee80211_skb.c
++++ b/net80211/ieee80211_skb.c
 @@ -73,7 +73,7 @@
  #undef dev_queue_xmit
  #undef kfree_skb
 @@ -73,7 +73,7 @@
  #undef dev_queue_xmit
  #undef kfree_skb
@@ -508,10 +509,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c
  EXPORT_SYMBOL(alloc_skb_debug);
  EXPORT_SYMBOL(dev_alloc_skb_debug);
  EXPORT_SYMBOL(skb_clone_debug);
  EXPORT_SYMBOL(alloc_skb_debug);
  EXPORT_SYMBOL(dev_alloc_skb_debug);
  EXPORT_SYMBOL(skb_clone_debug);
-Index: madwifi-trunk-r3314/net80211/ieee80211_skb.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.h  2008-02-20 21:56:33.765245356 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_skb.h       2008-02-20 21:57:34.908729722 +0100
+--- a/net80211/ieee80211_skb.h
++++ b/net80211/ieee80211_skb.h
 @@ -116,7 +116,7 @@
  int  vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, 
                                    struct vlan_group *grp, unsigned short vlan_tag, 
 @@ -116,7 +116,7 @@
  int  vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, 
                                    struct vlan_group *grp, unsigned short vlan_tag, 
Personal OpenWRT clone
This page took 0.046546 seconds and 4 git commands to generate.