refresh madwifi patches

[openwrt.git] / 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 884035d..bdfecd8 100644 (file)
--- a/package/madwifi/patches/301-tx_locking.patch
+++ b/package/madwifi/patches/301-tx_locking.patch
@@ -1,16 +1,17 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c   2007-06-01 16:44:25.170898128 +0200
-+++ madwifi.dev/ath/if_ath.c   2007-06-01 20:01:24.205131816 +0200
-@@ -2555,7 +2555,7 @@
-       /* NB: use this lock to protect an->an_ff_txbuf in athff_can_aggregate()
-        *     call too.
+Index: madwifi-ng-r2568-20070710/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c        2007-07-13 11:18:20.017437275 +0200
++++ madwifi-ng-r2568-20070710/ath/if_ath.c     2007-07-13 11:18:20.353456423 +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];
-@@ -2563,6 +2563,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;
@@ -18,7 +19,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
  
                        /*
                         * chain skbs and add FF magic
-@@ -2585,7 +2586,7 @@
+@@ -2588,7 +2589,7 @@
                         */
                        ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
                        if (bf == NULL) {
@@ -27,7 +28,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
                                goto hardstart_fail;
                        }
                        DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,
-@@ -2597,8 +2598,7 @@
+@@ -2600,8 +2601,7 @@
                        an->an_tx_ffbuf[skb->priority] = bf;
  
                        TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist);
@@ -35,9 +36,18 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 -                      ATH_TXQ_UNLOCK_IRQ_EARLY(txq);
 +                      ATH_TXQ_UNLOCK_BH(txq);
  
-                       return 0;
+                       return NETDEV_TX_OK;
                }
-@@ -2650,12 +2650,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) {
@@ -50,12 +60,13 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
  
 -      ATH_TXQ_UNLOCK_IRQ(txq);
  
+ ff_flush_done:
  ff_bypass:
- 
-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
---- madwifi.old/ath/if_athvar.h        2007-06-01 16:44:25.149901320 +0200
-+++ madwifi.dev/ath/if_athvar.h        2007-06-01 20:00:06.916881416 +0200
-@@ -484,6 +484,8 @@
+Index: madwifi-ng-r2568-20070710/ath/if_athvar.h
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h     2007-07-13 11:18:20.017437275 +0200
++++ madwifi-ng-r2568-20070710/ath/if_athvar.h  2007-07-13 11:18:20.353456423 +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)
@@ -64,4 +75,3 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
  #define ATH_TXQ_LOCK_IRQ(_tq)         do {                            \
        unsigned long __axq_lockflags;                                  \
        spin_lock_irqsave(&(_tq)->axq_lock, __axq_lockflags);
-