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

[openwrt.git] / package / madwifi / patches / 340-maxrate.patch

diff --git a/package/madwifi/patches/340-maxrate.patch b/package/madwifi/patches/340-maxrate.patch
index ab093f7..ae93f02 100644 (file)
--- a/package/madwifi/patches/340-maxrate.patch
+++ b/package/madwifi/patches/340-maxrate.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-03-07 02:30:44.403857478 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-03-07 02:30:53.276363092 +0100
-@@ -1307,6 +1307,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -1307,6 +1307,7 @@ ath_vap_create(struct ieee80211com *ic,
        vap->iv_key_set = ath_key_set;
        vap->iv_key_update_begin = ath_key_update_begin;
        vap->iv_key_update_end = ath_key_update_end;
@@ -10,11 +8,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        if (sc->sc_default_ieee80211_debug) {
                /* User specified defaults for new VAPs were provided, so
                 * use those (only). */
-Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-03-07 02:30:44.275850185 +0100
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-03-07 02:30:53.276363092 +0100
-@@ -622,8 +622,12 @@
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
+@@ -622,8 +622,12 @@ ath_rate_ctl_reset(struct ath_softc *sc,
                        return;
                }
                sn->static_rate_ndx = -1;
@@ -28,11 +24,9 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
                        sn->rs_rateattempts     [x] = 0;
                        sn->rs_thisprob         [x] = 0;
-Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c  2008-03-07 02:30:44.055837647 +0100
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.c       2008-03-07 02:30:53.280363321 +0100
-@@ -835,7 +835,12 @@
+--- a/ath_rate/sample/sample.c
++++ b/ath_rate/sample/sample.c
+@@ -835,7 +835,12 @@ ath_rate_ctl_reset(struct ath_softc *sc,
        }
        sn->static_rate_ndx = -1;
  
@@ -46,11 +40,9 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
        for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
                sn->rates[x].rate = ni->ni_rates.rs_rates[x] & IEEE80211_RATE_VAL;
                sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate];
-Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h        2008-03-07 02:30:44.211846539 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h     2008-03-07 02:30:53.284363550 +0100
-@@ -641,6 +641,7 @@
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
+@@ -641,6 +641,7 @@ enum {
                                                           FCC requires 30m, so that is the default. */
        IEEE80211_PARAM_BEACON_MISS_THRESH      = 73,   /* Beacon miss threshold (in beacons) */
        IEEE80211_PARAM_BEACON_MISS_THRESH_MS   = 74,   /* Beacon miss threshold (in ms) */
@@ -58,23 +50,19 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
  };
  
  #define       SIOCG80211STATS                 (SIOCDEVPRIVATE+2)
-Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h  2008-03-07 02:30:44.155843346 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h       2008-03-07 02:31:48.563513730 +0100
-@@ -281,6 +281,7 @@
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
+@@ -281,6 +281,7 @@ struct ieee80211vap {
        struct ieee80211_spy iv_spy;                    /* IWSPY support */
        struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
        u_int32_t app_filter;                           /* filters which management frames are forwarded to app */
-+      int iv_maxrateindex;
++      u_int iv_maxrateindex;
  };
  
  /* Debug functions need the defintion of struct ieee80211vap because iv_debug 
-Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c     2008-03-07 02:30:44.211846539 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c  2008-03-07 02:30:53.292364006 +0100
-@@ -2839,6 +2839,12 @@
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
+@@ -2839,6 +2839,12 @@ ieee80211_ioctl_setparam(struct net_devi
                else
                        ic->ic_flags_ext &= ~IEEE80211_FEXT_MARKDFS;
                break;
@@ -87,7 +75,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
  #ifdef ATH_REVERSE_ENGINEERING
        case IEEE80211_PARAM_DUMPREGS:
                ieee80211_dump_registers(dev, info, w, extra);
-@@ -3174,6 +3180,9 @@
+@@ -3174,6 +3180,9 @@ ieee80211_ioctl_getparam(struct net_devi
                else
                        param[0] = 0;
                break;
@@ -97,7 +85,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
        default:
                return -EOPNOTSUPP;
        }
-@@ -5610,6 +5619,10 @@
+@@ -5610,6 +5619,10 @@ static const struct iw_priv_args ieee802
          0, IW_PRIV_TYPE_APPIEBUF, "getiebuf" },
        { IEEE80211_IOCTL_FILTERFRAME,
          IW_PRIV_TYPE_FILTER , 0, "setfilter" },