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

[openwrt.git] / package / madwifi / patches / 347-tuning.patch

diff --git a/package/madwifi/patches/347-tuning.patch b/package/madwifi/patches/347-tuning.patch
index b2e4661..1a73c42 100644 (file)
--- a/package/madwifi/patches/347-tuning.patch
+++ b/package/madwifi/patches/347-tuning.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-04-23 03:31:06.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-04-23 03:31:23.000000000 +0200
-@@ -10267,11 +10267,11 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -10276,11 +10276,11 @@ ath_setcurmode(struct ath_softc *sc, enu

        sc->sc_currates = rt;
        sc->sc_curmode = mode;
        /*
        sc->sc_currates = rt;
        sc->sc_curmode = mode;
        /*


@@ -17,11 +15,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        /* rate index used to send mgt frames */
        sc->sc_minrateix = 0;
  }
        /* rate index used to send mgt frames */
        sc->sc_minrateix = 0;
  }

-Index: madwifi-trunk-r3314/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-04-23 03:31:23.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-04-23 03:31:23.000000000 +0200
-@@ -272,6 +272,10 @@
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
+@@ -272,6 +272,10 @@ static inline struct net_device *_alloc_

  #define AES_ICV_FIELD_SIZE      8       /* AES ICV field size */
  #define EXT_IV_FIELD_SIZE       4       /* ext IV field size */
  
  #define AES_ICV_FIELD_SIZE      8       /* AES ICV field size */
  #define EXT_IV_FIELD_SIZE       4       /* ext IV field size */
  


@@ -32,11 +28,9 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
  /* XR specific macros */
  
  #define XR_DEFAULT_GRPPOLL_RATE_STR   "0.25 1 1 3 3 6 6 20"
  /* XR specific macros */
  
  #define XR_DEFAULT_GRPPOLL_RATE_STR   "0.25 1 1 3 3 6 6 20"

-Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-04-23 03:31:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-04-23 03:31:23.000000000 +0200
-@@ -197,7 +197,7 @@
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
+@@ -197,7 +197,7 @@ calc_usecs_unicast_packet(struct ath_sof

                unsigned int x = 0, tt = 0;
                unsigned int cix = rt->info[rix].controlRate;
                int rts = 0, cts = 0;
                unsigned int x = 0, tt = 0;
                unsigned int cix = rt->info[rix].controlRate;
                int rts = 0, cts = 0;


@@ -45,7 +39,7 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
  
                KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
  
  
                KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
  

-@@ -281,7 +281,7 @@
+@@ -281,7 +281,7 @@ calc_usecs_unicast_packet(struct ath_sof

                tt += (long_retries + 1) * ath_hal_computetxtime(sc->sc_ah, rt, length,
                                                        rix, AH_TRUE);
                for (x = 0; x <= short_retries + long_retries; x++) {
                tt += (long_retries + 1) * ath_hal_computetxtime(sc->sc_ah, rt, length,
                                                        rix, AH_TRUE);
                for (x = 0; x <= short_retries + long_retries; x++) {


@@ -54,11 +48,9 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                        tt += (t_slot * cw / 2);
                }
                return tt;
                        tt += (t_slot * cw / 2);
                }
                return tt;

-Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.h      2008-04-23 03:31:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h   2008-04-23 03:31:23.000000000 +0200
-@@ -180,14 +180,6 @@
+--- a/ath_rate/minstrel/minstrel.h
++++ b/ath_rate/minstrel/minstrel.h
+@@ -180,14 +180,6 @@ struct minstrel_node {

  #define MAX(a,b)        ((a) > (b) ? (a) : (b))
  #endif
  
  #define MAX(a,b)        ((a) > (b) ? (a) : (b))
  #endif
  


@@ -73,11 +65,9 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h
  /*
   * Definitions for pulling the rate and trie counts from
   * a 5212 h/w descriptor. These Don't belong here; the
  /*
   * Definitions for pulling the rate and trie counts from
   * a 5212 h/w descriptor. These Don't belong here; the

-Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c  2008-04-23 03:31:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.c       2008-04-23 03:31:23.000000000 +0200
-@@ -170,7 +170,7 @@
+--- a/ath_rate/sample/sample.c
++++ b/ath_rate/sample/sample.c
+@@ -170,7 +170,7 @@ calc_usecs_unicast_packet(struct ath_sof

        struct ieee80211com *ic = &sc->sc_ic;
        unsigned int tt = 0;
        unsigned int x;
        struct ieee80211com *ic = &sc->sc_ic;
        unsigned int tt = 0;
        unsigned int x;


@@ -86,7 +76,7 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
        unsigned int cix = rt->info[rix].controlRate;
        KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
  
        unsigned int cix = rt->info[rix].controlRate;
        KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
  

-@@ -254,7 +254,7 @@
+@@ -254,7 +254,7 @@ calc_usecs_unicast_packet(struct ath_sof

        tt += (long_retries+1)*ath_hal_computetxtime(sc->sc_ah, rt, length,
                                                rix, AH_TRUE);
        for (x = 0; x <= short_retries + long_retries; x++) {
        tt += (long_retries+1)*ath_hal_computetxtime(sc->sc_ah, rt, length,
                                                rix, AH_TRUE);
        for (x = 0; x <= short_retries + long_retries; x++) {


@@ -95,11 +85,9 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
                tt += (t_slot * cw / 2);
        }
        return tt;
                tt += (t_slot * cw / 2);
        }
        return tt;

-Index: madwifi-trunk-r3314/ath_rate/sample/sample.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.h  2008-04-23 03:31:01.000000000 +0200
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.h       2008-04-23 03:31:23.000000000 +0200
-@@ -106,9 +106,6 @@
+--- a/ath_rate/sample/sample.h
++++ b/ath_rate/sample/sample.h
+@@ -106,9 +106,6 @@ struct sample_node {

  #define MAX(a,b)        ((a) > (b) ? (a) : (b))
  #endif
  
  #define MAX(a,b)        ((a) > (b) ? (a) : (b))
  #endif