qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-20 04:18:27 +02:00
Code

remove madwifi tx locking patch - i don't trust it

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9580 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-11-18 15:40:12 +00:00
parent eb43c75551
commit cdb32999d1
1 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
package/madwifi/patches/301-tx_locking.patch
View File

@ -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);