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

[openwrt.git] / package / madwifi / patches / 425-rc_rexmit.patch

diff --git a/package/madwifi/patches/425-rc_rexmit.patch b/package/madwifi/patches/425-rc_rexmit.patch
index 407e4b3..252767a 100644 (file)
--- a/package/madwifi/patches/425-rc_rexmit.patch
+++ b/package/madwifi/patches/425-rc_rexmit.patch
@@ -20,7 +20,7 @@
  struct ath_ratectrl {
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
  struct ath_ratectrl {
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c

-@@ -8634,6 +8634,8 @@ ath_tx_processq(struct ath_softc *sc, st
+@@ -8638,6 +8638,8 @@ ath_tx_processq(struct ath_softc *sc, st

  
                ni = bf->bf_node;
                if (ni != NULL) {
  
                ni = bf->bf_node;
                if (ni != NULL) {


@@ -29,7 +29,7 @@
                        an = ATH_NODE(ni);
                        if (ts->ts_status == 0) {
                                u_int8_t txant = ts->ts_antenna;
                        an = ATH_NODE(ni);
                        if (ts->ts_status == 0) {
                                u_int8_t txant = ts->ts_antenna;

-@@ -8686,15 +8688,43 @@ ath_tx_processq(struct ath_softc *sc, st
+@@ -8690,15 +8692,43 @@ ath_tx_processq(struct ath_softc *sc, st

                        lr = ts->ts_longretry;
                        sc->sc_stats.ast_tx_shortretry += sr;
                        sc->sc_stats.ast_tx_longretry += lr;
                        lr = ts->ts_longretry;
                        sc->sc_stats.ast_tx_shortretry += sr;
                        sc->sc_stats.ast_tx_longretry += lr;


@@ -303,7 +303,7 @@
                /* don't use a bit-rate that has been failing */
                if (sn->stats[size_bin][x].successive_failures > 3)
                        continue;
                /* don't use a bit-rate that has been failing */
                if (sn->stats[size_bin][x].successive_failures > 3)
                        continue;

-@@ -234,10 +230,6 @@ pick_sample_ndx(struct sample_node *sn, 
+@@ -234,10 +230,6 @@ pick_sample_ndx(struct sample_node *sn,

                if (sn->rates[ndx].rate > 22 && ndx > current_ndx + 2)
                        continue;
  
                if (sn->rates[ndx].rate > 22 && ndx > current_ndx + 2)
                        continue;