projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but...
[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
081a9a4
..
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
-+++ madwifi-trunk-r3314/ath/if_ath.c
+--- 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);
@@
-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) +
-@@ -22
16,6 +2228
,7 @@
+@@ -22
20,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.
-@@ -227
3,7 +2286
,23 @@
+@@ -227
7,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
-@@ -2
299,6 +2328
,11 @@
+@@ -2
303,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) {
-@@ -251
1,6 +2545
,7 @@
+@@ -251
5,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);
-@@ -255
1,6 +2586
,9 @@
+@@ -255
5,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 */
-@@ -40
09,6 +4047,39
@@
+@@ -40
13,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
-@@ -4026,13 +4097,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);
}
}
-@@ -4043,9 +4108,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);
}
/*
-@@ -63
50,15 +6415
,25 @@
+@@ -63
60,15 +6428
,25 @@
sc->sc_rxotherant = 0;
}
sc->sc_rxotherant = 0;
}
@@
-206,7
+215,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
struct ieee80211com *ic = &sc->sc_ic;
struct ath_hal *ah = sc ? sc->sc_ah : NULL;
struct ath_desc *ds;
struct ieee80211com *ic = &sc->sc_ic;
struct ath_hal *ah = sc ? sc->sc_ah : NULL;
struct ath_desc *ds;
-@@ -63
68,8 +6443
,10 @@
+@@ -63
78,8 +6456
,10 @@
unsigned int len;
int type;
u_int phyerr;
unsigned int len;
int type;
u_int phyerr;
@@
-217,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 */
-@@ -6
393,6 +6470
,15 @@
+@@ -6
403,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");
-@@ -64
40,6 +6526
,7 @@
+@@ -64
50,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]++;
@@
-241,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) {
/*
-@@ -66
35,9 +6722
,43 @@
+@@ -66
45,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);
@@
-285,7
+294,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
#undef PA2DESC
}
#undef PA2DESC
}
-@@ -82
88,12 +8409
,24 @@
+@@ -82
98,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;
@@
-310,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)
-@@ -83
09,7 +8442
,9 @@
+@@ -83
19,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;
@@
-320,7
+329,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
/*
* Process each active queue.
*/
/*
* Process each active queue.
*/
-@@ -83
30,6 +8465
,16 @@
+@@ -83
40,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);
@@
-337,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)
-@@ -83
45,13 +8490
,25 @@
+@@ -83
55,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;
@@
-363,7
+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)
-@@ -102
84,9 +10441
,9 @@
+@@ -102
96,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
-+++ madwifi-trunk-r3314/ath/if_athvar.h
+--- 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
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c
+--- 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
-+++ madwifi-trunk-r3314/net80211/ieee80211_monitor.c
+--- 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
-+++ madwifi-trunk-r3314/net80211/ieee80211_skb.c
+--- 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
-+++ madwifi-trunk-r3314/net80211/ieee80211_skb.h
+--- 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,
This page took
0.031175 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff