X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fmadwifi%2Fpatches%2F300-napi_polling.patch;h=f1799b4219c4d3f40e367bc4cc051b4c5c1b1ca8;hp=1cca8f545e2ed7c6a1203d8593eac23eb23b3663;hb=621f114b34d852e88f339e77726d6aa0264ea19a;hpb=264cf6f0138bc5183fa13cc69612de048049e8a2 diff --git a/package/madwifi/patches/300-napi_polling.patch b/package/madwifi/patches/300-napi_polling.patch index 1cca8f545e..f1799b4219 100644 --- a/package/madwifi/patches/300-napi_polling.patch +++ b/package/madwifi/patches/300-napi_polling.patch @@ -1,8 +1,8 @@ -Index: madwifi-dfs-r3053/ath/if_ath.c +Index: madwifi-dfs-r3246/ath/if_ath.c =================================================================== ---- madwifi-dfs-r3053.orig/ath/if_ath.c 2007-12-13 05:25:13.342385808 +0100 -+++ madwifi-dfs-r3053/ath/if_ath.c 2007-12-13 05:25:13.662404044 +0100 -@@ -189,7 +189,7 @@ +--- madwifi-dfs-r3246.orig/ath/if_ath.c 2008-01-25 16:28:31.352327279 +0100 ++++ madwifi-dfs-r3246/ath/if_ath.c 2008-01-25 16:30:04.921659489 +0100 +@@ -188,7 +188,7 @@ struct sk_buff *, int, 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,15 +11,15 @@ Index: madwifi-dfs-r3053/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 -@@ -535,7 +535,6 @@ +@@ -545,7 +545,6 @@ ATH_TXBUF_LOCK_INIT(sc); ATH_RXBUF_LOCK_INIT(sc); - ATH_INIT_TQUEUE(&sc->sc_rxtq, ath_rx_tasklet, dev); - ATH_INIT_TQUEUE(&sc->sc_txtq, ath_tx_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); -@@ -808,6 +807,8 @@ +@@ -822,6 +821,8 @@ dev->set_mac_address = ath_set_mac_address; dev->change_mtu = ath_change_mtu; dev->tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED; @@ -28,15 +28,15 @@ Index: madwifi-dfs-r3053/ath/if_ath.c #ifdef USE_HEADERLEN_RESV dev->hard_header_len += sizeof(struct ieee80211_qosframe) + sizeof(struct llc) + -@@ -2150,6 +2151,7 @@ - (status & HAL_INT_RXPHY) ? " HAL_INT_RXPHY" : "", - (status & HAL_INT_SWBA) ? " HAL_INT_SWBA" : ""); +@@ -2233,6 +2234,7 @@ + (status & HAL_INT_GLOBAL) ? " HAL_INT_GLOBAL" : "" + ); + sc->sc_isr = status; status &= sc->sc_imask; /* discard unasked for bits */ if (status & HAL_INT_FATAL) { sc->sc_stats.ast_hardware++; -@@ -2201,7 +2203,14 @@ +@@ -2284,7 +2286,14 @@ } if (status & (HAL_INT_RX | HAL_INT_RXPHY)) { ath_uapsd_processtriggers(sc); @@ -52,7 +52,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c } if (status & HAL_INT_TX) { #ifdef ATH_SUPERG_DYNTURBO -@@ -2227,6 +2236,11 @@ +@@ -2310,6 +2319,11 @@ } } #endif @@ -64,7 +64,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark); } if (status & HAL_INT_BMISS) { -@@ -3904,10 +3918,10 @@ +@@ -4017,10 +4031,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-dfs-r3053/ath/if_ath.c netif_stop_queue(dev); } -@@ -3920,7 +3934,7 @@ +@@ -4033,7 +4047,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-dfs-r3053/ath/if_ath.c } /* -@@ -6287,13 +6301,12 @@ +@@ -6358,13 +6372,12 @@ sc->sc_rxotherant = 0; } @@ -102,7 +102,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c struct ath_buf *bf; struct ath_softc *sc = dev->priv; struct ieee80211com *ic = &sc->sc_ic; -@@ -6305,8 +6318,11 @@ +@@ -6376,8 +6389,11 @@ unsigned int len; int type; u_int phyerr; @@ -114,7 +114,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c do { bf = STAILQ_FIRST(&sc->sc_rxbuf); if (bf == NULL) { /* XXX ??? can this happen */ -@@ -6330,6 +6346,13 @@ +@@ -6401,6 +6417,13 @@ /* NB: never process the self-linked entry at the end */ break; } @@ -128,7 +128,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c skb = bf->bf_skb; if (skb == NULL) { printk("%s: no skbuff (%s)\n", DEV_NAME(dev), __func__); -@@ -6374,6 +6397,7 @@ +@@ -6448,6 +6471,7 @@ sc->sc_stats.ast_rx_phyerr++; phyerr = rs->rs_phyerr & 0x1f; sc->sc_stats.ast_rx_phy[phyerr]++; @@ -136,7 +136,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c } if (rs->rs_status & HAL_RXERR_DECRYPT) { /* -@@ -6571,9 +6595,33 @@ +@@ -6658,9 +6682,33 @@ STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); ATH_RXBUF_UNLOCK_IRQ(sc); } while (ath_rxbuf_init(sc, bf) == 0); @@ -170,7 +170,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c #undef PA2DESC } -@@ -8192,11 +8240,22 @@ +@@ -8308,11 +8356,22 @@ struct net_device *dev = (struct net_device *)data; struct ath_softc *sc = dev->priv; @@ -193,7 +193,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c netif_wake_queue(dev); if (sc->sc_softled) -@@ -8213,6 +8272,7 @@ +@@ -8329,6 +8388,7 @@ struct net_device *dev = (struct net_device *)data; struct ath_softc *sc = dev->priv; @@ -201,7 +201,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c /* * Process each active queue. */ -@@ -8233,6 +8293,16 @@ +@@ -8349,6 +8409,16 @@ if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum)) ath_tx_processq(sc, sc->sc_uapsdq); @@ -218,17 +218,14 @@ Index: madwifi-dfs-r3053/ath/if_ath.c netif_wake_queue(dev); if (sc->sc_softled) -@@ -8250,6 +8320,7 @@ - unsigned int i; +@@ -8367,10 +8437,21 @@ - /* Process each active queue. */ + /* Process each active queue. This includes sc_cabq, sc_xrtq and + * sc_uapsdq */ +process_tx_again: 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]); -@@ -8258,6 +8329,16 @@ - ath_tx_processq(sc, sc->sc_xrtxq); - #endif + ATH_DISABLE_INTR(); + if (sc->sc_isr & HAL_INT_TX) { @@ -243,7 +240,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c netif_wake_queue(dev); if (sc->sc_softled) -@@ -8332,6 +8413,7 @@ +@@ -8445,6 +8526,7 @@ ath_draintxq(struct ath_softc *sc) { struct ath_hal *ah = sc->sc_ah; @@ -251,7 +248,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c unsigned int i; /* XXX return value */ -@@ -10095,9 +10177,9 @@ +@@ -10310,9 +10392,9 @@ dev->mtu = mtu; if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) { /* NB: the rx buffers may need to be reallocated */ @@ -263,10 +260,10 @@ Index: madwifi-dfs-r3053/ath/if_ath.c } ATH_UNLOCK(sc); -Index: madwifi-dfs-r3053/ath/if_athvar.h +Index: madwifi-dfs-r3246/ath/if_athvar.h =================================================================== ---- madwifi-dfs-r3053.orig/ath/if_athvar.h 2007-12-13 05:25:12.842357313 +0100 -+++ madwifi-dfs-r3053/ath/if_athvar.h 2007-12-13 05:25:13.666404270 +0100 +--- madwifi-dfs-r3246.orig/ath/if_athvar.h 2008-01-25 16:28:31.304324541 +0100 ++++ madwifi-dfs-r3246/ath/if_athvar.h 2008-01-25 16:28:36.740634339 +0100 @@ -50,6 +50,10 @@ #include #include @@ -294,7 +291,7 @@ Index: madwifi-dfs-r3053/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 */ -@@ -853,6 +857,8 @@ +@@ -854,6 +858,8 @@ #define ATH_TXBUF_LOCK_CHECK(_sc) #endif @@ -303,51 +300,119 @@ Index: madwifi-dfs-r3053/ath/if_athvar.h #define ATH_RXBUF_LOCK_INIT(_sc) spin_lock_init(&(_sc)->sc_rxbuflock) #define ATH_RXBUF_LOCK_DESTROY(_sc) -Index: madwifi-dfs-r3053/net80211/ieee80211_input.c +Index: madwifi-dfs-r3246/net80211/ieee80211_input.c =================================================================== ---- madwifi-dfs-r3053.orig/net80211/ieee80211_input.c 2007-12-13 05:25:10.374216660 +0100 -+++ madwifi-dfs-r3053/net80211/ieee80211_input.c 2007-12-13 05:25:13.674404726 +0100 -@@ -1178,7 +1178,7 @@ +--- madwifi-dfs-r3246.orig/net80211/ieee80211_input.c 2008-01-25 16:27:28.000000000 +0100 ++++ madwifi-dfs-r3246/net80211/ieee80211_input.c 2008-01-25 16:32:53.171247487 +0100 +@@ -1196,7 +1196,7 @@ /* attach vlan tag */ 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 ++ /* If netif_receive_skb dropped the packet because * device was too busy */ if (ni_tmp != NULL) { /* node reference was leaked */ -@@ -1189,8 +1189,8 @@ +@@ -1207,8 +1207,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 ++ /* If netif_receive_skb dropped the packet because * device was too busy */ if (ni_tmp != NULL) { /* node reference was leaked */ -@@ -2299,8 +2299,8 @@ +@@ -2313,8 +2313,8 @@ skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ 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 ++ /* If netif_receive_skb dropped the packet because * device was too busy */ if (ni_tmp != NULL) { /* node reference was leaked */ -Index: madwifi-dfs-r3053/net80211/ieee80211_monitor.c +Index: madwifi-dfs-r3246/net80211/ieee80211_monitor.c =================================================================== ---- madwifi-dfs-r3053.orig/net80211/ieee80211_monitor.c 2007-12-13 05:25:10.386217344 +0100 -+++ madwifi-dfs-r3053/net80211/ieee80211_monitor.c 2007-12-13 05:25:13.678404955 +0100 -@@ -577,7 +577,7 @@ - skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ +--- madwifi-dfs-r3246.orig/net80211/ieee80211_monitor.c 2008-01-25 16:27:28.000000000 +0100 ++++ madwifi-dfs-r3246/net80211/ieee80211_monitor.c 2008-01-25 16:32:05.436527235 +0100 +@@ -586,8 +586,8 @@ + skb1->protocol = + __constant_htons(0x0019); /* ETH_P_80211_RAW */ - 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_rx dropped the packet because - * device was too busy */ - if (ni_tmp != NULL) { ++ /* If netif_receive_skb dropped the packet because + * device was too busy, reclaim the ref. in + * the skb. */ + if (SKB_CB(skb1)->ni != NULL) +Index: madwifi-dfs-r3246/net80211/ieee80211_skb.c +=================================================================== +--- madwifi-dfs-r3246.orig/net80211/ieee80211_skb.c 2008-01-25 16:31:47.167486151 +0100 ++++ madwifi-dfs-r3246/net80211/ieee80211_skb.c 2008-01-25 16:31:55.695972162 +0100 +@@ -73,7 +73,7 @@ + #undef dev_queue_xmit + #undef kfree_skb + #undef kfree_skb_fast +-#undef netif_rx ++#undef netif_receive_skb + #undef pskb_copy + #undef skb_clone + #undef skb_copy +@@ -627,8 +627,8 @@ + grp, vlan_tag); + } + +-int netif_rx_debug(struct sk_buff *skb, const char* func, int line) { +- return netif_rx(untrack_skb(skb, 0, func, line, __func__, __LINE__)); ++int netif_receive_skb_debug(struct sk_buff *skb, const char* func, int line) { ++ return netif_receive_skb(untrack_skb(skb, 0, func, line, __func__, __LINE__)); + } + + struct sk_buff * alloc_skb_debug(unsigned int length, gfp_t gfp_mask, +@@ -749,7 +749,7 @@ + } + + EXPORT_SYMBOL(vlan_hwaccel_receive_skb_debug); +-EXPORT_SYMBOL(netif_rx_debug); ++EXPORT_SYMBOL(netif_receive_skb_debug); + EXPORT_SYMBOL(alloc_skb_debug); + EXPORT_SYMBOL(dev_alloc_skb_debug); + EXPORT_SYMBOL(skb_clone_debug); +Index: madwifi-dfs-r3246/net80211/ieee80211_skb.h +=================================================================== +--- madwifi-dfs-r3246.orig/net80211/ieee80211_skb.h 2008-01-25 16:31:20.845986170 +0100 ++++ madwifi-dfs-r3246/net80211/ieee80211_skb.h 2008-01-25 16:31:36.982905763 +0100 +@@ -116,7 +116,7 @@ + int vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, + struct vlan_group *grp, unsigned short vlan_tag, + const char* func, int line); +-int netif_rx_debug(struct sk_buff *skb, const char* func, int line); ++int netif_receive_skb_debug(struct sk_buff *skb, const char* func, int line); + struct sk_buff * alloc_skb_debug(unsigned int length, gfp_t gfp_mask, + const char *func, int line); + struct sk_buff * dev_alloc_skb_debug(unsigned int length, +@@ -151,7 +151,7 @@ + #undef dev_queue_xmit + #undef kfree_skb + #undef kfree_skb_fast +-#undef netif_rx ++#undef netif_receive_skb + #undef pskb_copy + #undef skb_clone + #undef skb_copy +@@ -168,8 +168,8 @@ + skb_copy_expand_debug(_skb, _newheadroom, _newtailroom, _gfp_mask, __func__, __LINE__) + #define vlan_hwaccel_receive_skb(_skb, _grp, _tag) \ + vlan_hwaccel_receive_skb_debug(_skb, _grp, _tag, __func__, __LINE__) +-#define netif_rx(_skb) \ +- netif_rx_debug(_skb, __func__, __LINE__) ++#define netif_receive_skb(_skb) \ ++ netif_receive_skb_debug(_skb, __func__, __LINE__) + #define alloc_skb(_length, _gfp_mask) \ + alloc_skb_debug(_length, _gfp_mask, __func__, __LINE__) + #define dev_alloc_skb(_length) \