diff options
| author | John Crispin <john@openwrt.org> | 2007-10-20 19:13:53 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2007-10-20 19:13:53 +0000 |
| commit | 9f73ab51f3d95cfc04f5a507788c9301d9ddb471 (patch) | |
| tree | 7275422e219035a551380951bb7c6d6afe66ceff /package/madwifi/patches/301-tx_locking.patch | |
| parent | 6700c1d745e04f3cd5c59ba2fe3add817a547dcb (diff) | |
| download | upstream-9f73ab51f3d95cfc04f5a507788c9301d9ddb471.tar.gz upstream-9f73ab51f3d95cfc04f5a507788c9301d9ddb471.tar.bz2 upstream-9f73ab51f3d95cfc04f5a507788c9301d9ddb471.zip | |
refreshed madwifi patches
SVN-Revision: 9380
Diffstat (limited to 'package/madwifi/patches/301-tx_locking.patch')
| -rw-r--r-- | package/madwifi/patches/301-tx_locking.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/package/madwifi/patches/301-tx_locking.patch b/package/madwifi/patches/301-tx_locking.patch index 5657535e8c..1ca7e8261d 100644 --- a/package/madwifi/patches/301-tx_locking.patch +++ b/package/madwifi/patches/301-tx_locking.patch @@ -1,8 +1,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:45.030546315 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:45.406567742 +0200 -@@ -2558,7 +2558,7 @@ +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-10-20 20:52:09.000000000 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-10-20 20:52:39.000000000 +0200 +@@ -2561,7 +2561,7 @@ /* NB: use this lock to protect an->an_tx_ffbuf (and txq->axq_stageq) * in athff_can_aggregate() call too. */ @@ -11,7 +11,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c if (athff_can_aggregate(sc, eh, an, skb, vap->iv_fragthreshold, &ff_flush)) { if (an->an_tx_ffbuf[skb->priority]) { /* i.e., frame on the staging queue */ bf = an->an_tx_ffbuf[skb->priority]; -@@ -2566,6 +2566,7 @@ +@@ -2569,6 +2569,7 @@ /* get (and remove) the frame from staging queue */ TAILQ_REMOVE(&txq->axq_stageq, bf, bf_stagelist); an->an_tx_ffbuf[skb->priority] = NULL; @@ -19,7 +19,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c /* * chain skbs and add FF magic -@@ -2588,7 +2589,7 @@ +@@ -2591,7 +2592,7 @@ */ ATH_HARDSTART_GET_TX_BUF_WITH_LOCK; if (bf == NULL) { @@ -28,7 +28,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c goto hardstart_fail; } DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF, -@@ -2600,8 +2601,7 @@ +@@ -2603,8 +2604,7 @@ an->an_tx_ffbuf[skb->priority] = bf; TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist); @@ -38,7 +38,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c return NETDEV_TX_OK; } -@@ -2614,7 +2614,7 @@ +@@ -2617,7 +2617,7 @@ an->an_tx_ffbuf[skb->priority] = NULL; /* NB: ath_tx_start -> ath_tx_txqaddbuf uses ATH_TXQ_LOCK too */ @@ -47,7 +47,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c /* encap and xmit */ bf_ff->bf_skb = ieee80211_encap(ni, bf_ff->bf_skb, &framecnt); -@@ -2663,12 +2663,12 @@ +@@ -2666,12 +2666,12 @@ ATH_HARDSTART_GET_TX_BUF_WITH_LOCK; if (bf == NULL) { @@ -64,8 +64,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c ff_bypass: Index: madwifi-ng-r2568-20070710/ath/if_athvar.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-23 01:48:45.030546315 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-23 01:48:45.406567742 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-10-20 20:52:09.000000000 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-10-20 20:52:37.000000000 +0200 @@ -497,6 +497,8 @@ #define ATH_TXQ_INTR_PERIOD 5 /* axq_intrcnt period for intr gen */ #define ATH_TXQ_LOCK_INIT(_tq) spin_lock_init(&(_tq)->axq_lock) |