X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1f9285016a01f115851b9b7f9adb39be52f2b0fa..271fe72913eccc9a113c3fc3320cb5144be4871c:/package/madwifi/patches/301-tx_locking.patch

diff --git a/package/madwifi/patches/301-tx_locking.patch b/package/madwifi/patches/301-tx_locking.patch
index edf138558..b082dbda8 100644
--- a/package/madwifi/patches/301-tx_locking.patch
+++ b/package/madwifi/patches/301-tx_locking.patch
@@ -1,8 +1,8 @@
-Index: madwifi-ng-r2525-20070630/ath/if_ath.c
+Index: madwifi-ng-r2799-20071030/ath/if_ath.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/ath/if_ath.c	2007-07-03 23:02:32.998106000 +0200
-+++ madwifi-ng-r2525-20070630/ath/if_ath.c	2007-07-03 23:02:33.302125000 +0200
-@@ -2567,7 +2567,7 @@
+--- madwifi-ng-r2799-20071030.orig/ath/if_ath.c	2007-10-31 14:04:51.313545672 +0100
++++ madwifi-ng-r2799-20071030/ath/if_ath.c	2007-10-31 14:04:51.569560260 +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.
  	 */
@@ -11,7 +11,7 @@ Index: madwifi-ng-r2525-20070630/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];
-@@ -2575,6 +2575,7 @@
+@@ -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;
@@ -19,7 +19,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
  
  			/*
  			 * chain skbs and add FF magic
-@@ -2597,7 +2598,7 @@
+@@ -2723,7 +2724,7 @@
  			 */
  			ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
  			if (bf == NULL) {
@@ -28,7 +28,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
  				goto hardstart_fail;
  			}
  			DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,
-@@ -2609,8 +2610,7 @@
+@@ -2735,8 +2736,7 @@
  			an->an_tx_ffbuf[skb->priority] = bf;
  
  			TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist);
@@ -36,9 +36,9 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
 -			ATH_TXQ_UNLOCK_IRQ_EARLY(txq);
 +			ATH_TXQ_UNLOCK_BH(txq);
  
- 			return 0;
+ 			return NETDEV_TX_OK;
  		}
-@@ -2623,7 +2623,7 @@
+@@ -2749,7 +2749,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-r2525-20070630/ath/if_ath.c
  
  			/* encap and xmit */
  			bf_ff->bf_skb = ieee80211_encap(ni, bf_ff->bf_skb, &framecnt);
-@@ -2674,12 +2674,12 @@
+@@ -2798,12 +2798,12 @@
  
  		ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
  		if (bf == NULL) {
@@ -62,11 +62,11 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
  
  ff_flush_done:
  ff_bypass:
-Index: madwifi-ng-r2525-20070630/ath/if_athvar.h
+Index: madwifi-ng-r2799-20071030/ath/if_athvar.h
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/ath/if_athvar.h	2007-07-03 23:02:33.002106250 +0200
-+++ madwifi-ng-r2525-20070630/ath/if_athvar.h	2007-07-03 23:02:33.302125000 +0200
-@@ -487,6 +487,8 @@
+--- madwifi-ng-r2799-20071030.orig/ath/if_athvar.h	2007-10-31 14:04:51.317545898 +0100
++++ madwifi-ng-r2799-20071030/ath/if_athvar.h	2007-10-31 14:04:51.569560260 +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)