mac80211: merge Pat Erley's mac80211.sh from openwrt-devel@ with many cleanups and...

[openwrt.git] / package / madwifi / patches / 343-txqueue_races.patch

diff --git a/package/madwifi/patches/343-txqueue_races.patch b/package/madwifi/patches/343-txqueue_races.patch
index 6cd0b13..a2b14d6 100644 (file)
--- a/package/madwifi/patches/343-txqueue_races.patch
+++ b/package/madwifi/patches/343-txqueue_races.patch
@@ -2,7 +2,7 @@ Merged from madwifi trunk r3551, r3552
 
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
 
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c

-@@ -8257,6 +8257,17 @@
+@@ -8253,6 +8253,17 @@ ath_tx_processq(struct ath_softc *sc, st

                        goto bf_fail;
                }
  
                        goto bf_fail;
                }
  


@@ -22,7 +22,7 @@ Merged from madwifi trunk r3551, r3552
  
 --- a/ath/if_athvar.h
 +++ b/ath/if_athvar.h
  
 --- a/ath/if_athvar.h
 +++ b/ath/if_athvar.h

-@@ -586,7 +586,8 @@
+@@ -586,7 +586,8 @@ struct ath_vap {

  } while (0)
  #define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \
        STAILQ_REMOVE_HEAD(&(_tq)->axq_q, _field); \
  } while (0)
  #define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \
        STAILQ_REMOVE_HEAD(&(_tq)->axq_q, _field); \