Mark 6tunnel as executable, avoids ": /etc/init.d/rcS: line 8: /etc/rc.d/S466tunnel...

[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 2bfc22e..3502e48 100644 (file)
--- a/package/madwifi/patches/301-tx_locking.patch
+++ b/package/madwifi/patches/301-tx_locking.patch
@@ -1,8 +1,8 @@
-Index: madwifi-ng-r2568-20070710/ath/if_ath.c
+Index: madwifi-ng-r2756-20071018/ath/if_ath.c

 ===================================================================
 ===================================================================

---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c        2007-07-11 22:59:44.896407046 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c     2007-07-11 22:59:45.332431894 +0200
-@@ -2558,7 +2558,7 @@
+--- madwifi-ng-r2756-20071018.orig/ath/if_ath.c        2007-10-24 06:20:20.749871745 +0200
++++ madwifi-ng-r2756-20071018/ath/if_ath.c     2007-10-24 06:20:20.997885880 +0200
+@@ -2693,7 +2693,7 @@

        /* NB: use this lock to protect an->an_tx_ffbuf (and txq->axq_stageq)
         *      in athff_can_aggregate() call too.
         */
        /* 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-r2568-20070710/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];
        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];

-@@ -2566,6 +2566,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;
                        /* 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-r2568-20070710/ath/if_ath.c
  
                        /*
                         * chain skbs and add FF magic
  
                        /*
                         * chain skbs and add FF magic

-@@ -2588,7 +2589,7 @@
+@@ -2723,7 +2724,7 @@

                         */
                        ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
                        if (bf == NULL) {
                         */
                        ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
                        if (bf == NULL) {


@@ -28,7 +28,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
                                goto hardstart_fail;
                        }
                        DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,
                                goto hardstart_fail;
                        }
                        DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,

-@@ -2600,8 +2601,7 @@
+@@ -2735,8 +2736,7 @@

                        an->an_tx_ffbuf[skb->priority] = bf;
  
                        TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist);
                        an->an_tx_ffbuf[skb->priority] = bf;
  
                        TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist);


@@ -38,7 +38,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
  
                        return NETDEV_TX_OK;
                }
  
                        return NETDEV_TX_OK;
                }

-@@ -2614,7 +2614,7 @@
+@@ -2749,7 +2749,7 @@

                        an->an_tx_ffbuf[skb->priority] = NULL;
  
                        /* NB: ath_tx_start -> ath_tx_txqaddbuf uses ATH_TXQ_LOCK too */
                        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-r2568-20070710/ath/if_ath.c
  
                        /* encap and xmit */
                        bf_ff->bf_skb = ieee80211_encap(ni, bf_ff->bf_skb, &framecnt);
  
                        /* encap and xmit */
                        bf_ff->bf_skb = ieee80211_encap(ni, bf_ff->bf_skb, &framecnt);

-@@ -2663,12 +2663,12 @@
+@@ -2798,12 +2798,12 @@

  
                ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
                if (bf == NULL) {
  
                ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
                if (bf == NULL) {


@@ -62,11 +62,11 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
  
  ff_flush_done:
  ff_bypass:
  
  ff_flush_done:
  ff_bypass:

-Index: madwifi-ng-r2568-20070710/ath/if_athvar.h
+Index: madwifi-ng-r2756-20071018/ath/if_athvar.h

 ===================================================================
 ===================================================================

---- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h     2007-07-11 22:59:44.896407046 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_athvar.h  2007-07-11 22:59:45.332431894 +0200
-@@ -497,6 +497,8 @@
+--- madwifi-ng-r2756-20071018.orig/ath/if_athvar.h     2007-10-24 06:20:20.749871745 +0200
++++ madwifi-ng-r2756-20071018/ath/if_athvar.h  2007-10-24 06:20:21.001886105 +0200
+@@ -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_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)