package/madwifi/patches-r3776/308-minrate.patch

   1 Index: madwifi-trunk-r3776/ath/if_ath.c
   2 ===================================================================
   3 --- madwifi-trunk-r3776.orig/ath/if_ath.c       2008-07-17 02:20:53.000000000 +0200
   4 +++ madwifi-trunk-r3776/ath/if_ath.c    2008-07-17 02:23:00.000000000 +0200
   5 @@ -1300,6 +1300,7 @@
   6         vap->iv_key_update_begin = ath_key_update_begin;
   7         vap->iv_key_update_end = ath_key_update_end;
   8         vap->iv_maxrateindex = 0;
   9 +       vap->iv_minrateindex = 0;
  10         if (sc->sc_default_ieee80211_debug) {
  11                 /* User specified defaults for new VAPs were provided, so
  12                  * use those (only). */
  13 Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
  14 ===================================================================
  15 --- madwifi-trunk-r3776.orig/ath_rate/minstrel/minstrel.c       2008-07-17 02:22:33.000000000 +0200
  16 +++ madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c    2008-07-17 02:27:44.000000000 +0200
  17 @@ -652,6 +652,8 @@
  18
  19         sn->num_rates = ni->ni_rates.rs_nrates;
  20         for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
  21 +               int idx = x;
  22 +
  23                 sn->rs_rateattempts     [x] = 0;
  24                 sn->rs_thisprob         [x] = 0;
  25                 sn->rs_ratesuccess      [x] = 0;
  26 @@ -662,8 +664,12 @@
  27                 sn->rs_att_hist         [x] = 0;
  28                 sn->rs_this_tp          [x] = 0;
  29
  30 -               sn->rates[x].rate = ni->ni_rates.rs_rates[x] & IEEE80211_RATE_VAL;
  31 -               sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate];
  32 +               if (vap->iv_minrateindex && (vap->iv_minrateindex <
  33 +                               ni->ni_rates.rs_nrates))
  34 +                       idx = vap->iv_minrateindex;
  35 +
  36 +               sn->rates[x].rate = ni->ni_rates.rs_rates[idx] & IEEE80211_RATE_VAL;
  37 +               sn->rates[x].rix = sc->sc_rixmap[sn->rates[idx].rate];
  38                 if (sn->rates[x].rix == 0xff) {
  39                         DPRINTF(sc, "%s: %s ignore bogus rix at %d\n",
  40                                 dev_info, __func__, x);
  41 Index: madwifi-trunk-r3776/ath_rate/sample/sample.c
  42 ===================================================================
  43 --- madwifi-trunk-r3776.orig/ath_rate/sample/sample.c   2008-07-17 02:20:53.000000000 +0200
  44 +++ madwifi-trunk-r3776/ath_rate/sample/sample.c        2008-07-17 02:27:08.000000000 +0200
  45 @@ -845,8 +845,15 @@
  46                 sn->num_rates = vap->iv_maxrateindex;
  47
  48         for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
  49 -               sn->rates[x].rate = ni->ni_rates.rs_rates[x] & IEEE80211_RATE_VAL;
  50 -               sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate];
  51 +               int idx = x;
  52 +
  53 +               if (vap->iv_minrateindex && vap->iv_minrateindex <
  54 +                               ni->ni_rates.rs_nrates)
  55 +                       idx = vap->iv_minrateindex;
  56 +
  57 +               sn->rates[x].rate = ni->ni_rates.rs_rates[idx] & IEEE80211_RATE_VAL;
  58 +               sn->rates[x].rix = sc->sc_rixmap[sn->rates[idx].rate];
  59 +
  60                 if (sn->rates[x].rix == 0xff) {
  61                         DPRINTF(sc, ATH_DEBUG_RATE, "%s: %s ignore bogus rix at %u\n",
  62                                 dev_info, __func__, x);
  63 Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
  64 ===================================================================
  65 --- madwifi-trunk-r3776.orig/net80211/ieee80211_ioctl.h 2008-07-17 02:20:53.000000000 +0200
  66 +++ madwifi-trunk-r3776/net80211/ieee80211_ioctl.h      2008-07-17 02:25:53.000000000 +0200
  67 @@ -651,6 +651,7 @@
  68         IEEE80211_PARAM_SCANBUFS                = 81,   /* Heap analysis for TX DMA */
  69         IEEE80211_PARAM_LEAKTXBUFS              = 82,   /* Leak tx buffers */
  70         IEEE80211_PARAM_MAXRATE                 = 83,   /* Maximum rate (by table index) */
  71 +       IEEE80211_PARAM_MINRATE                 = 84,   /* Minimum rate (by table index) */
  72  };
  73
  74  #define        SIOCG80211STATS                 (SIOCDEVPRIVATE+2)
  75 Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
  76 ===================================================================
  77 --- madwifi-trunk-r3776.orig/net80211/ieee80211_var.h   2008-07-17 02:20:53.000000000 +0200
  78 +++ madwifi-trunk-r3776/net80211/ieee80211_var.h        2008-07-17 02:23:00.000000000 +0200
  79 @@ -292,6 +292,7 @@
  80         struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
  81         u_int32_t app_filter;                           /* filters which management frames are forwarded to app */
  82         int iv_maxrateindex;
  83 +       int iv_minrateindex;
  84  };
  85
  86  /* Debug functions need the defintion of struct ieee80211vap because iv_debug
  87 Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
  88 ===================================================================
  89 --- madwifi-trunk-r3776.orig/net80211/ieee80211_wireless.c      2008-07-17 02:20:53.000000000 +0200
  90 +++ madwifi-trunk-r3776/net80211/ieee80211_wireless.c   2008-07-17 02:26:17.000000000 +0200
  91 @@ -2879,6 +2879,12 @@
  92                 else
  93                         vap->iv_maxrateindex = 0;
  94                 break;
  95 +       case IEEE80211_PARAM_MINRATE:
  96 +               if (value > 0)
  97 +                       vap->iv_minrateindex = value;
  98 +               else
  99 +                       vap->iv_minrateindex = 0;
 100 +               break;
 101  #ifdef ATH_REVERSE_ENGINEERING
 102         case IEEE80211_PARAM_DUMPREGS:
 103                 ieee80211_dump_registers(dev, info, w, extra);
 104 @@ -3220,6 +3226,9 @@
 105         case IEEE80211_PARAM_MAXRATE:
 106                 param[0] = vap->iv_maxrateindex;
 107                 break;
 108 +       case IEEE80211_PARAM_MINRATE:
 109 +               param[0] = vap->iv_minrateindex;
 110 +               break;
 111         default:
 112                 return -EOPNOTSUPP;
 113         }
 114 @@ -5679,6 +5688,10 @@
 115          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "maxrate"},
 116         {IEEE80211_PARAM_MAXRATE,
 117          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_maxrate"},
 118 +       {IEEE80211_PARAM_MINRATE,
 119 +        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "minrate"},
 120 +       {IEEE80211_PARAM_MINRATE,
 121 +        0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_minrate"},
 122
 123  #ifdef ATH_REVERSE_ENGINEERING
 124         /*