package/madwifi/patches/421-channel_handling.patch

   1 --- a/ath/if_ath.c
   2 +++ b/ath/if_ath.c
   3 @@ -148,7 +148,6 @@ static int ath_key_set(struct ieee80211v
   4  static void ath_key_update_begin(struct ieee80211vap *);
   5  static void ath_key_update_end(struct ieee80211vap *);
   6  static void ath_mode_init(struct net_device *);
   7 -static void ath_setslottime(struct ath_softc *);
   8  static void ath_updateslot(struct net_device *);
   9  static int ath_beaconq_setup(struct ath_softc *);
  10  static int ath_beacon_alloc(struct ath_softc *, struct ieee80211_node *);
  11 @@ -240,7 +239,7 @@ static void ath_setup_stationkey(struct
  12  static void ath_setup_stationwepkey(struct ieee80211_node *);
  13  static void ath_setup_keycacheslot(struct ath_softc *, struct ieee80211_node *);
  14  static void ath_newassoc(struct ieee80211_node *, int);
  15 -static int ath_getchannels(struct net_device *, u_int, HAL_BOOL, HAL_BOOL);
  16 +static int ath_getchannels(struct net_device *);
  17  static void ath_led_event(struct ath_softc *, int);
  18  static void ath_update_txpow(struct ath_softc *);
  19
  20 @@ -265,7 +264,6 @@ static int ath_change_mtu(struct net_dev
  21  static int ath_ioctl(struct net_device *, struct ifreq *, int);
  22
  23  static int ath_rate_setup(struct net_device *, u_int);
  24 -static void ath_setup_subrates(struct net_device *);
  25  #ifdef ATH_SUPERG_XR
  26  static int ath_xr_rate_setup(struct net_device *);
  27  static void ath_grppoll_txq_setup(struct ath_softc *, int, int);
  28 @@ -387,8 +385,6 @@ static void ath_fetch_idle_time(struct a
  29
  30  /* calibrate every 30 secs in steady state but check every second at first. */
  31  static int ath_calinterval = ATH_SHORT_CALINTERVAL;
  32 -static int ath_countrycode = CTRY_DEFAULT;     /* country code */
  33 -static int ath_outdoor = AH_FALSE;             /* enable outdoor use */
  34  static int ath_xchanmode = AH_TRUE;            /* enable extended channels */
  35  static int ath_maxvaps = ATH_MAXVAPS_DEFAULT;   /* set default maximum vaps */
  36  static int bstuck_thresh = BSTUCK_THRESH;       /* Stuck beacon count required for reset */
  37 @@ -396,9 +392,7 @@ static char *autocreate = NULL;
  38  static char *ratectl = DEF_RATE_CTL;
  39  static int rfkill = 0;
  40  static int tpc = 1;
  41 -static int countrycode = -1;
  42  static int maxvaps = -1;
  43 -static int outdoor = -1;
  44  static int xchanmode = -1;
  45  #include "ath_wprobe.c"
  46  static int beacon_cal = 1;
  47 @@ -437,9 +431,7 @@ static struct notifier_block ath_event_b
  48
  49  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
  50  MODULE_PARM(beacon_cal, "i");
  51 -MODULE_PARM(countrycode, "i");
  52  MODULE_PARM(maxvaps, "i");
  53 -MODULE_PARM(outdoor, "i");
  54  MODULE_PARM(xchanmode, "i");
  55  MODULE_PARM(rfkill, "i");
  56  #ifdef ATH_CAP_TPC
  57 @@ -451,9 +443,7 @@ MODULE_PARM(ratectl, "s");
  58  #else
  59  #include <linux/moduleparam.h>
  60  module_param(beacon_cal, int, 0600);
  61 -module_param(countrycode, int, 0600);
  62  module_param(maxvaps, int, 0600);
  63 -module_param(outdoor, int, 0600);
  64  module_param(xchanmode, int, 0600);
  65  module_param(rfkill, int, 0600);
  66  #ifdef ATH_CAP_TPC
  67 @@ -463,9 +453,7 @@ module_param(bstuck_thresh, int, 0600);
  68  module_param(autocreate, charp, 0600);
  69  module_param(ratectl, charp, 0600);
  70  #endif
  71 -MODULE_PARM_DESC(countrycode, "Override default country code");
  72  MODULE_PARM_DESC(maxvaps, "Maximum VAPs");
  73 -MODULE_PARM_DESC(outdoor, "Enable/disable outdoor use");
  74  MODULE_PARM_DESC(xchanmode, "Enable/disable extended channel mode");
  75  MODULE_PARM_DESC(rfkill, "Enable/disable RFKILL capability");
  76  #ifdef ATH_CAP_TPC
  77 @@ -531,6 +519,50 @@ MODULE_PARM_DESC(ieee80211_debug, "Load-
  78                                 (bssid)[0] |= (((id) << 2) | 0x02);     \
  79                 } while (0)
  80
  81 +static inline int ath_chan2mode(struct ieee80211_channel *c)
  82 +{
  83 +       if (IEEE80211_IS_CHAN_HALF(c))
  84 +               return ATH_MODE_HALF;
  85 +       else if (IEEE80211_IS_CHAN_QUARTER(c))
  86 +               return ATH_MODE_QUARTER;
  87 +       else
  88 +               return ieee80211_chan2mode(c);
  89 +}
  90 +
  91 +static inline int rate_hal2ieee(int dot11Rate, int f)
  92 +{
  93 +       int flag = dot11Rate & ~(IEEE80211_RATE_VAL);
  94 +       dot11Rate &= IEEE80211_RATE_VAL;
  95 +
  96 +       if (f == 4) { /* Quarter */
  97 +               if (dot11Rate == 4)
  98 +                       return 18 | flag;
  99 +       }
 100 +       return (dot11Rate * f) | flag;
 101 +}
 102 +
 103 +static inline int rate_factor(int mode)
 104 +{
 105 +       int f;
 106 +
 107 +       /*
 108 +        * NB: Fix up rates. HAL returns half or quarter dot11Rates,
 109 +        * while the stack deals with full rates only
 110 +        */
 111 +       switch(mode) {
 112 +               case ATH_MODE_HALF:
 113 +                       f = 2;
 114 +                       break;
 115 +               case ATH_MODE_QUARTER:
 116 +                       f = 4;
 117 +                       break;
 118 +               default:
 119 +                       f = 1;
 120 +                       break;
 121 +       }
 122 +       return f;
 123 +}
 124 +
 125  /* Initialize ath_softc structure */
 126
 127  int
 128 @@ -647,14 +679,6 @@ ath_attach(u_int16_t devid, struct net_d
 129         for (i = 0; i < sc->sc_keymax; i++)
 130                 ath_hal_keyreset(ah, i);
 131
 132 -       /*
 133 -        * Collect the channel list using the default country
 134 -        * code and including outdoor channels.  The 802.11 layer
 135 -        * is responsible for filtering this list based on settings
 136 -        * like the phy mode.
 137 -        */
 138 -       if (countrycode != -1)
 139 -               ath_countrycode = countrycode;
 140         if (maxvaps != -1) {
 141                 ath_maxvaps = maxvaps;
 142                 if (ath_maxvaps < ATH_MAXVAPS_MIN)
 143 @@ -662,17 +686,14 @@ ath_attach(u_int16_t devid, struct net_d
 144                 else if (ath_maxvaps > ATH_MAXVAPS_MAX)
 145                         ath_maxvaps = ATH_MAXVAPS_MAX;
 146         }
 147 -       if (outdoor != -1)
 148 -               ath_outdoor = outdoor;
 149         if (xchanmode != -1)
 150                 ath_xchanmode = xchanmode;
 151 -       error = ath_getchannels(dev, ath_countrycode,
 152 -                       ath_outdoor, ath_xchanmode);
 153 +       error = ath_getchannels(dev);
 154         if (error != 0)
 155                 goto bad;
 156
 157 -       ic->ic_country_code = ath_countrycode;
 158 -       ic->ic_country_outdoor = ath_outdoor;
 159 +       ic->ic_country_code = CTRY_DEFAULT;
 160 +       ic->ic_country_outdoor = 0;
 161
 162         IPRINTF(sc, "Switching rfkill capability %s\n",
 163                 rfkill ? "on" : "off");
 164 @@ -686,9 +707,8 @@ ath_attach(u_int16_t devid, struct net_d
 165         ath_rate_setup(dev, IEEE80211_MODE_11G);
 166         ath_rate_setup(dev, IEEE80211_MODE_TURBO_A);
 167         ath_rate_setup(dev, IEEE80211_MODE_TURBO_G);
 168 -
 169 -       /* Setup for half/quarter rates */
 170 -       ath_setup_subrates(dev);
 171 +       ath_rate_setup(dev, ATH_MODE_HALF);
 172 +       ath_rate_setup(dev, ATH_MODE_QUARTER);
 173
 174         /* NB: setup here so ath_rate_update is happy */
 175         ath_setcurmode(sc, IEEE80211_MODE_11A);
 176 @@ -908,10 +928,6 @@ ath_attach(u_int16_t devid, struct net_d
 177                         IEEE80211_ATHC_COMP : 0);
 178  #endif
 179
 180 -#ifdef ATH_SUPERG_DYNTURBO
 181 -       ic->ic_ath_cap |= (ath_hal_turboagsupported(ah, ath_countrycode) ?
 182 -                       (IEEE80211_ATHC_TURBOP | IEEE80211_ATHC_AR) : 0);
 183 -#endif
 184  #ifdef ATH_SUPERG_XR
 185         ic->ic_ath_cap |= (ath_hal_xrsupported(ah) ? IEEE80211_ATHC_XR : 0);
 186  #endif
 187 @@ -4461,17 +4477,17 @@ ath_mode_init(struct net_device *dev)
 188   * Set the slot time based on the current setting.
 189   */
 190  static void
 191 -ath_setslottime(struct ath_softc *sc)
 192 +ath_settiming(struct ath_softc *sc)
 193  {
 194 -       struct ieee80211com *ic = &sc->sc_ic;
 195         struct ath_hal *ah = sc->sc_ah;
 196 +       u_int offset = getTimingOffset(sc);
 197
 198 -       if (sc->sc_slottimeconf > 0) /* manual override */
 199 -               ath_hal_setslottime(ah, sc->sc_slottimeconf);
 200 -       else if (ic->ic_flags & IEEE80211_F_SHSLOT)
 201 -               ath_hal_setslottime(ah, HAL_SLOT_TIME_9);
 202 -       else
 203 -               ath_hal_setslottime(ah, HAL_SLOT_TIME_20);
 204 +       if (sc->sc_slottimeconf > 0)
 205 +               ath_hal_setslottime(ah, offset + sc->sc_slottimeconf);
 206 +       if (sc->sc_acktimeconf > 0)
 207 +               ath_hal_setacktimeout(ah, 2 * offset + sc->sc_acktimeconf);
 208 +       if (sc->sc_ctstimeconf > 0)
 209 +               ath_hal_setctstimeout(ah, 2 * offset + sc->sc_ctstimeconf);
 210         sc->sc_updateslot = OK;
 211  }
 212
 213 @@ -4493,7 +4509,7 @@ ath_updateslot(struct net_device *dev)
 214         if (ic->ic_opmode == IEEE80211_M_HOSTAP)
 215                 sc->sc_updateslot = UPDATE;
 216         else if (dev->flags & IFF_RUNNING)
 217 -               ath_setslottime(sc);
 218 +               ath_settiming(sc);
 219  }
 220
 221  #ifdef ATH_SUPERG_DYNTURBO
 222 @@ -5337,7 +5353,7 @@ ath_beacon_send(struct ath_softc *sc, in
 223                 sc->sc_updateslot = COMMIT;     /* commit next beacon */
 224                 sc->sc_slotupdate = slot;
 225         } else if ((sc->sc_updateslot == COMMIT) && (sc->sc_slotupdate == slot))
 226 -               ath_setslottime(sc);            /* commit change to hardware */
 227 +               ath_settiming(sc);              /* commit change to hardware */
 228
 229         if (bfaddr != 0) {
 230                 /*
 231 @@ -7790,12 +7806,14 @@ ath_get_ivlen(struct ieee80211_key *k)
 232   * Get transmit rate index using rate in Kbps
 233   */
 234  static __inline int
 235 -ath_tx_findindex(const HAL_RATE_TABLE *rt, int rate)
 236 +ath_tx_findindex(struct ath_softc *sc, const HAL_RATE_TABLE *rt, int rate)
 237  {
 238         unsigned int i, ndx = 0;
 239 +       int f;
 240
 241 +       f = rate_factor(sc->sc_curmode);
 242         for (i = 0; i < rt->rateCount; i++) {
 243 -               if (rt->info[i].rateKbps == rate) {
 244 +               if ((rt->info[i].rateKbps * f) == rate) {
 245                         ndx = i;
 246                         break;
 247                 }
 248 @@ -8088,7 +8106,7 @@ ath_tx_start(struct net_device *dev, str
 249                 atype = HAL_PKT_TYPE_NORMAL;            /* default */
 250
 251                 if (ismcast) {
 252 -                       rix = ath_tx_findindex(rt, vap->iv_mcast_rate);
 253 +                       rix = ath_tx_findindex(sc, rt, vap->iv_mcast_rate);
 254                         txrate = rt->info[rix].rateCode;
 255                         if (shortPreamble)
 256                                 txrate |= rt->info[rix].shortPreamble;
 257 @@ -9055,7 +9073,7 @@ ath_chan_change(struct ath_softc *sc, st
 258         struct net_device *dev = sc->sc_dev;
 259         enum ieee80211_phymode mode;
 260
 261 -       mode = ieee80211_chan2mode(chan);
 262 +       mode = ath_chan2mode(chan);
 263
 264         ath_rate_setup(dev, mode);
 265         ath_setcurmode(sc, mode);
 266 @@ -10104,8 +10122,7 @@ ath_newassoc(struct ieee80211_node *ni,
 267  }
 268
 269  static int
 270 -ath_getchannels(struct net_device *dev, u_int cc,
 271 -       HAL_BOOL outdoor, HAL_BOOL xchanmode)
 272 +ath_getchannels(struct net_device *dev)
 273  {
 274         struct ath_softc *sc = dev->priv;
 275         struct ieee80211com *ic = &sc->sc_ic;
 276 @@ -10119,17 +10136,31 @@ ath_getchannels(struct net_device *dev,
 277                 EPRINTF(sc, "Insufficient memory for channel table!\n");
 278                 return -ENOMEM;
 279         }
 280 +
 281 +restart:
 282         if (!ath_hal_init_channels(ah, chans, IEEE80211_CHAN_MAX, &nchan,
 283             ic->ic_regclassids, IEEE80211_REGCLASSIDS_MAX, &ic->ic_nregclass,
 284 -           cc, HAL_MODE_ALL, outdoor, xchanmode)) {
 285 +           ic->ic_country_code, HAL_MODE_ALL, ic->ic_country_outdoor, ath_xchanmode)) {
 286                 u_int32_t rd;
 287
 288                 ath_hal_getregdomain(ah, &rd);
 289                 EPRINTF(sc, "Unable to collect channel list from HAL; "
 290 -                       "regdomain likely %u country code %u\n", rd, cc);
 291 +                       "regdomain likely %u country code %u\n", rd, ic->ic_country_code);
 292 +               if ((ic->ic_country_code != CTRY_DEFAULT) ||
 293 +                       (ic->ic_country_outdoor != 0)) {
 294 +                       EPRINTF(sc, "Reverting to defaults\n");
 295 +                       ic->ic_country_code = CTRY_DEFAULT;
 296 +                       ic->ic_country_outdoor = 0;
 297 +                       goto restart;
 298 +               }
 299                 kfree(chans);
 300                 return -EINVAL;
 301         }
 302 +#ifdef ATH_SUPERG_DYNTURBO
 303 +       ic->ic_ath_cap &= ~(IEEE80211_ATHC_TURBOP | IEEE80211_ATHC_AR);
 304 +       ic->ic_ath_cap |= (ath_hal_turboagsupported(ah, ic->ic_country_code) ?
 305 +                       (IEEE80211_ATHC_TURBOP | IEEE80211_ATHC_AR) : 0);
 306 +#endif
 307         /*
 308          * Convert HAL channels to ieee80211 ones.
 309          */
 310 @@ -10373,7 +10404,7 @@ ath_xr_rate_setup(struct net_device *dev
 311         struct ieee80211com *ic = &sc->sc_ic;
 312         const HAL_RATE_TABLE *rt;
 313         struct ieee80211_rateset *rs;
 314 -       unsigned int i, maxrates;
 315 +       unsigned int i, j, maxrates;
 316         sc->sc_xr_rates = ath_hal_getratetable(ah, HAL_MODE_XR);
 317         rt = sc->sc_xr_rates;
 318         if (rt == NULL)
 319 @@ -10386,57 +10417,16 @@ ath_xr_rate_setup(struct net_device *dev
 320         } else
 321                 maxrates = rt->rateCount;
 322         rs = &ic->ic_sup_xr_rates;
 323 -       for (i = 0; i < maxrates; i++)
 324 -               rs->rs_rates[i] = rt->info[i].dot11Rate;
 325 -       rs->rs_nrates = maxrates;
 326 +       for (j = 0, i = 0; i < maxrates; i++) {
 327 +               if (!rt->info[i].valid)
 328 +                       continue;
 329 +               rs->rs_rates[j++] = rt->info[i].dot11Rate;
 330 +       }
 331 +       rs->rs_nrates = j;
 332         return 1;
 333  }
 334  #endif
 335
 336 -/* Setup half/quarter rate table support */
 337 -static void
 338 -ath_setup_subrates(struct net_device *dev)
 339 -{
 340 -       struct ath_softc *sc = dev->priv;
 341 -       struct ath_hal *ah = sc->sc_ah;
 342 -       struct ieee80211com *ic = &sc->sc_ic;
 343 -       const HAL_RATE_TABLE *rt;
 344 -       struct ieee80211_rateset *rs;
 345 -       unsigned int i, maxrates;
 346 -
 347 -       sc->sc_half_rates = ath_hal_getratetable(ah, HAL_MODE_11A_HALF_RATE);
 348 -       rt = sc->sc_half_rates;
 349 -       if (rt != NULL) {
 350 -               if (rt->rateCount > IEEE80211_RATE_MAXSIZE) {
 351 -                       DPRINTF(sc, ATH_DEBUG_ANY,
 352 -                               "The rate table is too small (%u > %u)\n",
 353 -                              rt->rateCount, IEEE80211_RATE_MAXSIZE);
 354 -                       maxrates = IEEE80211_RATE_MAXSIZE;
 355 -               } else
 356 -                       maxrates = rt->rateCount;
 357 -               rs = &ic->ic_sup_half_rates;
 358 -               for (i = 0; i < maxrates; i++)
 359 -                       rs->rs_rates[i] = rt->info[i].dot11Rate;
 360 -               rs->rs_nrates = maxrates;
 361 -       }
 362 -
 363 -       sc->sc_quarter_rates = ath_hal_getratetable(ah, HAL_MODE_11A_QUARTER_RATE);
 364 -       rt = sc->sc_quarter_rates;
 365 -       if (rt != NULL) {
 366 -               if (rt->rateCount > IEEE80211_RATE_MAXSIZE) {
 367 -                       DPRINTF(sc, ATH_DEBUG_ANY,
 368 -                               "The rate table is too small (%u > %u)\n",
 369 -                              rt->rateCount, IEEE80211_RATE_MAXSIZE);
 370 -                       maxrates = IEEE80211_RATE_MAXSIZE;
 371 -               } else
 372 -                       maxrates = rt->rateCount;
 373 -               rs = &ic->ic_sup_quarter_rates;
 374 -               for (i = 0; i < maxrates; i++)
 375 -                       rs->rs_rates[i] = rt->info[i].dot11Rate;
 376 -               rs->rs_nrates = maxrates;
 377 -       }
 378 -}
 379 -
 380  static int
 381  ath_rate_setup(struct net_device *dev, u_int mode)
 382  {
 383 @@ -10445,7 +10435,7 @@ ath_rate_setup(struct net_device *dev, u
 384         struct ieee80211com *ic = &sc->sc_ic;
 385         const HAL_RATE_TABLE *rt;
 386         struct ieee80211_rateset *rs;
 387 -       unsigned int i, maxrates;
 388 +       unsigned int i, j, maxrates, f;
 389
 390         switch (mode) {
 391         case IEEE80211_MODE_11A:
 392 @@ -10463,6 +10453,12 @@ ath_rate_setup(struct net_device *dev, u
 393         case IEEE80211_MODE_TURBO_G:
 394                 sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_108G);
 395                 break;
 396 +       case ATH_MODE_HALF:
 397 +               sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11A_HALF_RATE);
 398 +               break;
 399 +       case ATH_MODE_QUARTER:
 400 +               sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11A_QUARTER_RATE);
 401 +               break;
 402         default:
 403                 DPRINTF(sc, ATH_DEBUG_ANY, "Invalid mode %u\n", mode);
 404                 return 0;
 405 @@ -10477,10 +10473,16 @@ ath_rate_setup(struct net_device *dev, u
 406                 maxrates = IEEE80211_RATE_MAXSIZE;
 407         } else
 408                 maxrates = rt->rateCount;
 409 +
 410 +       /* NB: quarter/half rate channels hijack the 11A rateset */
 411 +       if (mode >= IEEE80211_MODE_MAX)
 412 +               return 1;
 413 +
 414         rs = &ic->ic_sup_rates[mode];
 415         for (i = 0; i < maxrates; i++)
 416                 rs->rs_rates[i] = rt->info[i].dot11Rate;
 417         rs->rs_nrates = maxrates;
 418 +
 419         return 1;
 420  }
 421
 422 @@ -10509,13 +10511,18 @@ ath_setcurmode(struct ath_softc *sc, enu
 423                 {   0, 500, 130 },
 424         };
 425         const HAL_RATE_TABLE *rt;
 426 -       unsigned int i, j;
 427 +       unsigned int i, j, f;
 428
 429 +       /*
 430 +        * NB: Fix up rixmap. HAL returns half or quarter dot11Rates,
 431 +        * while the stack deals with full rates only
 432 +        */
 433 +       f = rate_factor(mode);
 434         memset(sc->sc_rixmap, 0xff, sizeof(sc->sc_rixmap));
 435         rt = sc->sc_rates[mode];
 436         KASSERT(rt != NULL, ("no h/w rate set for phy mode %u", mode));
 437         for (i = 0; i < rt->rateCount; i++)
 438 -               sc->sc_rixmap[rt->info[i].dot11Rate & IEEE80211_RATE_VAL] = i;
 439 +               sc->sc_rixmap[rate_hal2ieee(rt->info[i].dot11Rate, f) & IEEE80211_RATE_VAL] = i;
 440         memset(sc->sc_hwmap, 0, sizeof(sc->sc_hwmap));
 441         for (i = 0; i < 32; i++) {
 442                 u_int8_t ix = rt->rateCodeToIndex[i];
 443 @@ -10525,7 +10532,7 @@ ath_setcurmode(struct ath_softc *sc, enu
 444                         continue;
 445                 }
 446                 sc->sc_hwmap[i].ieeerate =
 447 -                       rt->info[ix].dot11Rate & IEEE80211_RATE_VAL;
 448 +                       rate_hal2ieee(rt->info[ix].dot11Rate, f) & IEEE80211_RATE_VAL;
 449                 if (rt->info[ix].shortPreamble ||
 450                     rt->info[ix].phy == IEEE80211_T_OFDM)
 451                         sc->sc_hwmap[i].flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
 452 @@ -10926,9 +10933,106 @@ enum {
 453         ATH_MAXVAPS             = 26,
 454         ATH_INTMIT                      = 27,
 455         ATH_NOISE_IMMUNITY      = 28,
 456 -       ATH_OFDM_WEAK_DET       = 29
 457 +       ATH_OFDM_WEAK_DET       = 29,
 458 +       ATH_CHANBW              = 30,
 459 +       ATH_OUTDOOR             = 31,
 460  };
 461
 462 +/*
 463 + * perform the channel related sysctl, reload the channel list
 464 + * and try to stay on the current frequency
 465 + */
 466 +static int ath_sysctl_setchanparam(struct ath_softc *sc, unsigned long ctl, u_int val)
 467 +{
 468 +       struct ieee80211com *ic = &sc->sc_ic;
 469 +       struct ath_hal *ah = sc->sc_ah;
 470 +       struct ieee80211_channel *c = NULL;
 471 +       struct ieee80211vap *vap;
 472 +       u_int16_t freq = 0;
 473 +       struct ifreq ifr;
 474 +
 475 +       if (ic->ic_curchan != IEEE80211_CHAN_ANYC)
 476 +               freq = ic->ic_curchan->ic_freq;
 477 +
 478 +       switch(ctl) {
 479 +       case ATH_COUNTRYCODE:
 480 +               ic->ic_country_code = val;
 481 +               break;
 482 +       case ATH_OUTDOOR:
 483 +               ic->ic_country_outdoor = val;
 484 +               break;
 485 +       case ATH_CHANBW:
 486 +               switch(val) {
 487 +               case 0:
 488 +               case 5:
 489 +               case 10:
 490 +               case 20:
 491 +               case 40:
 492 +                       if (ath_hal_setcapability(ah, HAL_CAP_CHANBW, 1, val, NULL) == AH_TRUE) {
 493 +                               sc->sc_chanbw = val;
 494 +                               break;
 495 +                       }
 496 +               default:
 497 +                       return -EINVAL;
 498 +               }
 499 +               break;
 500 +       }
 501 +
 502 +       if (ic->ic_curchan != IEEE80211_CHAN_ANYC)
 503 +               freq = ic->ic_curchan->ic_freq;
 504 +
 505 +       /* clear out any old state */
 506 +       TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
 507 +               vap->iv_des_mode = IEEE80211_MODE_AUTO;
 508 +               vap->iv_des_chan = IEEE80211_CHAN_ANYC;
 509 +       }
 510 +       ieee80211_scan_flush(ic);
 511 +
 512 +       IEEE80211_LOCK_IRQ(ic);
 513 +       ath_getchannels(sc->sc_dev);
 514 +       ieee80211_update_channels(ic, 0);
 515 +       if (freq)
 516 +               c = ieee80211_find_channel(ic, freq, IEEE80211_MODE_AUTO);
 517 +       if (!c)
 518 +               c = &ic->ic_channels[0];
 519 +       ic->ic_curchan = c;
 520 +       ic->ic_bsschan = c;
 521 +       ic->ic_curmode = IEEE80211_MODE_AUTO;
 522 +       IEEE80211_UNLOCK_IRQ(ic);
 523 +
 524 +       if (!(sc->sc_dev->flags & IFF_RUNNING)) {
 525 +               ic->ic_bsschan = IEEE80211_CHAN_ANYC;
 526 +               return 0;
 527 +       }
 528 +
 529 +#ifndef ifr_media
 530 +#define    ifr_media       ifr_ifru.ifru_ivalue
 531 +#endif
 532 +       memset(&ifr, 0, sizeof(ifr));
 533 +       ifr.ifr_media = ic->ic_media.ifm_cur->ifm_media & ~IFM_MMASK;
 534 +       ifr.ifr_media |= IFM_MAKEMODE(IEEE80211_MODE_AUTO);
 535 +       ifmedia_ioctl(ic->ic_dev, &ifr, &ic->ic_media, SIOCSIFMEDIA);
 536 +
 537 +       /* apply the channel to the hw */
 538 +       ath_set_channel(ic);
 539 +
 540 +       TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
 541 +               struct net_device *dev = vap->iv_dev;
 542 +
 543 +               /* reactivate all active vaps */
 544 +               vap->iv_state = IEEE80211_S_SCAN;
 545 +               if ((vap->iv_opmode == IEEE80211_M_HOSTAP) ||
 546 +                       (vap->iv_opmode == IEEE80211_M_MONITOR) ||
 547 +                       (vap->iv_opmode == IEEE80211_M_WDS))
 548 +                       ieee80211_new_state(vap, IEEE80211_S_RUN, 0);
 549 +               else
 550 +                       ieee80211_new_state(vap, IEEE80211_S_INIT, -1);
 551 +       }
 552 +
 553 +       return 0;
 554 +}
 555 +
 556 +
 557  static int
 558  ath_sysctl_set_intmit(struct ath_softc *sc, long ctl, u_int val)
 559  {
 560 @@ -11007,6 +11111,7 @@ static int
 561  ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
 562  {
 563         struct ath_softc *sc = ctl->extra1;
 564 +       struct ieee80211com *ic = &sc->sc_ic;
 565         struct ath_hal *ah = sc->sc_ah;
 566         u_int val;
 567         u_int tab_3_val[3];
 568 @@ -11030,25 +11135,33 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
 569                                 lenp, ppos);
 570                 if (ret == 0) {
 571                         switch ((long)ctl->extra2) {
 572 +                       case ATH_REGDOMAIN:
 573 +                               ath_hal_setregdomain(ah, val);
 574 +                               break;
 575 +                       case ATH_COUNTRYCODE:
 576 +                       case ATH_CHANBW:
 577 +                               ret = ath_sysctl_setchanparam(sc, (long) ctl->extra2, val);
 578 +                               break;
 579                         case ATH_SLOTTIME:
 580 -                               if (val > 0) {
 581 -                                       if (!ath_hal_setslottime(ah, val))
 582 -                                               ret = -EINVAL;
 583 -                                       else
 584 -                                               sc->sc_slottimeconf = val;
 585 -                               } else {
 586 -                                       /* disable manual override */
 587 +                               if (val > 0)
 588 +                                       sc->sc_slottimeconf = val;
 589 +                               else
 590                                         sc->sc_slottimeconf = 0;
 591 -                                       ath_setslottime(sc);
 592 -                               }
 593 +                               ath_settiming(sc);
 594                                 break;
 595                         case ATH_ACKTIMEOUT:
 596 -                               if (!ath_hal_setacktimeout(ah, val))
 597 -                                       ret = -EINVAL;
 598 +                               if (val > 0)
 599 +                                       sc->sc_acktimeconf = val;
 600 +                               else
 601 +                                       sc->sc_acktimeconf = 0;
 602 +                               ath_settiming(sc);
 603                                 break;
 604                         case ATH_CTSTIMEOUT:
 605 -                               if (!ath_hal_setctstimeout(ah, val))
 606 -                                       ret = -EINVAL;
 607 +                               if (val > 0)
 608 +                                       sc->sc_ctstimeconf = val;
 609 +                               else
 610 +                                       sc->sc_ctstimeconf = 0;
 611 +                               ath_settiming(sc);
 612                                 break;
 613                         case ATH_SOFTLED:
 614                                 if (val != sc->sc_softled) {
 615 @@ -11201,6 +11314,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
 616                 }
 617         } else {
 618                 switch ((long)ctl->extra2) {
 619 +               case ATH_CHANBW:
 620 +                       val = sc->sc_chanbw ?: 20;
 621 +                       break;
 622                 case ATH_SLOTTIME:
 623                         val = ath_hal_getslottime(ah);
 624                         break;
 625 @@ -11219,6 +11335,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
 626                 case ATH_COUNTRYCODE:
 627                         ath_hal_getcountrycode(ah, &val);
 628                         break;
 629 +               case ATH_OUTDOOR:
 630 +                       val = ic->ic_country_outdoor;
 631 +                       break;
 632                 case ATH_MAXVAPS:
 633                         val = ath_maxvaps;
 634                         break;
 635 @@ -11332,11 +11451,17 @@ static const ctl_table ath_sysctl_templa
 636         },
 637         { .ctl_name     = CTL_AUTO,
 638           .procname     = "countrycode",
 639 -         .mode         = 0444,
 640 +         .mode         = 0644,
 641           .proc_handler = ath_sysctl_halparam,
 642           .extra2       = (void *)ATH_COUNTRYCODE,
 643         },
 644         { .ctl_name     = CTL_AUTO,
 645 +         .procname     = "outdoor",
 646 +         .mode         = 0644,
 647 +         .proc_handler = ath_sysctl_halparam,
 648 +         .extra2       = (void *)ATH_OUTDOOR,
 649 +       },
 650 +       { .ctl_name     = CTL_AUTO,
 651           .procname     = "maxvaps",
 652           .mode         = 0444,
 653           .proc_handler = ath_sysctl_halparam,
 654 @@ -11344,7 +11469,7 @@ static const ctl_table ath_sysctl_templa
 655         },
 656         { .ctl_name     = CTL_AUTO,
 657           .procname     = "regdomain",
 658 -         .mode         = 0444,
 659 +         .mode         = 0644,
 660           .proc_handler = ath_sysctl_halparam,
 661           .extra2       = (void *)ATH_REGDOMAIN,
 662         },
 663 @@ -11407,6 +11532,12 @@ static const ctl_table ath_sysctl_templa
 664           .extra2       = (void *)ATH_ACKRATE,
 665         },
 666         { .ctl_name     = CTL_AUTO,
 667 +         .procname     = "channelbw",
 668 +         .mode         = 0644,
 669 +         .proc_handler = ath_sysctl_halparam,
 670 +         .extra2       = (void *)ATH_CHANBW,
 671 +       },
 672 +       { .ctl_name     = CTL_AUTO,
 673           .procname     = "rp",
 674           .mode         = 0200,
 675           .proc_handler = ath_sysctl_halparam,
 676 @@ -11647,13 +11778,6 @@ static ctl_table ath_static_sysctls[] =
 677         },
 678  #endif
 679         { .ctl_name     = CTL_AUTO,
 680 -         .procname     = "countrycode",
 681 -         .mode         = 0444,
 682 -         .data         = &ath_countrycode,
 683 -         .maxlen       = sizeof(ath_countrycode),
 684 -         .proc_handler = proc_dointvec
 685 -       },
 686 -       { .ctl_name     = CTL_AUTO,
 687           .procname     = "maxvaps",
 688           .mode         = 0444,
 689           .data         = &ath_maxvaps,
 690 @@ -11661,13 +11785,6 @@ static ctl_table ath_static_sysctls[] =
 691           .proc_handler = proc_dointvec
 692         },
 693         { .ctl_name     = CTL_AUTO,
 694 -         .procname     = "outdoor",
 695 -         .mode         = 0444,
 696 -         .data         = &ath_outdoor,
 697 -         .maxlen       = sizeof(ath_outdoor),
 698 -         .proc_handler = proc_dointvec
 699 -       },
 700 -       { .ctl_name     = CTL_AUTO,
 701           .procname     = "xchanmode",
 702           .mode         = 0444,
 703           .data         = &ath_xchanmode,
 704 --- a/ath/if_athvar.h
 705 +++ b/ath/if_athvar.h
 706 @@ -688,16 +688,17 @@ struct ath_softc {
 707         int8_t sc_ofdm_weak_det; /* OFDM weak frames detection, -1 == auto */
 708
 709         /* rate tables */
 710 -       const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX];
 711 +#define ATH_MODE_HALF          (IEEE80211_MODE_MAX)
 712 +#define ATH_MODE_QUARTER       (IEEE80211_MODE_MAX + 1)
 713 +       const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX + 2];
 714         const HAL_RATE_TABLE *sc_currates;      /* current rate table */
 715         const HAL_RATE_TABLE *sc_xr_rates;      /* XR rate table */
 716 -       const HAL_RATE_TABLE *sc_half_rates;    /* half rate table */
 717 -       const HAL_RATE_TABLE *sc_quarter_rates; /* quarter rate table */
 718         HAL_OPMODE sc_opmode;                   /* current hal operating mode */
 719         enum ieee80211_phymode sc_curmode;      /* current phy mode */
 720         u_int16_t sc_curtxpow;                  /* current tx power limit */
 721         u_int16_t sc_curaid;                    /* current association id */
 722         HAL_CHANNEL sc_curchan;                 /* current h/w channel */
 723 +       u_int8_t sc_chanbw;                             /* channel bandwidth */
 724         u_int8_t sc_curbssid[IEEE80211_ADDR_LEN];
 725         u_int8_t        sc_rixmap[256];                 /* IEEE to h/w rate table ix */
 726         struct {
 727 @@ -808,6 +809,8 @@ struct ath_softc {
 728         u_int32_t sc_dturbo_bw_turbo;           /* bandwidth threshold */
 729  #endif
 730         u_int sc_slottimeconf;                  /* manual override for slottime */
 731 +       u_int sc_acktimeconf;                   /* manual override for acktime */
 732 +       u_int sc_ctstimeconf;                   /* manual override for ctstime */
 733
 734         struct timer_list sc_dfs_excl_timer;    /* mark expiration timer task */
 735         struct timer_list sc_dfs_cac_timer;     /* dfs wait timer */
 736 @@ -826,6 +829,7 @@ struct ath_softc {
 737         int sc_rp_num;
 738         int sc_rp_min;
 739         HAL_BOOL (*sc_rp_analyse)(struct ath_softc *sc);
 740 +       struct ATH_TQ_STRUCT sc_refresh_tq;
 741         struct ATH_TQ_STRUCT sc_rp_tq;
 742
 743         int sc_rp_ignored;                      /* if set, we ignored all
 744 @@ -941,6 +945,48 @@ int ar_device(int devid);
 745           DEV_NAME(_v->iv_ic->ic_dev))
 746
 747  void ath_radar_detected(struct ath_softc *sc, const char* message);
 748 +static inline u_int getTimingOffset(struct ath_softc *sc)
 749 +{
 750 +       struct ieee80211com *ic = &sc->sc_ic;
 751 +       u_int usec = 9;
 752 +       if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) {
 753 +               usec = 20;
 754 +               if (ic->ic_flags & IEEE80211_F_SHSLOT)
 755 +                       usec = 9;
 756 +       } else if (IEEE80211_IS_CHAN_A(ic->ic_curchan))
 757 +               usec = 9;
 758 +
 759 +       if (IEEE80211_IS_CHAN_TURBO(ic->ic_curchan))
 760 +               usec = 6;
 761 +
 762 +       if (IEEE80211_IS_CHAN_HALF(ic->ic_curchan))
 763 +               usec = 13;
 764 +       else if (IEEE80211_IS_CHAN_QUARTER(ic->ic_curchan))
 765 +               usec = 21;
 766 +       return usec;
 767 +}
 768 +
 769 +static inline void ath_get_timings(struct ath_softc *sc, u_int *t_slot, u_int *t_sifs, u_int *t_difs)
 770 +{
 771 +       struct ieee80211_channel *c = sc->sc_ic.ic_curchan;
 772 +
 773 +       *t_slot = getTimingOffset(sc) + sc->sc_slottimeconf;
 774 +
 775 +       if (IEEE80211_IS_CHAN_HALF(c)) {
 776 +               *t_sifs = 32;
 777 +               *t_difs = 56;
 778 +       } else if (IEEE80211_IS_CHAN_QUARTER(c)) {
 779 +               *t_sifs = 64;
 780 +               *t_difs = 112;
 781 +       } else if (IEEE80211_IS_CHAN_TURBO(c)) {
 782 +               *t_sifs = 8;
 783 +               *t_difs = 28;
 784 +       } else {
 785 +               *t_sifs = 16;
 786 +               *t_difs = 28;
 787 +       }
 788 +}
 789 +
 790
 791  struct ath_hw_detect {
 792         const char *vendor_name;
 793 --- a/tools/athctrl.c
 794 +++ b/tools/athctrl.c
 795 @@ -118,7 +118,7 @@ CMD(athctrl)(int argc, char *argv[])
 796         }
 797
 798         if (distance >= 0) {
 799 -               int slottime = 9 + (distance / 300) + ((distance % 300) ? 1 : 0);
 800 +               int slottime = (distance / 300) + ((distance % 300) ? 1 : 0);
 801                 int acktimeout = slottime * 2 + 3;
 802                 int ctstimeout = slottime * 2 + 3;
 803
 804 --- a/net80211/ieee80211.c
 805 +++ b/net80211/ieee80211.c
 806 @@ -243,34 +243,17 @@ static const  struct country_code_to_str
 807         {CTRY_ZIMBABWE,             "ZW"}
 808  };
 809
 810 -int
 811 -ieee80211_ifattach(struct ieee80211com *ic)
 812 +void ieee80211_update_channels(struct ieee80211com *ic, int init)
 813  {
 814 -       struct net_device *dev = ic->ic_dev;
 815         struct ieee80211_channel *c;
 816 +       struct ieee80211vap *vap;
 817         struct ifmediareq imr;
 818 +       int ext = 0;
 819         int i;
 820
 821 -       _MOD_INC_USE(THIS_MODULE, return -ENODEV);
 822 -
 823 -       /*
 824 -        * Pick an initial operating mode until we have a vap
 825 -        * created to lock it down correctly.  This is only
 826 -        * drivers have something defined for configuring the
 827 -        * hardware at startup.
 828 -        */
 829 -       ic->ic_opmode = IEEE80211_M_STA;        /* everyone supports this */
 830 -
 831 -       /*
 832 -        * Fill in 802.11 available channel set, mark
 833 -        * all available channels as active, and pick
 834 -        * a default channel if not already specified.
 835 -        */
 836 -       KASSERT(0 < ic->ic_nchans && ic->ic_nchans < IEEE80211_CHAN_MAX,
 837 -               ("invalid number of channels specified: %u", ic->ic_nchans));
 838         memset(ic->ic_chan_avail, 0, sizeof(ic->ic_chan_avail));
 839 -       ic->ic_modecaps |= 1 << IEEE80211_MODE_AUTO;
 840         ic->ic_max_txpower = IEEE80211_TXPOWER_MIN;
 841 +       ic->ic_modecaps = 1 << IEEE80211_MODE_AUTO;
 842
 843         for (i = 0; i < ic->ic_nchans; i++) {
 844                 c = &ic->ic_channels[i];
 845 @@ -298,6 +281,8 @@ ieee80211_ifattach(struct ieee80211com *
 846                         ic->ic_modecaps |= 1 << IEEE80211_MODE_TURBO_A;
 847                 if (IEEE80211_IS_CHAN_108G(c))
 848                         ic->ic_modecaps |= 1 << IEEE80211_MODE_TURBO_G;
 849 +               if (IEEE80211_IS_CHAN_HALF(c) || IEEE80211_IS_CHAN_QUARTER(c))
 850 +                       ext = 1;
 851         }
 852         /* Initialize candidate channels to all available */
 853         memcpy(ic->ic_chan_active, ic->ic_chan_avail,
 854 @@ -311,11 +296,58 @@ ieee80211_ifattach(struct ieee80211com *
 855          * When 11g is supported, force the rate set to
 856          * include basic rates suitable for a mixed b/g bss.
 857          */
 858 -       if (ic->ic_modecaps & (1 << IEEE80211_MODE_11G))
 859 +       if ((ic->ic_modecaps & (1 << IEEE80211_MODE_11G)) && !ext)
 860                 ieee80211_set11gbasicrates(
 861                         &ic->ic_sup_rates[IEEE80211_MODE_11G],
 862                         IEEE80211_MODE_11G);
 863
 864 +       if (init)
 865 +               return;
 866 +
 867 +       ieee80211_media_setup(ic, &ic->ic_media, ic->ic_caps, NULL, NULL);
 868 +       ieee80211com_media_status(ic->ic_dev, &imr);
 869 +       ifmedia_set(&ic->ic_media, imr.ifm_active);
 870 +
 871 +       TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
 872 +               struct ieee80211vap *avp;
 873 +               TAILQ_FOREACH(avp, &vap->iv_wdslinks, iv_wdsnext) {
 874 +                       (void) ieee80211_media_setup(ic, &vap->iv_media, vap->iv_caps, NULL, NULL);
 875 +                       ieee80211_media_status(vap->iv_dev, &imr);
 876 +                       ifmedia_set(&vap->iv_media, imr.ifm_active);
 877 +               }
 878 +               (void) ieee80211_media_setup(ic, &vap->iv_media, vap->iv_caps, NULL, NULL);
 879 +               ieee80211_media_status(vap->iv_dev, &imr);
 880 +               ifmedia_set(&vap->iv_media, imr.ifm_active);
 881 +       }
 882 +}
 883 +EXPORT_SYMBOL(ieee80211_update_channels);
 884 +
 885 +int
 886 +ieee80211_ifattach(struct ieee80211com *ic)
 887 +{
 888 +       struct net_device *dev = ic->ic_dev;
 889 +       struct ieee80211_channel *c;
 890 +       struct ifmediareq imr;
 891 +
 892 +       _MOD_INC_USE(THIS_MODULE, return -ENODEV);
 893 +
 894 +       /*
 895 +        * Pick an initial operating mode until we have a vap
 896 +        * created to lock it down correctly.  This is only
 897 +        * drivers have something defined for configuring the
 898 +        * hardware at startup.
 899 +        */
 900 +       ic->ic_opmode = IEEE80211_M_STA;        /* everyone supports this */
 901 +
 902 +       /*
 903 +        * Fill in 802.11 available channel set, mark
 904 +        * all available channels as active, and pick
 905 +        * a default channel if not already specified.
 906 +        */
 907 +       KASSERT(0 < ic->ic_nchans && ic->ic_nchans < IEEE80211_CHAN_MAX,
 908 +               ("invalid number of channels specified: %u", ic->ic_nchans));
 909 +       ieee80211_update_channels(ic, 1);
 910 +
 911         /* Setup initial channel settings */
 912         ic->ic_bsschan = IEEE80211_CHAN_ANYC;
 913         /* Arbitrarily pick the first channel */
 914 @@ -327,6 +359,7 @@ ieee80211_ifattach(struct ieee80211com *
 915         /* Enable WME by default, if we're capable. */
 916         if (ic->ic_caps & IEEE80211_C_WME)
 917                 ic->ic_flags |= IEEE80211_F_WME;
 918 +
 919         (void) ieee80211_setmode(ic, ic->ic_curmode);
 920
 921         /* Store default beacon interval, as nec. */
 922 @@ -763,7 +796,8 @@ ieee80211_media_setup(struct ieee80211co
 923         struct ieee80211_rateset allrates;
 924
 925         /* Fill in media characteristics. */
 926 -       ifmedia_init(media, 0, media_change, media_stat);
 927 +       if (media_change || media_stat)
 928 +               ifmedia_init(media, 0, media_change, media_stat);
 929         maxrate = 0;
 930         memset(&allrates, 0, sizeof(allrates));
 931
 932 @@ -793,7 +827,7 @@ ieee80211_media_setup(struct ieee80211co
 933                         ADD(media, IFM_AUTO, mopt | IFM_IEEE80211_WDS);
 934                 if (mode == IEEE80211_MODE_AUTO)
 935                         continue;
 936 -               rs = &ic->ic_sup_rates[mode];
 937 +               rs = &ic->ic_sup_rates[ieee80211_chan2ratemode(ic->ic_curchan, mode)];
 938
 939                 for (i = 0; i < rs->rs_nrates; i++) {
 940                         rate = rs->rs_rates[i];
 941 @@ -1207,7 +1241,7 @@ ieee80211_announce(struct ieee80211com *
 942                 if ((ic->ic_modecaps & (1 << mode)) == 0)
 943                         continue;
 944                 if_printf(dev, "%s rates: ", ieee80211_phymode_name[mode]);
 945 -               rs = &ic->ic_sup_rates[mode];
 946 +               rs = &ic->ic_sup_rates[ieee80211_chan2ratemode(ic->ic_curchan, mode)];
 947                 for (i = 0; i < rs->rs_nrates; i++) {
 948                         rate = rs->rs_rates[i];
 949                         mword = ieee80211_rate2media(ic, rate, mode);
 950 @@ -1417,7 +1451,7 @@ ieee80211com_media_change(struct net_dev
 951                          * now so drivers have a consistent state.
 952                          */
 953                         KASSERT(vap->iv_bss != NULL, ("no bss node"));
 954 -                       vap->iv_bss->ni_rates = ic->ic_sup_rates[newphymode];
 955 +                       vap->iv_bss->ni_rates = ic->ic_sup_rates[ieee80211_chan2ratemode(ic->ic_curchan, newphymode)];
 956                 }
 957                 error = -ENETRESET;
 958         }
 959 @@ -1435,7 +1469,7 @@ findrate(struct ieee80211com *ic, enum i
 960  {
 961  #define        IEEERATE(_ic,_m,_i) \
 962         ((_ic)->ic_sup_rates[_m].rs_rates[_i] & IEEE80211_RATE_VAL)
 963 -       int i, nrates = ic->ic_sup_rates[mode].rs_nrates;
 964 +       int i, nrates = ic->ic_sup_rates[ieee80211_chan2ratemode(ic->ic_curchan, mode)].rs_nrates;
 965         for (i = 0; i < nrates; i++)
 966                 if (IEEERATE(ic, mode, i) == rate)
 967                         return i;
 968 @@ -1877,11 +1911,6 @@ ieee80211_build_countryie(struct ieee802
 969                         if (ieee80211_chan2mode(c) != curmode_noturbo)
 970                                 continue;
 971
 972 -                       /* Skip half/quarter rate channels */
 973 -                       if (IEEE80211_IS_CHAN_HALF(c) ||
 974 -                           IEEE80211_IS_CHAN_QUARTER(c))
 975 -                               continue;
 976 -
 977                         if (*cur_runlen == 0) {
 978                                 (*cur_runlen)++;
 979                                 *cur_pow = c->ic_maxregpower;
 980 @@ -1915,7 +1944,7 @@ void
 981  ieee80211_build_sc_ie(struct ieee80211com *ic)
 982  {
 983         struct ieee80211_ie_sc *ie = &ic->ic_sc_ie;
 984 -       int i, j;
 985 +       int i, j, k;
 986         struct ieee80211_channel *c;
 987         u_int8_t prevchan;
 988
 989 --- a/net80211/ieee80211_var.h
 990 +++ b/net80211/ieee80211_var.h
 991 @@ -336,8 +336,6 @@ struct ieee80211com {
 992         u_int8_t ic_nopened;                    /* VAPs been opened */
 993         struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX];
 994         struct ieee80211_rateset ic_sup_xr_rates;
 995 -       struct ieee80211_rateset ic_sup_half_rates;
 996 -       struct ieee80211_rateset ic_sup_quarter_rates;
 997         u_int16_t ic_modecaps;                  /* set of mode capabilities */
 998         u_int16_t ic_curmode;                   /* current mode */
 999         u_int16_t ic_lintval;                   /* beacon interval */
1000 @@ -715,6 +713,7 @@ MALLOC_DECLARE(M_80211_VAP);
1001
1002  int ieee80211_ifattach(struct ieee80211com *);
1003  void ieee80211_ifdetach(struct ieee80211com *);
1004 +void ieee80211_update_channels(struct ieee80211com *ic, int);
1005  int ieee80211_vap_setup(struct ieee80211com *, struct net_device *,
1006         const char *, int, int, struct ieee80211vap *);
1007  int ieee80211_vap_attach(struct ieee80211vap *, ifm_change_cb_t, ifm_stat_cb_t);
1008 @@ -794,6 +793,23 @@ ieee80211_anyhdrspace(struct ieee80211co
1009         return size;
1010  }
1011
1012 +static __inline int
1013 +ieee80211_chan2ratemode(struct ieee80211_channel *c, int mode)
1014 +{
1015 +       if (mode == -1)
1016 +               mode = ieee80211_chan2mode(c);
1017 +
1018 +       /*
1019 +        * Use 11a rateset for half/quarter to restrict things
1020 +        * to pure OFDM
1021 +        */
1022 +       if (IEEE80211_IS_CHAN_HALF(c) ||
1023 +               IEEE80211_IS_CHAN_QUARTER(c))
1024 +               return IEEE80211_MODE_11A;
1025 +
1026 +       return mode;
1027 +}
1028 +
1029  /* Macros to print MAC address used in 802.11 headers */
1030
1031  #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
1032 --- a/net80211/ieee80211_node.c
1033 +++ b/net80211/ieee80211_node.c
1034 @@ -287,7 +287,7 @@ ieee80211_node_set_chan(struct ieee80211
1035                 ni->ni_rates = ic->ic_sup_xr_rates;
1036         else
1037  #endif
1038 -       ni->ni_rates = ic->ic_sup_rates[ieee80211_chan2mode(chan)];
1039 +       ni->ni_rates = ic->ic_sup_rates[ieee80211_chan2ratemode(chan, -1)];
1040  }
1041
1042  static __inline void
1043 @@ -387,6 +387,8 @@ ieee80211_create_ibss(struct ieee80211va
1044         ic->ic_bsschan = chan;
1045         ieee80211_node_set_chan(ic, ni);
1046         ic->ic_curmode = ieee80211_chan2mode(chan);
1047 +       ni->ni_rates = ic->ic_sup_rates[ieee80211_chan2ratemode(chan, -1)];
1048 +
1049         spin_lock_irqsave(&channel_lock, flags);
1050         ieee80211_scan_set_bss_channel(ic, ic->ic_bsschan);
1051         spin_unlock_irqrestore(&channel_lock, flags);
1052 @@ -394,14 +396,8 @@ ieee80211_create_ibss(struct ieee80211va
1053         /* Update country ie information */
1054         ieee80211_build_countryie(ic);
1055
1056 -       if (IEEE80211_IS_CHAN_HALF(chan)) {
1057 -               ni->ni_rates = ic->ic_sup_half_rates;
1058 -       } else if (IEEE80211_IS_CHAN_QUARTER(chan)) {
1059 -               ni->ni_rates = ic->ic_sup_quarter_rates;
1060 -       }
1061 -
1062 -       if ((vap->iv_flags & IEEE80211_F_PUREG) &&
1063 -               IEEE80211_IS_CHAN_ANYG(chan)) {
1064 +       if ((ieee80211_chan2ratemode(chan, -1) != IEEE80211_MODE_11A) &&
1065 +               IEEE80211_IS_CHAN_ANYG(chan) && (vap->iv_flags & IEEE80211_F_PUREG)) {
1066                 ieee80211_setpuregbasicrates(&ni->ni_rates);
1067         }
1068
1069 --- a/net80211/ieee80211_scan_sta.c
1070 +++ b/net80211/ieee80211_scan_sta.c
1071 @@ -490,12 +490,7 @@ check_rate(struct ieee80211vap *vap, con
1072
1073         okrate = badrate = fixedrate = 0;
1074
1075 -       if (IEEE80211_IS_CHAN_HALF(se->se_chan))
1076 -               srs = &ic->ic_sup_half_rates;
1077 -       else if (IEEE80211_IS_CHAN_QUARTER(se->se_chan))
1078 -               srs = &ic->ic_sup_quarter_rates;
1079 -       else
1080 -               srs = &ic->ic_sup_rates[ieee80211_chan2mode(se->se_chan)];
1081 +       srs = &ic->ic_sup_rates[ieee80211_chan2ratemode(ic->ic_curchan, -1)];
1082         nrs = se->se_rates[1];
1083         rs = se->se_rates + 2;
1084         fixedrate = IEEE80211_FIXED_RATE_NONE;
1085 --- a/net80211/ieee80211_output.c
1086 +++ b/net80211/ieee80211_output.c
1087 @@ -1676,8 +1676,8 @@ ieee80211_send_probereq(struct ieee80211
1088
1089         frm = ieee80211_add_ssid(frm, ssid, ssidlen);
1090         mode = ieee80211_chan2mode(ic->ic_curchan);
1091 -       frm = ieee80211_add_rates(frm, &ic->ic_sup_rates[mode]);
1092 -       frm = ieee80211_add_xrates(frm, &ic->ic_sup_rates[mode]);
1093 +       frm = ieee80211_add_rates(frm, &ic->ic_sup_rates[ieee80211_chan2ratemode(ic->ic_curchan, mode)]);
1094 +       frm = ieee80211_add_xrates(frm, &ic->ic_sup_rates[ieee80211_chan2ratemode(ic->ic_curchan, mode)]);
1095
1096         if (optie != NULL) {
1097                 memcpy(frm, optie, optielen);
1098 --- a/net80211/ieee80211_proto.c
1099 +++ b/net80211/ieee80211_proto.c
1100 @@ -404,7 +404,7 @@ ieee80211_fix_rate(struct ieee80211_node
1101
1102         error = 0;
1103         okrate = badrate = fixedrate = 0;
1104 -       srs = &ic->ic_sup_rates[ieee80211_chan2mode(ni->ni_chan)];
1105 +       srs = &ic->ic_sup_rates[ieee80211_chan2ratemode(ic->ic_curchan, -1)];
1106         nrs = &ni->ni_rates;
1107         fixedrate = IEEE80211_FIXED_RATE_NONE;
1108         for (i = 0; i < nrs->rs_nrates;) {
1109 @@ -1401,6 +1401,7 @@ ieee80211_new_state(struct ieee80211vap
1110         IEEE80211_VAPS_UNLOCK_IRQ(ic);
1111         return rc;
1112  }
1113 +EXPORT_SYMBOL(ieee80211_new_state);
1114
1115  static int
1116  __ieee80211_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
1117 --- a/ath_rate/minstrel/minstrel.c
1118 +++ b/ath_rate/minstrel/minstrel.c
1119 @@ -195,31 +195,7 @@ calc_usecs_unicast_packet(struct ath_sof
1120                         return 0;
1121                 }
1122
1123 -               /* XXX: Getting MAC/PHY level timings should be fixed for turbo
1124 -                * rates, and there is probably a way to get this from the
1125 -                * HAL... */
1126 -               switch (rt->info[rix].phy) {
1127 -               case IEEE80211_T_OFDM:
1128 -#if 0
1129 -                       t_slot = 9;
1130 -                       t_sifs = 16;
1131 -                       t_difs = 28;
1132 -                       /* fall through */
1133 -#endif
1134 -               case IEEE80211_T_TURBO:
1135 -                       t_slot = 9;
1136 -                       t_sifs = 8;
1137 -                       t_difs = 28;
1138 -                       break;
1139 -               case IEEE80211_T_DS:
1140 -                       /* Fall through to default */
1141 -               default:
1142 -                       /* pg. 205 ieee.802.11.pdf */
1143 -                       t_slot = 20;
1144 -                       t_difs = 50;
1145 -                       t_sifs = 10;
1146 -               }
1147 -
1148 +               ath_get_timings(sc, &t_slot, &t_sifs, &t_difs);
1149                 if ((ic->ic_flags & IEEE80211_F_USEPROT) &&
1150                 (rt->info[rix].phy == IEEE80211_T_OFDM)) {
1151                         if (ic->ic_protmode == IEEE80211_PROT_RTSCTS)
1152 --- a/ath_rate/sample/sample.c
1153 +++ b/ath_rate/sample/sample.c
1154 @@ -172,26 +172,7 @@ calc_usecs_unicast_packet(struct ath_sof
1155          * rates, and there is probably a way to get this from the
1156          * hal...
1157          */
1158 -       switch (rt->info[rix].phy) {
1159 -       case IEEE80211_T_OFDM:
1160 -               t_slot = 9;
1161 -               t_sifs = 16;
1162 -               t_difs = 28;
1163 -               /* fall through */
1164 -       case IEEE80211_T_TURBO:
1165 -               t_slot = 9;
1166 -               t_sifs = 8;
1167 -               t_difs = 28;
1168 -               break;
1169 -       case IEEE80211_T_DS:
1170 -               /* fall through to default */
1171 -       default:
1172 -               /* pg 205 ieee.802.11.pdf */
1173 -               t_slot = 20;
1174 -               t_difs = 50;
1175 -               t_sifs = 10;
1176 -       }
1177 -
1178 +       ath_get_timings(sc, &t_slot, &t_sifs, &t_difs);
1179         rts = cts = 0;
1180
1181         if ((ic->ic_flags & IEEE80211_F_USEPROT) &&
1182 --- a/net80211/ieee80211_wireless.c
1183 +++ b/net80211/ieee80211_wireless.c
1184 @@ -2133,7 +2133,7 @@ ieee80211_ioctl_setmode(struct net_devic
1185
1186                 vap->iv_des_mode = mode;
1187                 if (IS_UP_AUTO(vap))
1188 -                       ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
1189 +                       ieee80211_init(vap->iv_dev, 0);
1190
1191                 retv = 0;
1192         }
1193 @@ -4081,46 +4081,60 @@ ieee80211_ioctl_getchanlist(struct net_d
1194         return 0;
1195  }
1196
1197 +static int alreadyListed(struct ieee80211req_chaninfo *chans, u_int16_t mhz)
1198 +{
1199 +       int i;
1200 +       for (i = 0; i < chans->ic_nchans; i++) {
1201 +               if (chans->ic_chans[i].ic_freq == mhz)
1202 +                       return 1;
1203 +       }
1204 +       return 0;
1205 +}
1206 +
1207  static int
1208  ieee80211_ioctl_getchaninfo(struct net_device *dev,
1209 -       struct iw_request_info *info, void *w, char *extra)
1210 +                           struct iw_request_info *info, void *w, char *extra)
1211  {
1212         struct ieee80211vap *vap = dev->priv;
1213         struct ieee80211com *ic = vap->iv_ic;
1214 -       struct ieee80211req_chaninfo chans;
1215 +       struct ieee80211req_chaninfo *chans =
1216 +           (struct ieee80211req_chaninfo *)extra;
1217 +
1218         u_int8_t reported[IEEE80211_CHAN_BYTES];        /* XXX stack usage? */
1219         int i;
1220
1221 -       memset(&chans, 0, sizeof(chans));
1222 -       memset(&reported, 0, sizeof(reported));
1223 +       memset(chans, 0, sizeof(*chans));
1224 +       memset(reported, 0, sizeof(reported));
1225         for (i = 0; i < ic->ic_nchans; i++) {
1226                 const struct ieee80211_channel *c = &ic->ic_channels[i];
1227                 const struct ieee80211_channel *c1 = c;
1228
1229 -               if (isclr(reported, c->ic_ieee)) {
1230 +               if (!alreadyListed(chans, c->ic_freq)) {
1231                         setbit(reported, c->ic_ieee);
1232
1233 -                       /* pick turbo channel over non-turbo channel, and
1234 -                        * 11g channel over 11b channel */
1235                         if (IEEE80211_IS_CHAN_A(c))
1236 -                               c1 = findchannel(ic, c->ic_ieee, IEEE80211_MODE_TURBO_A);
1237 +                               c1 = findchannel(ic, c->ic_freq,
1238 +                                                IEEE80211_MODE_TURBO_A);
1239                         if (IEEE80211_IS_CHAN_ANYG(c))
1240 -                               c1 = findchannel(ic, c->ic_ieee, IEEE80211_MODE_TURBO_G);
1241 +                               c1 = findchannel(ic, c->ic_freq,
1242 +                                                IEEE80211_MODE_TURBO_G);
1243                         else if (IEEE80211_IS_CHAN_B(c)) {
1244 -                               c1 = findchannel(ic, c->ic_ieee, IEEE80211_MODE_TURBO_G);
1245 +                               c1 = findchannel(ic, c->ic_freq,
1246 +                                                IEEE80211_MODE_TURBO_G);
1247                                 if (!c1)
1248 -                                       c1 = findchannel(ic, c->ic_ieee, IEEE80211_MODE_11G);
1249 +                                       c1 = findchannel(ic, c->ic_freq,
1250 +                                                        IEEE80211_MODE_11G);
1251                         }
1252
1253                         if (c1)
1254                                 c = c1;
1255 -                       /* Copy the entire structure, whereas it used to just copy a few fields */
1256 -                       memcpy(&chans.ic_chans[chans.ic_nchans], c, sizeof(struct ieee80211_channel));
1257 -                       if (++chans.ic_nchans >= IEEE80211_CHAN_MAX)
1258 +                       chans->ic_chans[chans->ic_nchans].ic_ieee = c->ic_ieee;
1259 +                       chans->ic_chans[chans->ic_nchans].ic_freq = c->ic_freq;
1260 +                       chans->ic_chans[chans->ic_nchans].ic_flags = c->ic_flags;
1261 +                       if (++chans->ic_nchans >= IEEE80211_CHAN_MAX)
1262                                 break;
1263                 }
1264         }
1265 -       memcpy(extra, &chans, sizeof(struct ieee80211req_chaninfo));
1266         return 0;
1267  }
1268
1269 --- a/net80211/ieee80211_scan_ap.c
1270 +++ b/net80211/ieee80211_scan_ap.c
1271 @@ -512,12 +512,13 @@ pick_channel(struct ieee80211_scan_state
1272         int ss_last = ss->ss_last;
1273         struct ieee80211_channel *best;
1274         struct ap_state *as = ss->ss_priv;
1275 -       struct channel chans[ss_last]; /* actually ss_last-1 is required */
1276 +       struct channel *chans; /* actually ss_last-1 is required */
1277         struct channel *c = NULL;
1278         struct pc_params params = { vap, ss, flags };
1279         int benefit = 0;
1280         int sta_assoc = 0;
1281
1282 +       chans = (struct channel *)kmalloc(ss_last*sizeof(struct channel),GFP_ATOMIC);
1283         for (i = 0; i < ss_last; i++) {
1284                 chans[i].chan = ss->ss_chans[i];
1285                 chans[i].orig = i;
1286 @@ -601,6 +602,7 @@ pick_channel(struct ieee80211_scan_state
1287                                 "%s: best: channel %u rssi %d\n",
1288                                 __func__, i, as->as_maxrssi[i]);
1289         }
1290 +       kfree(chans);
1291         return best;
1292  }
1293
1294 @@ -636,6 +638,7 @@ ap_end(struct ieee80211_scan_state *ss,
1295                 res = 1; /* Do NOT restart scan */
1296         } else {
1297                 struct ieee80211_scan_entry se;
1298 +               int i;
1299                 /* XXX: notify all VAPs? */
1300                 /* if this is a dynamic turbo frequency , start with normal
1301                  * mode first */
1302 @@ -650,6 +653,11 @@ ap_end(struct ieee80211_scan_state *ss,
1303                                 return 0;
1304                         }
1305                 }
1306 +               for (i = (bestchan - &ic->ic_channels[0])/sizeof(*bestchan) + 1; i < ic->ic_nchans; i++) {
1307 +                       if ((ic->ic_channels[i].ic_freq == bestchan->ic_freq) &&
1308 +                               IEEE80211_IS_CHAN_ANYG(&ic->ic_channels[i]))
1309 +                               bestchan = &ic->ic_channels[i];
1310 +               }
1311                 memset(&se, 0, sizeof(se));
1312                 se.se_chan = bestchan;
1313
1314 --- a/tools/wlanconfig.c
1315 +++ b/tools/wlanconfig.c
1316 @@ -737,7 +737,7 @@ list_channels(const char *ifname, int al
1317         if (get80211priv(ifname, IEEE80211_IOCTL_GETCHANINFO, &chans, sizeof(chans)) < 0)
1318                 errx(1, "unable to get channel information");
1319         if (!allchans) {
1320 -               uint8_t active[32];
1321 +               uint8_t active[IEEE80211_CHAN_BYTES];
1322
1323                 if (get80211priv(ifname, IEEE80211_IOCTL_GETCHANLIST, &active, sizeof(active)) < 0)
1324                         errx(1, "unable to get active channel list");
1325 --- a/net80211/ieee80211_scan.c
1326 +++ b/net80211/ieee80211_scan.c
1327 @@ -1044,6 +1044,7 @@ ieee80211_scan_assoc_fail(struct ieee802
1328                 ss->ss_ops->scan_assoc_fail(ss, mac, reason);
1329         }
1330  }
1331 +EXPORT_SYMBOL(ieee80211_scan_flush);
1332
1333  /*
1334   * Iterate over the contents of the scan cache.
1335 --- a/ath/if_ath_hal_wrappers.h
1336 +++ b/ath/if_ath_hal_wrappers.h
1337 @@ -111,6 +111,11 @@ static inline HAL_BOOL ath_hal_getregdom
1338         return (ath_hal_getcapability(ah, HAL_CAP_REG_DMN, 0, destination) == HAL_OK);
1339  }
1340
1341 +static inline HAL_BOOL ath_hal_setregdomain(struct ath_hal *ah, u_int32_t v)
1342 +{
1343 +       return (ath_hal_setcapability(ah, HAL_CAP_REG_DMN, 0, v, NULL));
1344 +}
1345 +
1346  static inline HAL_BOOL ath_hal_gettkipmic(struct ath_hal *ah)
1347  {
1348         return (ath_hal_getcapability(ah, HAL_CAP_TKIP_MIC, 1, NULL) == HAL_OK);