X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fmadwifi%2Fpatches%2F301-tx_locking.patch;h=5657535e8c2747e5c749fdfc0bbbc7c320354275;hb=6cd6d5e9b11885c94d94751ec4c5b35ba87a03ab;hp=f2b4cc7fb1cc66b2b0147838b9abe7d9c704616c;hpb=b5cb1795de1f0959de1e228bd2e784d1cea921a7;p=openwrt.git

diff --git a/package/madwifi/patches/301-tx_locking.patch b/package/madwifi/patches/301-tx_locking.patch
index f2b4cc7fb1..5657535e8c 100644
--- a/package/madwifi/patches/301-tx_locking.patch
+++ b/package/madwifi/patches/301-tx_locking.patch
@@ -1,17 +1,17 @@
-Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+Index: madwifi-ng-r2568-20070710/ath/if_ath.c
 ===================================================================
---- madwifi-ng-r2420-20070602.orig/ath/if_ath.c	2007-06-04 13:21:58.427094400 +0200
-+++ madwifi-ng-r2420-20070602/ath/if_ath.c	2007-06-04 13:21:58.684055336 +0200
-@@ -2554,7 +2554,7 @@
- 	/* NB: use this lock to protect an->an_ff_txbuf in athff_can_aggregate()
- 	 *     call too.
+--- 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 @@
+ 	/* 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];
-@@ -2562,6 +2562,7 @@
+@@ -2566,6 +2566,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-r2420-20070602/ath/if_ath.c
  
  			/*
  			 * chain skbs and add FF magic
-@@ -2584,7 +2585,7 @@
+@@ -2588,7 +2589,7 @@
  			 */
  			ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
  			if (bf == NULL) {
@@ -28,7 +28,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  				goto hardstart_fail;
  			}
  			DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,
-@@ -2596,8 +2597,7 @@
+@@ -2600,8 +2601,7 @@
  			an->an_tx_ffbuf[skb->priority] = bf;
  
  			TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist);
@@ -36,9 +36,18 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
 -			ATH_TXQ_UNLOCK_IRQ_EARLY(txq);
 +			ATH_TXQ_UNLOCK_BH(txq);
  
- 			return 0;
+ 			return NETDEV_TX_OK;
  		}
-@@ -2649,12 +2649,12 @@
+@@ -2614,7 +2614,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);
+@@ -2663,12 +2663,12 @@
  
  		ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
  		if (bf == NULL) {
@@ -51,13 +60,13 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
  
 -	ATH_TXQ_UNLOCK_IRQ(txq);
  
+ ff_flush_done:
  ff_bypass:
- 
-Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
+Index: madwifi-ng-r2568-20070710/ath/if_athvar.h
 ===================================================================
---- madwifi-ng-r2420-20070602.orig/ath/if_athvar.h	2007-06-04 13:21:58.428094248 +0200
-+++ madwifi-ng-r2420-20070602/ath/if_athvar.h	2007-06-04 13:21:58.684055336 +0200
-@@ -484,6 +484,8 @@
+--- 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
+@@ -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)
  #define	ATH_TXQ_LOCK_DESTROY(_tq)