brcm47xx: update bcma and ssb to master-2011-07-21

[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 afbf115..a2b14d6 100644 (file)
--- a/package/madwifi/patches/343-txqueue_races.patch
+++ b/package/madwifi/patches/343-txqueue_races.patch
@@ -1,10 +1,8 @@
 Merged from madwifi trunk r3551, r3552
 
 Merged from madwifi trunk r3551, r3552
 

-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c
-+++ madwifi-trunk-r3314/ath/if_ath.c
-@@ -8244,6 +8244,17 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -8253,6 +8253,17 @@ ath_tx_processq(struct ath_softc *sc, st

                        goto bf_fail;
                }
  
                        goto bf_fail;
                }
  


@@ -22,11 +20,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                ATH_TXQ_REMOVE_HEAD(txq, bf_list);
                ATH_TXQ_UNLOCK_IRQ(txq);
  
                ATH_TXQ_REMOVE_HEAD(txq, bf_list);
                ATH_TXQ_UNLOCK_IRQ(txq);
  

-Index: madwifi-trunk-r3314/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h
-+++ madwifi-trunk-r3314/ath/if_athvar.h
-@@ -586,7 +586,8 @@
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
+@@ -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); \