diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-11-18 15:40:12 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-11-18 15:40:12 +0000 |
| commit | cbb4e6b5a2012ea36a5072481cf9eff9f7d869f5 (patch) | |
| tree | ddbcb2e788d4b4dcba829945899063b690440c4b | |
| parent | 55fff87408bd3d7f987ebb960e1129c3a9047e39 (diff) | |
| download | upstream-cbb4e6b5a2012ea36a5072481cf9eff9f7d869f5.tar.gz upstream-cbb4e6b5a2012ea36a5072481cf9eff9f7d869f5.tar.bz2 upstream-cbb4e6b5a2012ea36a5072481cf9eff9f7d869f5.zip | |
remove madwifi tx locking patch - i don't trust it
SVN-Revision: 9580
| -rw-r--r-- | package/madwifi/patches/301-tx_locking.patch | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/package/madwifi/patches/301-tx_locking.patch b/package/madwifi/patches/301-tx_locking.patch deleted file mode 100644 index 99008ee923..0000000000 --- a/package/madwifi/patches/301-tx_locking.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: madwifi-ng-r2834-20071106/ath/if_ath.c -=================================================================== ---- madwifi-ng-r2834-20071106.orig/ath/if_ath.c 2007-11-07 14:02:04.865648150 +0100 -+++ madwifi-ng-r2834-20071106/ath/if_ath.c 2007-11-07 14:02:05.117662515 +0100 -@@ -2693,7 +2693,7 @@ - /* NB: use this lock to protect an->an_tx_ffbuf (and txq->axq_stageq) - * in athff_can_aggregate() call too. - */ -- ATH_TXQ_LOCK_IRQ(txq); -+ ATH_TXQ_LOCK_BH(txq); - 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]; -@@ -2701,6 +2701,7 @@ - /* get (and remove) the frame from staging queue */ - TAILQ_REMOVE(&txq->axq_stageq, bf, bf_stagelist); - an->an_tx_ffbuf[skb->priority] = NULL; -+ ATH_TXQ_UNLOCK_BH(txq); - - /* - * chain skbs and add FF magic -@@ -2723,7 +2724,7 @@ - */ - ATH_HARDSTART_GET_TX_BUF_WITH_LOCK; - if (bf == NULL) { -- ATH_TXQ_UNLOCK_IRQ_EARLY(txq); -+ ATH_TXQ_UNLOCK_BH(txq); - goto hardstart_fail; - } - DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF, -@@ -2735,8 +2736,7 @@ - an->an_tx_ffbuf[skb->priority] = bf; - - TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist); -- -- ATH_TXQ_UNLOCK_IRQ_EARLY(txq); -+ ATH_TXQ_UNLOCK_BH(txq); - - return NETDEV_TX_OK; - } -@@ -2749,7 +2749,7 @@ - an->an_tx_ffbuf[skb->priority] = NULL; - - /* NB: ath_tx_start -> ath_tx_txqaddbuf uses ATH_TXQ_LOCK too */ -- ATH_TXQ_UNLOCK_IRQ_EARLY(txq); -+ ATH_TXQ_UNLOCK_BH(txq); - - /* encap and xmit */ - bf_ff->bf_skb = ieee80211_encap(ni, bf_ff->bf_skb, &framecnt); -@@ -2798,12 +2798,12 @@ - - ATH_HARDSTART_GET_TX_BUF_WITH_LOCK; - if (bf == NULL) { -- ATH_TXQ_UNLOCK_IRQ_EARLY(txq); -+ ATH_TXQ_UNLOCK_BH(txq); - goto hardstart_fail; - } -+ ATH_TXQ_UNLOCK_BH(txq); - } - -- ATH_TXQ_UNLOCK_IRQ(txq); - - ff_flush_done: - ff_bypass: -Index: madwifi-ng-r2834-20071106/ath/if_athvar.h -=================================================================== ---- madwifi-ng-r2834-20071106.orig/ath/if_athvar.h 2007-11-07 14:02:04.865648150 +0100 -+++ madwifi-ng-r2834-20071106/ath/if_athvar.h 2007-11-07 14:02:05.117662515 +0100 -@@ -504,6 +504,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) - #define ATH_TXQ_LOCK_DESTROY(_tq) -+#define ATH_TXQ_LOCK_BH(_tq) spin_lock_bh(&(_tq)->axq_lock); -+#define ATH_TXQ_UNLOCK_BH(_tq) spin_unlock_bh(&(_tq)->axq_lock); - #define ATH_TXQ_LOCK_IRQ(_tq) do { \ - unsigned long __axq_lockflags; \ - spin_lock_irqsave(&(_tq)->axq_lock, __axq_lockflags); |