[adm5120] fix support for 2.6.38 kernel

[openwrt.git] / package / madwifi / patches / 341-minrate.patch

diff --git a/package/madwifi/patches/341-minrate.patch b/package/madwifi/patches/341-minrate.patch
index 1d5628c..cc04ae0 100644 (file)
--- a/package/madwifi/patches/341-minrate.patch
+++ b/package/madwifi/patches/341-minrate.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:53.276363092 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-03-07 02:32:12.584882631 +0100
-@@ -1308,6 +1308,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -1308,6 +1308,7 @@ ath_vap_create(struct ieee80211com *ic,
        vap->iv_key_update_begin = ath_key_update_begin;
        vap->iv_key_update_end = ath_key_update_end;
        vap->iv_maxrateindex = 0;
@@ -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:53.276363092 +0100
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-03-07 02:32:12.584882631 +0100
-@@ -638,9 +638,15 @@
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
+@@ -638,9 +638,15 @@ ath_rate_ctl_reset(struct ath_softc *sc,
                        sn->rs_succ_hist        [x] = 0;
                        sn->rs_att_hist         [x] = 0;
                        sn->rs_this_tp          [x] = 0;
@@ -31,7 +27,7 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                        if (sn->rates[x].rix == 0xff) {
                                DPRINTF(sc, "%s: %s ignore bogus rix at %d\n",
                                        dev_info, __func__, x);
-@@ -649,7 +655,7 @@
+@@ -649,7 +655,7 @@ ath_rate_ctl_reset(struct ath_softc *sc,
                        sn->rates[x].rateCode = rt->info[sn->rates[x].rix].rateCode;
                        sn->rates[x].shortPreambleRateCode =
                                rt->info[sn->rates[x].rix].rateCode |
@@ -40,11 +36,9 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                }
  
                ath_fill_sample_table(sn);
-Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c  2008-03-07 02:30:53.280363321 +0100
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.c       2008-03-07 02:32:12.596883312 +0100
-@@ -842,8 +842,15 @@
+--- a/ath_rate/sample/sample.c
++++ b/ath_rate/sample/sample.c
+@@ -842,8 +842,15 @@ ath_rate_ctl_reset(struct ath_softc *sc,
                sn->num_rates = vap->iv_maxrateindex;
  
        for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
@@ -62,35 +56,29 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
                if (sn->rates[x].rix == 0xff) {
                        DPRINTF(sc, ATH_DEBUG_RATE, "%s: %s ignore bogus rix at %u\n",
                                dev_info, __func__, x);
-Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h        2008-03-07 02:30:53.284363550 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h     2008-03-07 02:32:12.600883541 +0100
-@@ -642,6 +642,7 @@
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
+@@ -642,6 +642,7 @@ enum {
        IEEE80211_PARAM_BEACON_MISS_THRESH      = 73,   /* Beacon miss threshold (in beacons) */
        IEEE80211_PARAM_BEACON_MISS_THRESH_MS   = 74,   /* Beacon miss threshold (in ms) */
        IEEE80211_PARAM_MAXRATE                 = 75,   /* Maximum rate (by table index) */
-+      IEEE80211_PARAM_MINRATE                 = 76,   /* Maximum rate (by table index) */
++      IEEE80211_PARAM_MINRATE                 = 76,   /* Minimum rate (by table index) */
  };
  
  #define       SIOCG80211STATS                 (SIOCDEVPRIVATE+2)
-Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h  2008-03-07 02:31:48.563513730 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h       2008-03-07 02:32:12.604883771 +0100
-@@ -282,6 +282,7 @@
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
+@@ -282,6 +282,7 @@ struct ieee80211vap {
        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;
-+      int iv_minrateindex;
+       u_int iv_maxrateindex;
++      u_int iv_minrateindex;
  };
  
  /* 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:53.292364006 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c  2008-03-07 02:32:12.604883771 +0100
-@@ -2845,6 +2845,12 @@
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
+@@ -2845,6 +2845,12 @@ ieee80211_ioctl_setparam(struct net_devi
                else
                        vap->iv_maxrateindex = 0;
                break;
@@ -103,7 +91,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
  #ifdef ATH_REVERSE_ENGINEERING
        case IEEE80211_PARAM_DUMPREGS:
                ieee80211_dump_registers(dev, info, w, extra);
-@@ -3183,6 +3189,9 @@
+@@ -3183,6 +3189,9 @@ ieee80211_ioctl_getparam(struct net_devi
        case IEEE80211_PARAM_MAXRATE:
                param[0] = vap->iv_maxrateindex;
                break;
@@ -113,7 +101,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
        default:
                return -EOPNOTSUPP;
        }
-@@ -5623,6 +5632,10 @@
+@@ -5623,6 +5632,10 @@ static const struct iw_priv_args ieee802
         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "maxrate"},
        {IEEE80211_PARAM_MAXRATE,
         0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_maxrate"},