package/mac80211/patches/300-pending_work.patch

   1 --- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
   2 +++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
   3 @@ -203,7 +203,7 @@ static void ar9002_hw_iqcalibrate(struct
   4                         i);
   5
   6                 ath_dbg(common, ATH_DBG_CALIBRATE,
   7 -                       "Orignal: Chn %diq_corr_meas = 0x%08x\n",
   8 +                       "Original: Chn %d iq_corr_meas = 0x%08x\n",
   9                         i, ah->totalIqCorrMeas[i]);
  10
  11                 iqCorrNeg = 0;
  12 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
  13 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
  14 @@ -226,7 +226,7 @@ static void ar9003_hw_iqcalibrate(struct
  15                         i);
  16
  17                 ath_dbg(common, ATH_DBG_CALIBRATE,
  18 -                       "Orignal: Chn %diq_corr_meas = 0x%08x\n",
  19 +                       "Original: Chn %d iq_corr_meas = 0x%08x\n",
  20                         i, ah->totalIqCorrMeas[i]);
  21
  22                 iqCorrNeg = 0;
  23 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
  24 +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
  25 @@ -808,7 +808,8 @@ void ath9k_htc_ani_work(struct work_stru
  26         }
  27
  28         /* Verify whether we must check ANI */
  29 -       if ((timestamp - common->ani.checkani_timer) >= ATH_ANI_POLLINTERVAL) {
  30 +       if (ah->config.enable_ani &&
  31 +           (timestamp - common->ani.checkani_timer) >= ATH_ANI_POLLINTERVAL) {
  32                 aniflag = true;
  33                 common->ani.checkani_timer = timestamp;
  34         }
  35 --- a/drivers/net/wireless/ath/ath9k/hw.c
  36 +++ b/drivers/net/wireless/ath/ath9k/hw.c
  37 @@ -504,7 +504,7 @@ static int ath9k_hw_post_init(struct ath
  38                 return ecode;
  39         }
  40
  41 -       if (!AR_SREV_9100(ah) && !AR_SREV_9340(ah)) {
  42 +       if (ah->config.enable_ani) {
  43                 ath9k_hw_ani_setup(ah);
  44                 ath9k_hw_ani_init(ah);
  45         }
  46 @@ -610,6 +610,10 @@ static int __ath9k_hw_init(struct ath_hw
  47         if (!AR_SREV_9300_20_OR_LATER(ah))
  48                 ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
  49
  50 +       /* disable ANI for 9340 */
  51 +       if (AR_SREV_9340(ah))
  52 +               ah->config.enable_ani = false;
  53 +
  54         ath9k_hw_init_mode_regs(ah);
  55
  56         if (!ah->is_pciexpress)
  57 --- a/drivers/net/wireless/ath/ath9k/main.c
  58 +++ b/drivers/net/wireless/ath/ath9k/main.c
  59 @@ -118,7 +118,7 @@ void ath9k_ps_restore(struct ath_softc *
  60         if (--sc->ps_usecount != 0)
  61                 goto unlock;
  62
  63 -       if (sc->ps_idle)
  64 +       if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK))
  65                 mode = ATH9K_PM_FULL_SLEEP;
  66         else if (sc->ps_enabled &&
  67                  !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
  68 @@ -286,7 +286,7 @@ static bool ath_complete_reset(struct at
  69                         ath_start_ani(common);
  70         }
  71
  72 -       if (ath9k_hw_ops(ah)->antdiv_comb_conf_get && sc->ant_rx != 3) {
  73 +       if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) {
  74                 struct ath_hw_antcomb_conf div_ant_conf;
  75                 u8 lna_conf;
  76
  77 @@ -332,7 +332,8 @@ static int ath_reset_internal(struct ath
  78                 hchan = ah->curchan;
  79         }
  80
  81 -       if (fastcc && !ath9k_hw_check_alive(ah))
  82 +       if (fastcc && (ah->chip_fullsleep ||
  83 +           !ath9k_hw_check_alive(ah)))
  84                 fastcc = false;
  85
  86         if (!ath_prepare_reset(sc, retry_tx, flush))
  87 @@ -561,7 +562,6 @@ void ath_ani_calibrate(unsigned long dat
  88         /* Long calibration runs independently of short calibration. */
  89         if ((timestamp - common->ani.longcal_timer) >= long_cal_interval) {
  90                 longcal = true;
  91 -               ath_dbg(common, ATH_DBG_ANI, "longcal @%lu\n", jiffies);
  92                 common->ani.longcal_timer = timestamp;
  93         }
  94
  95 @@ -569,8 +569,6 @@ void ath_ani_calibrate(unsigned long dat
  96         if (!common->ani.caldone) {
  97                 if ((timestamp - common->ani.shortcal_timer) >= short_cal_interval) {
  98                         shortcal = true;
  99 -                       ath_dbg(common, ATH_DBG_ANI,
 100 -                               "shortcal @%lu\n", jiffies);
 101                         common->ani.shortcal_timer = timestamp;
 102                         common->ani.resetcal_timer = timestamp;
 103                 }
 104 @@ -584,8 +582,9 @@ void ath_ani_calibrate(unsigned long dat
 105         }
 106
 107         /* Verify whether we must check ANI */
 108 -       if ((timestamp - common->ani.checkani_timer) >=
 109 -            ah->config.ani_poll_interval) {
 110 +       if (sc->sc_ah->config.enable_ani
 111 +           && (timestamp - common->ani.checkani_timer) >=
 112 +           ah->config.ani_poll_interval) {
 113                 aniflag = true;
 114                 common->ani.checkani_timer = timestamp;
 115         }
 116 @@ -605,6 +604,11 @@ void ath_ani_calibrate(unsigned long dat
 117                                                 ah->rxchainmask, longcal);
 118         }
 119
 120 +       ath_dbg(common, ATH_DBG_ANI,
 121 +               "Calibration @%lu finished: %s %s %s, caldone: %s\n", jiffies,
 122 +               longcal ? "long" : "", shortcal ? "short" : "",
 123 +               aniflag ? "ani" : "", common->ani.caldone ? "true" : "false");
 124 +
 125         ath9k_ps_restore(sc);
 126
 127  set_timer:
 128 @@ -886,82 +890,6 @@ chip_reset:
 129  #undef SCHED_INTR
 130  }
 131
 132 -static void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw)
 133 -{
 134 -       struct ath_hw *ah = sc->sc_ah;
 135 -       struct ath_common *common = ath9k_hw_common(ah);
 136 -       struct ieee80211_channel *channel = hw->conf.channel;
 137 -       int r;
 138 -
 139 -       ath9k_ps_wakeup(sc);
 140 -       spin_lock_bh(&sc->sc_pcu_lock);
 141 -       atomic_set(&ah->intr_ref_cnt, -1);
 142 -
 143 -       ath9k_hw_configpcipowersave(ah, false);
 144 -
 145 -       if (!ah->curchan)
 146 -               ah->curchan = ath9k_cmn_get_curchannel(sc->hw, ah);
 147 -
 148 -       r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
 149 -       if (r) {
 150 -               ath_err(common,
 151 -                       "Unable to reset channel (%u MHz), reset status %d\n",
 152 -                       channel->center_freq, r);
 153 -       }
 154 -
 155 -       ath_complete_reset(sc, true);
 156 -
 157 -       /* Enable LED */
 158 -       ath9k_hw_cfg_output(ah, ah->led_pin,
 159 -                           AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
 160 -       ath9k_hw_set_gpio(ah, ah->led_pin, 0);
 161 -
 162 -       spin_unlock_bh(&sc->sc_pcu_lock);
 163 -
 164 -       ath9k_ps_restore(sc);
 165 -}
 166 -
 167 -void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw)
 168 -{
 169 -       struct ath_hw *ah = sc->sc_ah;
 170 -       struct ieee80211_channel *channel = hw->conf.channel;
 171 -       int r;
 172 -
 173 -       ath9k_ps_wakeup(sc);
 174 -
 175 -       ath_cancel_work(sc);
 176 -
 177 -       spin_lock_bh(&sc->sc_pcu_lock);
 178 -
 179 -       /*
 180 -        * Keep the LED on when the radio is disabled
 181 -        * during idle unassociated state.
 182 -        */
 183 -       if (!sc->ps_idle) {
 184 -               ath9k_hw_set_gpio(ah, ah->led_pin, 1);
 185 -               ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
 186 -       }
 187 -
 188 -       ath_prepare_reset(sc, false, true);
 189 -
 190 -       if (!ah->curchan)
 191 -               ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
 192 -
 193 -       r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
 194 -       if (r) {
 195 -               ath_err(ath9k_hw_common(sc->sc_ah),
 196 -                       "Unable to reset channel (%u MHz), reset status %d\n",
 197 -                       channel->center_freq, r);
 198 -       }
 199 -
 200 -       ath9k_hw_phy_disable(ah);
 201 -
 202 -       ath9k_hw_configpcipowersave(ah, true);
 203 -
 204 -       spin_unlock_bh(&sc->sc_pcu_lock);
 205 -       ath9k_ps_restore(sc);
 206 -}
 207 -
 208  static int ath_reset(struct ath_softc *sc, bool retry_tx)
 209  {
 210         int r;
 211 @@ -1097,6 +1025,9 @@ static int ath9k_start(struct ieee80211_
 212          * and then setup of the interrupt mask.
 213          */
 214         spin_lock_bh(&sc->sc_pcu_lock);
 215 +
 216 +       atomic_set(&ah->intr_ref_cnt, -1);
 217 +
 218         r = ath9k_hw_reset(ah, init_channel, ah->caldata, false);
 219         if (r) {
 220                 ath_err(common,
 221 @@ -1138,6 +1069,18 @@ static int ath9k_start(struct ieee80211_
 222                 goto mutex_unlock;
 223         }
 224
 225 +       if (ah->led_pin >= 0) {
 226 +               ath9k_hw_cfg_output(ah, ah->led_pin,
 227 +                                   AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
 228 +               ath9k_hw_set_gpio(ah, ah->led_pin, 0);
 229 +       }
 230 +
 231 +       /*
 232 +        * Reset key cache to sane defaults (all entries cleared) instead of
 233 +        * semi-random values after suspend/resume.
 234 +        */
 235 +       ath9k_cmn_init_crypto(sc->sc_ah);
 236 +
 237         spin_unlock_bh(&sc->sc_pcu_lock);
 238
 239         if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) &&
 240 @@ -1183,6 +1126,13 @@ static void ath9k_tx(struct ieee80211_hw
 241                 }
 242         }
 243
 244 +       /*
 245 +        * Cannot tx while the hardware is in full sleep, it first needs a full
 246 +        * chip reset to recover from that
 247 +        */
 248 +       if (unlikely(sc->sc_ah->power_mode == ATH9K_PM_FULL_SLEEP))
 249 +               goto exit;
 250 +
 251         if (unlikely(sc->sc_ah->power_mode != ATH9K_PM_AWAKE)) {
 252                 /*
 253                  * We are using PS-Poll and mac80211 can request TX while in
 254 @@ -1229,6 +1179,7 @@ static void ath9k_stop(struct ieee80211_
 255         struct ath_softc *sc = hw->priv;
 256         struct ath_hw *ah = sc->sc_ah;
 257         struct ath_common *common = ath9k_hw_common(ah);
 258 +       bool prev_idle;
 259
 260         mutex_lock(&sc->mutex);
 261
 262 @@ -1259,35 +1210,45 @@ static void ath9k_stop(struct ieee80211_
 263          * before setting the invalid flag. */
 264         ath9k_hw_disable_interrupts(ah);
 265
 266 -       if (!(sc->sc_flags & SC_OP_INVALID)) {
 267 -               ath_drain_all_txq(sc, false);
 268 -               ath_stoprecv(sc);
 269 -               ath9k_hw_phy_disable(ah);
 270 -       } else
 271 -               sc->rx.rxlink = NULL;
 272 +       spin_unlock_bh(&sc->sc_pcu_lock);
 273 +
 274 +       /* we can now sync irq and kill any running tasklets, since we already
 275 +        * disabled interrupts and not holding a spin lock */
 276 +       synchronize_irq(sc->irq);
 277 +       tasklet_kill(&sc->intr_tq);
 278 +       tasklet_kill(&sc->bcon_tasklet);
 279 +
 280 +       prev_idle = sc->ps_idle;
 281 +       sc->ps_idle = true;
 282 +
 283 +       spin_lock_bh(&sc->sc_pcu_lock);
 284 +
 285 +       if (ah->led_pin >= 0) {
 286 +               ath9k_hw_set_gpio(ah, ah->led_pin, 1);
 287 +               ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
 288 +       }
 289 +
 290 +       ath_prepare_reset(sc, false, true);
 291
 292         if (sc->rx.frag) {
 293                 dev_kfree_skb_any(sc->rx.frag);
 294                 sc->rx.frag = NULL;
 295         }
 296
 297 -       /* disable HAL and put h/w to sleep */
 298 -       ath9k_hw_disable(ah);
 299 +       if (!ah->curchan)
 300 +               ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
 301
 302 -       spin_unlock_bh(&sc->sc_pcu_lock);
 303 +       ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
 304 +       ath9k_hw_phy_disable(ah);
 305
 306 -       /* we can now sync irq and kill any running tasklets, since we already
 307 -        * disabled interrupts and not holding a spin lock */
 308 -       synchronize_irq(sc->irq);
 309 -       tasklet_kill(&sc->intr_tq);
 310 -       tasklet_kill(&sc->bcon_tasklet);
 311 +       ath9k_hw_configpcipowersave(ah, true);
 312
 313 -       ath9k_ps_restore(sc);
 314 +       spin_unlock_bh(&sc->sc_pcu_lock);
 315
 316 -       sc->ps_idle = true;
 317 -       ath_radio_disable(sc, hw);
 318 +       ath9k_ps_restore(sc);
 319
 320         sc->sc_flags |= SC_OP_INVALID;
 321 +       sc->ps_idle = prev_idle;
 322
 323         mutex_unlock(&sc->mutex);
 324
 325 @@ -1627,8 +1588,8 @@ static int ath9k_config(struct ieee80211
 326         struct ath_hw *ah = sc->sc_ah;
 327         struct ath_common *common = ath9k_hw_common(ah);
 328         struct ieee80211_conf *conf = &hw->conf;
 329 -       bool disable_radio = false;
 330
 331 +       ath9k_ps_wakeup(sc);
 332         mutex_lock(&sc->mutex);
 333
 334         /*
 335 @@ -1639,13 +1600,8 @@ static int ath9k_config(struct ieee80211
 336          */
 337         if (changed & IEEE80211_CONF_CHANGE_IDLE) {
 338                 sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);
 339 -               if (!sc->ps_idle) {
 340 -                       ath_radio_enable(sc, hw);
 341 -                       ath_dbg(common, ATH_DBG_CONFIG,
 342 -                               "not-idle: enabling radio\n");
 343 -               } else {
 344 -                       disable_radio = true;
 345 -               }
 346 +               if (sc->ps_idle)
 347 +                       ath_cancel_work(sc);
 348         }
 349
 350         /*
 351 @@ -1752,18 +1708,12 @@ static int ath9k_config(struct ieee80211
 352                 ath_dbg(common, ATH_DBG_CONFIG,
 353                         "Set power: %d\n", conf->power_level);
 354                 sc->config.txpowlimit = 2 * conf->power_level;
 355 -               ath9k_ps_wakeup(sc);
 356                 ath9k_cmn_update_txpow(ah, sc->curtxpow,
 357                                        sc->config.txpowlimit, &sc->curtxpow);
 358 -               ath9k_ps_restore(sc);
 359 -       }
 360 -
 361 -       if (disable_radio) {
 362 -               ath_dbg(common, ATH_DBG_CONFIG, "idle: disabling radio\n");
 363 -               ath_radio_disable(sc, hw);
 364         }
 365
 366         mutex_unlock(&sc->mutex);
 367 +       ath9k_ps_restore(sc);
 368
 369         return 0;
 370  }
 371 @@ -2331,9 +2281,6 @@ static void ath9k_flush(struct ieee80211
 372                 return;
 373         }
 374
 375 -       if (drop)
 376 -               timeout = 1;
 377 -
 378         for (j = 0; j < timeout; j++) {
 379                 bool npend = false;
 380
 381 @@ -2351,21 +2298,22 @@ static void ath9k_flush(struct ieee80211
 382                 }
 383
 384                 if (!npend)
 385 -                   goto out;
 386 +                   break;
 387         }
 388
 389 -       ath9k_ps_wakeup(sc);
 390 -       spin_lock_bh(&sc->sc_pcu_lock);
 391 -       drain_txq = ath_drain_all_txq(sc, false);
 392 -       spin_unlock_bh(&sc->sc_pcu_lock);
 393 +       if (drop) {
 394 +               ath9k_ps_wakeup(sc);
 395 +               spin_lock_bh(&sc->sc_pcu_lock);
 396 +               drain_txq = ath_drain_all_txq(sc, false);
 397 +               spin_unlock_bh(&sc->sc_pcu_lock);
 398
 399 -       if (!drain_txq)
 400 -               ath_reset(sc, false);
 401 +               if (!drain_txq)
 402 +                       ath_reset(sc, false);
 403
 404 -       ath9k_ps_restore(sc);
 405 -       ieee80211_wake_queues(hw);
 406 +               ath9k_ps_restore(sc);
 407 +               ieee80211_wake_queues(hw);
 408 +       }
 409
 410 -out:
 411         ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);
 412         mutex_unlock(&sc->mutex);
 413  }
 414 --- a/drivers/net/wireless/ath/ath9k/pci.c
 415 +++ b/drivers/net/wireless/ath/ath9k/pci.c
 416 @@ -307,12 +307,11 @@ static int ath_pci_suspend(struct device
 417         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
 418         struct ath_softc *sc = hw->priv;
 419
 420 -       ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);
 421 -
 422         /* The device has to be moved to FULLSLEEP forcibly.
 423          * Otherwise the chip never moved to full sleep,
 424          * when no interface is up.
 425          */
 426 +       ath9k_hw_disable(sc->sc_ah);
 427         ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP);
 428
 429         return 0;
 430 @@ -334,22 +333,6 @@ static int ath_pci_resume(struct device
 431         if ((val & 0x0000ff00) != 0)
 432                 pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 433
 434 -       ath9k_ps_wakeup(sc);
 435 -       /* Enable LED */
 436 -       ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
 437 -                           AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
 438 -       ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 0);
 439 -
 440 -         /*
 441 -          * Reset key cache to sane defaults (all entries cleared) instead of
 442 -          * semi-random values after suspend/resume.
 443 -          */
 444 -       ath9k_cmn_init_crypto(sc->sc_ah);
 445 -       ath9k_ps_restore(sc);
 446 -
 447 -       sc->ps_idle = true;
 448 -       ath_radio_disable(sc, hw);
 449 -
 450         return 0;
 451  }
 452
 453 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 454 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
 455 @@ -1954,7 +1954,7 @@ static void ath_tx_complete(struct ath_s
 456                 skb_pull(skb, padsize);
 457         }
 458
 459 -       if (sc->ps_flags & PS_WAIT_FOR_TX_ACK) {
 460 +       if ((sc->ps_flags & PS_WAIT_FOR_TX_ACK) && !txq->axq_depth) {
 461                 sc->ps_flags &= ~PS_WAIT_FOR_TX_ACK;
 462                 ath_dbg(common, ATH_DBG_PS,
 463                         "Going back to sleep after having received TX status (0x%lx)\n",
 464 --- a/include/linux/nl80211.h
 465 +++ b/include/linux/nl80211.h
 466 @@ -2785,9 +2785,11 @@ enum nl80211_ap_sme_features {
 467   * @NL80211_FEATURE_SK_TX_STATUS: This driver supports reflecting back
 468   *     TX status to the socket error queue when requested with the
 469   *     socket option.
 470 + * @NL80211_FEATURE_HT_IBSS: This driver supports IBSS with HT datarates.
 471   */
 472  enum nl80211_feature_flags {
 473         NL80211_FEATURE_SK_TX_STATUS    = 1 << 0,
 474 +       NL80211_FEATURE_HT_IBSS         = 1 << 1,
 475  };
 476
 477  /**
 478 --- a/include/net/cfg80211.h
 479 +++ b/include/net/cfg80211.h
 480 @@ -1149,6 +1149,7 @@ struct cfg80211_ibss_params {
 481         u8 *ssid;
 482         u8 *bssid;
 483         struct ieee80211_channel *channel;
 484 +       enum nl80211_channel_type channel_type;
 485         u8 *ie;
 486         u8 ssid_len, ie_len;
 487         u16 beacon_interval;
 488 @@ -3270,6 +3271,16 @@ void cfg80211_report_obss_beacon(struct
 489                                  const u8 *frame, size_t len,
 490                                  int freq, gfp_t gfp);
 491
 492 +/*
 493 + * cfg80211_can_beacon_sec_chan - test if ht40 on extension channel can be used
 494 + * @wiphy: the wiphy
 495 + * @chan: main channel
 496 + * @channel_type: HT mode
 497 + */
 498 +int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
 499 +                                struct ieee80211_channel *chan,
 500 +                                enum nl80211_channel_type channel_type);
 501 +
 502  /* Logging, debugging and troubleshooting/diagnostic helpers. */
 503
 504  /* wiphy_printk helpers, similar to dev_printk */
 505 --- a/net/mac80211/agg-rx.c
 506 +++ b/net/mac80211/agg-rx.c
 507 @@ -185,6 +185,10 @@ static void ieee80211_send_addba_resp(st
 508                 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
 509         else if (sdata->vif.type == NL80211_IFTYPE_STATION)
 510                 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
 511 +       else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
 512 +               memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
 513 +       else if (sdata->vif.type == NL80211_IFTYPE_WDS)
 514 +               memcpy(mgmt->bssid, da, ETH_ALEN);
 515
 516         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
 517                                           IEEE80211_STYPE_ACTION);
 518 --- a/net/mac80211/agg-tx.c
 519 +++ b/net/mac80211/agg-tx.c
 520 @@ -55,6 +55,8 @@
 521   * @ampdu_action function will be called with the action
 522   * %IEEE80211_AMPDU_TX_STOP. In this case, the call must not fail,
 523   * and the driver must later call ieee80211_stop_tx_ba_cb_irqsafe().
 524 + * Note that the sta can get destroyed before the BA tear down is
 525 + * complete.
 526   */
 527
 528  static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,
 529 @@ -79,10 +81,13 @@ static void ieee80211_send_addba_request
 530         memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
 531         if (sdata->vif.type == NL80211_IFTYPE_AP ||
 532             sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
 533 -           sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
 534 +           sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
 535 +           sdata->vif.type == NL80211_IFTYPE_WDS)
 536                 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
 537         else if (sdata->vif.type == NL80211_IFTYPE_STATION)
 538                 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
 539 +       else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
 540 +               memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
 541
 542         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
 543                                           IEEE80211_STYPE_ACTION);
 544 @@ -319,6 +324,38 @@ ieee80211_wake_queue_agg(struct ieee8021
 545         __release(agg_queue);
 546  }
 547
 548 +/*
 549 + * splice packets from the STA's pending to the local pending,
 550 + * requires a call to ieee80211_agg_splice_finish later
 551 + */
 552 +static void __acquires(agg_queue)
 553 +ieee80211_agg_splice_packets(struct ieee80211_local *local,
 554 +                            struct tid_ampdu_tx *tid_tx, u16 tid)
 555 +{
 556 +       int queue = ieee80211_ac_from_tid(tid);
 557 +       unsigned long flags;
 558 +
 559 +       ieee80211_stop_queue_agg(local, tid);
 560 +
 561 +       if (WARN(!tid_tx, "TID %d gone but expected when splicing aggregates"
 562 +                         " from the pending queue\n", tid))
 563 +               return;
 564 +
 565 +       if (!skb_queue_empty(&tid_tx->pending)) {
 566 +               spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
 567 +               /* copy over remaining packets */
 568 +               skb_queue_splice_tail_init(&tid_tx->pending,
 569 +                                          &local->pending[queue]);
 570 +               spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
 571 +       }
 572 +}
 573 +
 574 +static void __releases(agg_queue)
 575 +ieee80211_agg_splice_finish(struct ieee80211_local *local, u16 tid)
 576 +{
 577 +       ieee80211_wake_queue_agg(local, tid);
 578 +}
 579 +
 580  void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
 581  {
 582         struct tid_ampdu_tx *tid_tx;
 583 @@ -330,19 +367,17 @@ void ieee80211_tx_ba_session_handle_star
 584         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 585
 586         /*
 587 -        * While we're asking the driver about the aggregation,
 588 -        * stop the AC queue so that we don't have to worry
 589 -        * about frames that came in while we were doing that,
 590 -        * which would require us to put them to the AC pending
 591 -        * afterwards which just makes the code more complex.
 592 +        * Start queuing up packets for this aggregation session.
 593 +        * We're going to release them once the driver is OK with
 594 +        * that.
 595          */
 596 -       ieee80211_stop_queue_agg(local, tid);
 597 -
 598         clear_bit(HT_AGG_STATE_WANT_START, &tid_tx->state);
 599
 600         /*
 601 -        * make sure no packets are being processed to get
 602 -        * valid starting sequence number
 603 +        * Make sure no packets are being processed. This ensures that
 604 +        * we have a valid starting sequence number and that in-flight
 605 +        * packets have been flushed out and no packets for this TID
 606 +        * will go into the driver during the ampdu_action call.
 607          */
 608         synchronize_net();
 609
 610 @@ -356,10 +391,11 @@ void ieee80211_tx_ba_session_handle_star
 611                                         " tid %d\n", tid);
 612  #endif
 613                 spin_lock_bh(&sta->lock);
 614 +               ieee80211_agg_splice_packets(local, tid_tx, tid);
 615                 ieee80211_assign_tid_tx(sta, tid, NULL);
 616 +               ieee80211_agg_splice_finish(local, tid);
 617                 spin_unlock_bh(&sta->lock);
 618
 619 -               ieee80211_wake_queue_agg(local, tid);
 620  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
 621                 kfree_rcu(tid_tx, rcu_head);
 622  #else
 623 @@ -368,9 +404,6 @@ void ieee80211_tx_ba_session_handle_star
 624                 return;
 625         }
 626
 627 -       /* we can take packets again now */
 628 -       ieee80211_wake_queue_agg(local, tid);
 629 -
 630         /* activate the timer for the recipient's addBA response */
 631         mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);
 632  #ifdef CONFIG_MAC80211_HT_DEBUG
 633 @@ -437,7 +470,9 @@ int ieee80211_start_tx_ba_session(struct
 634         if (sdata->vif.type != NL80211_IFTYPE_STATION &&
 635             sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
 636             sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
 637 -           sdata->vif.type != NL80211_IFTYPE_AP)
 638 +           sdata->vif.type != NL80211_IFTYPE_AP &&
 639 +           sdata->vif.type != NL80211_IFTYPE_WDS &&
 640 +           sdata->vif.type != NL80211_IFTYPE_ADHOC)
 641                 return -EINVAL;
 642
 643         if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
 644 @@ -448,6 +483,27 @@ int ieee80211_start_tx_ba_session(struct
 645                 return -EINVAL;
 646         }
 647
 648 +       /*
 649 +        * 802.11n-2009 11.5.1.1: If the initiating STA is an HT STA, is a
 650 +        * member of an IBSS, and has no other existing Block Ack agreement
 651 +        * with the recipient STA, then the initiating STA shall transmit a
 652 +        * Probe Request frame to the recipient STA and shall not transmit an
 653 +        * ADDBA Request frame unless it receives a Probe Response frame
 654 +        * from the recipient within dot11ADDBAFailureTimeout.
 655 +        *
 656 +        * The probe request mechanism for ADDBA is currently not implemented,
 657 +        * but we only build up Block Ack session with HT STAs. This information
 658 +        * is set when we receive a bss info from a probe response or a beacon.
 659 +        */
 660 +       if (sta->sdata->vif.type == NL80211_IFTYPE_ADHOC &&
 661 +           !sta->sta.ht_cap.ht_supported) {
 662 +#ifdef CONFIG_MAC80211_HT_DEBUG
 663 +               printk(KERN_DEBUG "BA request denied - IBSS STA %pM"
 664 +                      "does not advertise HT support\n", pubsta->addr);
 665 +#endif /* CONFIG_MAC80211_HT_DEBUG */
 666 +               return -EINVAL;
 667 +       }
 668 +
 669         spin_lock_bh(&sta->lock);
 670
 671         /* we have tried too many times, receiver does not want A-MPDU */
 672 @@ -508,38 +564,6 @@ int ieee80211_start_tx_ba_session(struct
 673  }
 674  EXPORT_SYMBOL(ieee80211_start_tx_ba_session);
 675
 676 -/*
 677 - * splice packets from the STA's pending to the local pending,
 678 - * requires a call to ieee80211_agg_splice_finish later
 679 - */
 680 -static void __acquires(agg_queue)
 681 -ieee80211_agg_splice_packets(struct ieee80211_local *local,
 682 -                            struct tid_ampdu_tx *tid_tx, u16 tid)
 683 -{
 684 -       int queue = ieee80211_ac_from_tid(tid);
 685 -       unsigned long flags;
 686 -
 687 -       ieee80211_stop_queue_agg(local, tid);
 688 -
 689 -       if (WARN(!tid_tx, "TID %d gone but expected when splicing aggregates"
 690 -                         " from the pending queue\n", tid))
 691 -               return;
 692 -
 693 -       if (!skb_queue_empty(&tid_tx->pending)) {
 694 -               spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
 695 -               /* copy over remaining packets */
 696 -               skb_queue_splice_tail_init(&tid_tx->pending,
 697 -                                          &local->pending[queue]);
 698 -               spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
 699 -       }
 700 -}
 701 -
 702 -static void __releases(agg_queue)
 703 -ieee80211_agg_splice_finish(struct ieee80211_local *local, u16 tid)
 704 -{
 705 -       ieee80211_wake_queue_agg(local, tid);
 706 -}
 707 -
 708  static void ieee80211_agg_tx_operational(struct ieee80211_local *local,
 709                                          struct sta_info *sta, u16 tid)
 710  {
 711 --- a/net/mac80211/debugfs_sta.c
 712 +++ b/net/mac80211/debugfs_sta.c
 713 @@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
 714         test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
 715
 716         int res = scnprintf(buf, sizeof(buf),
 717 -                           "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
 718 +                           "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
 719                             TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
 720                             TEST(PS_DRIVER), TEST(AUTHORIZED),
 721                             TEST(SHORT_PREAMBLE),
 722 -                           TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
 723 +                           TEST(WME), TEST(CLEAR_PS_FILT),
 724                             TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
 725                             TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
 726                             TEST(TDLS_PEER_AUTH));
 727 --- a/net/mac80211/ht.c
 728 +++ b/net/mac80211/ht.c
 729 @@ -47,7 +47,9 @@ void ieee80211_apply_htcap_overrides(str
 730         int i;
 731
 732         if (sdata->vif.type != NL80211_IFTYPE_STATION) {
 733 -               WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_STATION);
 734 +               /* AP interfaces call this code when adding new stations,
 735 +                * so just silently ignore non station interfaces.
 736 +                */
 737                 return;
 738         }
 739
 740 @@ -282,6 +284,8 @@ void ieee80211_send_delba(struct ieee802
 741                 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
 742         else if (sdata->vif.type == NL80211_IFTYPE_STATION)
 743                 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
 744 +       else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
 745 +               memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
 746
 747         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
 748                                           IEEE80211_STYPE_ACTION);
 749 --- a/net/mac80211/ibss.c
 750 +++ b/net/mac80211/ibss.c
 751 @@ -77,6 +77,7 @@ static void __ieee80211_sta_join_ibss(st
 752         struct cfg80211_bss *bss;
 753         u32 bss_change;
 754         u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
 755 +       enum nl80211_channel_type channel_type;
 756
 757         lockdep_assert_held(&ifibss->mtx);
 758
 759 @@ -105,8 +106,16 @@ static void __ieee80211_sta_join_ibss(st
 760
 761         sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
 762
 763 -       local->oper_channel = chan;
 764 -       WARN_ON(!ieee80211_set_channel_type(local, sdata, NL80211_CHAN_NO_HT));
 765 +       channel_type = ifibss->channel_type;
 766 +       if (channel_type > NL80211_CHAN_HT20 &&
 767 +           !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
 768 +               channel_type = NL80211_CHAN_HT20;
 769 +       if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
 770 +               /* can only fail due to HT40+/- mismatch */
 771 +               channel_type = NL80211_CHAN_HT20;
 772 +               WARN_ON(!ieee80211_set_channel_type(local, sdata,
 773 +                                                   NL80211_CHAN_HT20));
 774 +       }
 775         ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
 776
 777         sband = local->hw.wiphy->bands[chan->band];
 778 @@ -172,6 +181,19 @@ static void __ieee80211_sta_join_ibss(st
 779                 memcpy(skb_put(skb, ifibss->ie_len),
 780                        ifibss->ie, ifibss->ie_len);
 781
 782 +       /* add HT capability and information IEs */
 783 +       if (channel_type && sband->ht_cap.ht_supported) {
 784 +               pos = skb_put(skb, 4 +
 785 +                                  sizeof(struct ieee80211_ht_cap) +
 786 +                                  sizeof(struct ieee80211_ht_info));
 787 +               pos = ieee80211_ie_build_ht_cap(pos, &sband->ht_cap,
 788 +                                               sband->ht_cap.cap);
 789 +               pos = ieee80211_ie_build_ht_info(pos,
 790 +                                                &sband->ht_cap,
 791 +                                                chan,
 792 +                                                channel_type);
 793 +       }
 794 +
 795         if (local->hw.queues >= 4) {
 796                 pos = skb_put(skb, 9);
 797                 *pos++ = WLAN_EID_VENDOR_SPECIFIC;
 798 @@ -195,6 +217,7 @@ static void __ieee80211_sta_join_ibss(st
 799         bss_change |= BSS_CHANGED_BEACON;
 800         bss_change |= BSS_CHANGED_BEACON_ENABLED;
 801         bss_change |= BSS_CHANGED_BASIC_RATES;
 802 +       bss_change |= BSS_CHANGED_HT;
 803         bss_change |= BSS_CHANGED_IBSS;
 804         sdata->vif.bss_conf.ibss_joined = true;
 805         ieee80211_bss_info_change_notify(sdata, bss_change);
 806 @@ -268,6 +291,8 @@ static void ieee80211_rx_bss_info(struct
 807         u64 beacon_timestamp, rx_timestamp;
 808         u32 supp_rates = 0;
 809         enum ieee80211_band band = rx_status->band;
 810 +       struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
 811 +       bool rates_updated = false;
 812
 813         if (elems->ds_params && elems->ds_params_len == 1)
 814                 freq = ieee80211_channel_to_frequency(elems->ds_params[0],
 815 @@ -307,7 +332,7 @@ static void ieee80211_rx_bss_info(struct
 816                                                 prev_rates,
 817                                                 sta->sta.supp_rates[band]);
 818  #endif
 819 -                                       rate_control_rate_init(sta);
 820 +                                       rates_updated = true;
 821                                 }
 822                         } else
 823                                 sta = ieee80211_ibss_add_sta(sdata, mgmt->bssid,
 824 @@ -318,6 +343,39 @@ static void ieee80211_rx_bss_info(struct
 825                 if (sta && elems->wmm_info)
 826                         set_sta_flag(sta, WLAN_STA_WME);
 827
 828 +               if (sta && elems->ht_info_elem && elems->ht_cap_elem &&
 829 +                   sdata->u.ibss.channel_type != NL80211_CHAN_NO_HT) {
 830 +                       /* we both use HT */
 831 +                       struct ieee80211_sta_ht_cap sta_ht_cap_new;
 832 +                       enum nl80211_channel_type channel_type =
 833 +                               ieee80211_ht_info_to_channel_type(
 834 +                                                       elems->ht_info_elem);
 835 +
 836 +                       ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
 837 +                                                         elems->ht_cap_elem,
 838 +                                                         &sta_ht_cap_new);
 839 +
 840 +                       /*
 841 +                        * fall back to HT20 if we don't use or use
 842 +                        * the other extension channel
 843 +                        */
 844 +                       if ((channel_type == NL80211_CHAN_HT40MINUS ||
 845 +                            channel_type == NL80211_CHAN_HT40PLUS) &&
 846 +                           channel_type != sdata->u.ibss.channel_type)
 847 +                               sta_ht_cap_new.cap &=
 848 +                                       ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
 849 +
 850 +                       if (memcmp(&sta->sta.ht_cap, &sta_ht_cap_new,
 851 +                                  sizeof(sta_ht_cap_new))) {
 852 +                               memcpy(&sta->sta.ht_cap, &sta_ht_cap_new,
 853 +                                      sizeof(sta_ht_cap_new));
 854 +                               rates_updated = true;
 855 +                       }
 856 +               }
 857 +
 858 +               if (sta && rates_updated)
 859 +                       rate_control_rate_init(sta);
 860 +
 861                 rcu_read_unlock();
 862         }
 863
 864 @@ -896,12 +954,18 @@ int ieee80211_ibss_join(struct ieee80211
 865                         struct cfg80211_ibss_params *params)
 866  {
 867         struct sk_buff *skb;
 868 +       u32 changed = 0;
 869
 870         skb = dev_alloc_skb(sdata->local->hw.extra_tx_headroom +
 871 -                           36 /* bitrates */ +
 872 -                           34 /* SSID */ +
 873 -                           3  /* DS params */ +
 874 -                           4  /* IBSS params */ +
 875 +                           sizeof(struct ieee80211_hdr_3addr) +
 876 +                           12 /* struct ieee80211_mgmt.u.beacon */ +
 877 +                           2 + IEEE80211_MAX_SSID_LEN /* max SSID */ +
 878 +                           2 + 8 /* max Supported Rates */ +
 879 +                           3 /* max DS params */ +
 880 +                           4 /* IBSS params */ +
 881 +                           2 + (IEEE80211_MAX_SUPP_RATES - 8) +
 882 +                           2 + sizeof(struct ieee80211_ht_cap) +
 883 +                           2 + sizeof(struct ieee80211_ht_info) +
 884                             params->ie_len);
 885         if (!skb)
 886                 return -ENOMEM;
 887 @@ -922,13 +986,15 @@ int ieee80211_ibss_join(struct ieee80211
 888         sdata->vif.bss_conf.beacon_int = params->beacon_interval;
 889
 890         sdata->u.ibss.channel = params->channel;
 891 +       sdata->u.ibss.channel_type = params->channel_type;
 892         sdata->u.ibss.fixed_channel = params->channel_fixed;
 893
 894         /* fix ourselves to that channel now already */
 895         if (params->channel_fixed) {
 896                 sdata->local->oper_channel = params->channel;
 897 -               WARN_ON(!ieee80211_set_channel_type(sdata->local, sdata,
 898 -                                                   NL80211_CHAN_NO_HT));
 899 +               if (!ieee80211_set_channel_type(sdata->local, sdata,
 900 +                                              params->channel_type))
 901 +                       return -EINVAL;
 902         }
 903
 904         if (params->ie) {
 905 @@ -951,6 +1017,23 @@ int ieee80211_ibss_join(struct ieee80211
 906         ieee80211_recalc_idle(sdata->local);
 907         mutex_unlock(&sdata->local->mtx);
 908
 909 +       /*
 910 +        * 802.11n-2009 9.13.3.1: In an IBSS, the HT Protection field is
 911 +        * reserved, but an HT STA shall protect HT transmissions as though
 912 +        * the HT Protection field were set to non-HT mixed mode.
 913 +        *
 914 +        * In an IBSS, the RIFS Mode field of the HT Operation element is
 915 +        * also reserved, but an HT STA shall operate as though this field
 916 +        * were set to 1.
 917 +        */
 918 +
 919 +       sdata->vif.bss_conf.ht_operation_mode |=
 920 +                 IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED
 921 +               | IEEE80211_HT_PARAM_RIFS_MODE;
 922 +
 923 +       changed |= BSS_CHANGED_HT;
 924 +       ieee80211_bss_info_change_notify(sdata, changed);
 925 +
 926         ieee80211_queue_work(&sdata->local->hw, &sdata->work);
 927
 928         return 0;
 929 --- a/net/mac80211/ieee80211_i.h
 930 +++ b/net/mac80211/ieee80211_i.h
 931 @@ -474,6 +474,7 @@ struct ieee80211_if_ibss {
 932         u8 ssid_len, ie_len;
 933         u8 *ie;
 934         struct ieee80211_channel *channel;
 935 +       enum nl80211_channel_type channel_type;
 936
 937         unsigned long ibss_join_req;
 938         /* probe response/beacon for IBSS */
 939 --- a/net/mac80211/iface.c
 940 +++ b/net/mac80211/iface.c
 941 @@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
 942  {
 943         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 944         struct ieee80211_local *local = sdata->local;
 945 -       struct sta_info *sta;
 946         u32 changed = 0;
 947         int res;
 948         u32 hw_reconf_flags = 0;
 949 @@ -309,27 +308,6 @@ static int ieee80211_do_open(struct net_
 950
 951         set_bit(SDATA_STATE_RUNNING, &sdata->state);
 952
 953 -       if (sdata->vif.type == NL80211_IFTYPE_WDS) {
 954 -               /* Create STA entry for the WDS peer */
 955 -               sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
 956 -                                    GFP_KERNEL);
 957 -               if (!sta) {
 958 -                       res = -ENOMEM;
 959 -                       goto err_del_interface;
 960 -               }
 961 -
 962 -               /* no atomic bitop required since STA is not live yet */
 963 -               set_sta_flag(sta, WLAN_STA_AUTHORIZED);
 964 -
 965 -               res = sta_info_insert(sta);
 966 -               if (res) {
 967 -                       /* STA has been freed */
 968 -                       goto err_del_interface;
 969 -               }
 970 -
 971 -               rate_control_rate_init(sta);
 972 -       }
 973 -
 974         /*
 975          * set_multicast_list will be invoked by the networking core
 976          * which will check whether any increments here were done in
 977 @@ -356,8 +334,7 @@ static int ieee80211_do_open(struct net_
 978         netif_tx_start_all_queues(dev);
 979
 980         return 0;
 981 - err_del_interface:
 982 -       drv_remove_interface(local, sdata);
 983 +
 984   err_stop:
 985         if (!local->open_count)
 986                 drv_stop(local);
 987 @@ -719,6 +696,70 @@ static void ieee80211_if_setup(struct ne
 988         dev->destructor = free_netdev;
 989  }
 990
 991 +static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 992 +                                        struct sk_buff *skb)
 993 +{
 994 +       struct ieee80211_local *local = sdata->local;
 995 +       struct ieee80211_rx_status *rx_status;
 996 +       struct ieee802_11_elems elems;
 997 +       struct ieee80211_mgmt *mgmt;
 998 +       struct sta_info *sta;
 999 +       size_t baselen;
1000 +       u32 rates = 0;
1001 +       u16 stype;
1002 +       bool new = false;
1003 +       enum ieee80211_band band = local->hw.conf.channel->band;
1004 +       struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
1005 +
1006 +       rx_status = IEEE80211_SKB_RXCB(skb);
1007 +       mgmt = (struct ieee80211_mgmt *) skb->data;
1008 +       stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
1009 +
1010 +       if (stype != IEEE80211_STYPE_BEACON)
1011 +               return;
1012 +
1013 +       baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
1014 +       if (baselen > skb->len)
1015 +               return;
1016 +
1017 +       ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
1018 +                              skb->len - baselen, &elems);
1019 +
1020 +       rates = ieee80211_sta_get_rates(local, &elems, band);
1021 +
1022 +       rcu_read_lock();
1023 +
1024 +       sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
1025 +
1026 +       if (!sta) {
1027 +               rcu_read_unlock();
1028 +               sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
1029 +                                    GFP_KERNEL);
1030 +               if (!sta)
1031 +                       return;
1032 +
1033 +               new = true;
1034 +       }
1035 +
1036 +       sta->last_rx = jiffies;
1037 +       sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
1038 +
1039 +       if (elems.ht_cap_elem)
1040 +               ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
1041 +                               elems.ht_cap_elem, &sta->sta.ht_cap);
1042 +
1043 +       if (elems.wmm_param)
1044 +               set_sta_flag(sta, WLAN_STA_WME);
1045 +
1046 +       if (new) {
1047 +               set_sta_flag(sta, WLAN_STA_AUTHORIZED);
1048 +               rate_control_rate_init(sta);
1049 +               sta_info_insert_rcu(sta);
1050 +       }
1051 +
1052 +       rcu_read_unlock();
1053 +}
1054 +
1055  static void ieee80211_iface_work(struct work_struct *work)
1056  {
1057         struct ieee80211_sub_if_data *sdata =
1058 @@ -823,6 +864,9 @@ static void ieee80211_iface_work(struct
1059                                 break;
1060                         ieee80211_mesh_rx_queued_mgmt(sdata, skb);
1061                         break;
1062 +               case NL80211_IFTYPE_WDS:
1063 +                       ieee80211_wds_rx_queued_mgmt(sdata, skb);
1064 +                       break;
1065                 default:
1066                         WARN(1, "frame for unexpected interface type");
1067                         break;
1068 --- a/net/mac80211/main.c
1069 +++ b/net/mac80211/main.c
1070 @@ -574,7 +574,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(
1071                         WIPHY_FLAG_OFFCHAN_TX |
1072                         WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
1073
1074 -       wiphy->features = NL80211_FEATURE_SK_TX_STATUS;
1075 +       wiphy->features = NL80211_FEATURE_SK_TX_STATUS |
1076 +                         NL80211_FEATURE_HT_IBSS;
1077
1078         if (!ops->set_key)
1079                 wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
1080 --- a/net/mac80211/rx.c
1081 +++ b/net/mac80211/rx.c
1082 @@ -2237,7 +2237,9 @@ ieee80211_rx_h_action(struct ieee80211_r
1083                 if (sdata->vif.type != NL80211_IFTYPE_STATION &&
1084                     sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
1085                     sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
1086 -                   sdata->vif.type != NL80211_IFTYPE_AP)
1087 +                   sdata->vif.type != NL80211_IFTYPE_AP &&
1088 +                   sdata->vif.type != NL80211_IFTYPE_WDS &&
1089 +                   sdata->vif.type != NL80211_IFTYPE_ADHOC)
1090                         break;
1091
1092                 /* verify action_code is present */
1093 @@ -2452,13 +2454,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
1094
1095         if (!ieee80211_vif_is_mesh(&sdata->vif) &&
1096             sdata->vif.type != NL80211_IFTYPE_ADHOC &&
1097 -           sdata->vif.type != NL80211_IFTYPE_STATION)
1098 +           sdata->vif.type != NL80211_IFTYPE_STATION &&
1099 +           sdata->vif.type != NL80211_IFTYPE_WDS)
1100                 return RX_DROP_MONITOR;
1101
1102         switch (stype) {
1103         case cpu_to_le16(IEEE80211_STYPE_BEACON):
1104         case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
1105 -               /* process for all: mesh, mlme, ibss */
1106 +               /* process for all: mesh, mlme, ibss, wds */
1107                 break;
1108         case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
1109         case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
1110 @@ -2796,19 +2799,32 @@ static int prepare_for_handlers(struct i
1111                                 return 0;
1112                 } else if (!ieee80211_bssid_match(bssid,
1113                                         sdata->vif.addr)) {
1114 +                       /*
1115 +                        * Accept public action frames even when the
1116 +                        * BSSID doesn't match, this is used for P2P
1117 +                        * and location updates. Note that mac80211
1118 +                        * itself never looks at these frames.
1119 +                        */
1120                         if (!(status->rx_flags & IEEE80211_RX_IN_SCAN) &&
1121 -                           !ieee80211_is_beacon(hdr->frame_control) &&
1122 -                           !(ieee80211_is_action(hdr->frame_control) &&
1123 -                             sdata->vif.p2p))
1124 +                           ieee80211_is_public_action(hdr, skb->len))
1125 +                               return 1;
1126 +                       if (!(status->rx_flags & IEEE80211_RX_IN_SCAN) &&
1127 +                           !ieee80211_is_beacon(hdr->frame_control))
1128                                 return 0;
1129                         status->rx_flags &= ~IEEE80211_RX_RA_MATCH;
1130                 }
1131                 break;
1132         case NL80211_IFTYPE_WDS:
1133 -               if (bssid || !ieee80211_is_data(hdr->frame_control))
1134 -                       return 0;
1135                 if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2))
1136                         return 0;
1137 +
1138 +               if (ieee80211_is_data(hdr->frame_control) ||
1139 +                   ieee80211_is_action(hdr->frame_control)) {
1140 +                       if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
1141 +                               return 0;
1142 +               } else if (!ieee80211_is_beacon(hdr->frame_control))
1143 +                       return 0;
1144 +
1145                 break;
1146         default:
1147                 /* should never get here */
1148 --- a/net/mac80211/sta_info.h
1149 +++ b/net/mac80211/sta_info.h
1150 @@ -31,7 +31,6 @@
1151   * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
1152   *     frames.
1153   * @WLAN_STA_WME: Station is a QoS-STA.
1154 - * @WLAN_STA_WDS: Station is one of our WDS peers.
1155   * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
1156   *     IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
1157   *     frame to this station is transmitted.
1158 @@ -60,7 +59,6 @@ enum ieee80211_sta_info_flags {
1159         WLAN_STA_AUTHORIZED,
1160         WLAN_STA_SHORT_PREAMBLE,
1161         WLAN_STA_WME,
1162 -       WLAN_STA_WDS,
1163         WLAN_STA_CLEAR_PS_FILT,
1164         WLAN_STA_MFP,
1165         WLAN_STA_BLOCK_BA,
1166 --- a/net/mac80211/util.c
1167 +++ b/net/mac80211/util.c
1168 @@ -1612,6 +1612,11 @@ u8 *ieee80211_ie_build_ht_info(u8 *pos,
1169         }
1170         if (ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
1171                 ht_info->ht_param |= IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;
1172 +
1173 +       /*
1174 +        * Note: According to 802.11n-2009 9.13.3.1, HT Protection field and
1175 +        * RIFS Mode are reserved in IBSS mode, therefore keep them at 0
1176 +        */
1177         ht_info->operation_mode = 0x0000;
1178         ht_info->stbc_param = 0x0000;
1179
1180 --- a/net/wireless/chan.c
1181 +++ b/net/wireless/chan.c
1182 @@ -6,6 +6,7 @@
1183   * Copyright 2009      Johannes Berg <johannes@sipsolutions.net>
1184   */
1185
1186 +#include <linux/export.h>
1187  #include <net/cfg80211.h>
1188  #include "core.h"
1189
1190 @@ -44,9 +45,9 @@ rdev_freq_to_chan(struct cfg80211_regist
1191         return chan;
1192  }
1193
1194 -static bool can_beacon_sec_chan(struct wiphy *wiphy,
1195 -                               struct ieee80211_channel *chan,
1196 -                               enum nl80211_channel_type channel_type)
1197 +int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
1198 +                                 struct ieee80211_channel *chan,
1199 +                                 enum nl80211_channel_type channel_type)
1200  {
1201         struct ieee80211_channel *sec_chan;
1202         int diff;
1203 @@ -75,6 +76,7 @@ static bool can_beacon_sec_chan(struct w
1204
1205         return true;
1206  }
1207 +EXPORT_SYMBOL(cfg80211_can_beacon_sec_chan);
1208
1209  int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
1210                       struct wireless_dev *wdev, int freq,
1211 @@ -109,8 +111,8 @@ int cfg80211_set_freq(struct cfg80211_re
1212                 switch (channel_type) {
1213                 case NL80211_CHAN_HT40PLUS:
1214                 case NL80211_CHAN_HT40MINUS:
1215 -                       if (!can_beacon_sec_chan(&rdev->wiphy, chan,
1216 -                                                channel_type)) {
1217 +                       if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, chan,
1218 +                                                         channel_type)) {
1219                                 printk(KERN_DEBUG
1220                                        "cfg80211: Secondary channel not "
1221                                        "allowed to initiate communication\n");
1222 --- a/net/wireless/nl80211.c
1223 +++ b/net/wireless/nl80211.c
1224 @@ -4684,13 +4684,41 @@ static int nl80211_join_ibss(struct sk_b
1225                 ibss.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
1226         }
1227
1228 -       ibss.channel = ieee80211_get_channel(wiphy,
1229 -               nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]));
1230 +       if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
1231 +               enum nl80211_channel_type channel_type;
1232 +
1233 +               channel_type = nla_get_u32(
1234 +                               info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
1235 +               if (channel_type != NL80211_CHAN_NO_HT &&
1236 +                   channel_type != NL80211_CHAN_HT20 &&
1237 +                   channel_type != NL80211_CHAN_HT40MINUS &&
1238 +                   channel_type != NL80211_CHAN_HT40PLUS)
1239 +                       return -EINVAL;
1240 +
1241 +               if (channel_type != NL80211_CHAN_NO_HT &&
1242 +                   !(wiphy->features & NL80211_FEATURE_HT_IBSS))
1243 +                       return -EINVAL;
1244 +
1245 +               ibss.channel_type = channel_type;
1246 +       } else {
1247 +               ibss.channel_type = NL80211_CHAN_NO_HT;
1248 +       }
1249 +
1250 +       ibss.channel = rdev_freq_to_chan(rdev,
1251 +               nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]),
1252 +               ibss.channel_type);
1253         if (!ibss.channel ||
1254             ibss.channel->flags & IEEE80211_CHAN_NO_IBSS ||
1255             ibss.channel->flags & IEEE80211_CHAN_DISABLED)
1256                 return -EINVAL;
1257
1258 +       /* Both channels should be able to initiate communication */
1259 +       if ((ibss.channel_type == NL80211_CHAN_HT40PLUS ||
1260 +            ibss.channel_type == NL80211_CHAN_HT40MINUS) &&
1261 +           !cfg80211_can_beacon_sec_chan(&rdev->wiphy, ibss.channel,
1262 +                                         ibss.channel_type))
1263 +               return -EINVAL;
1264 +
1265         ibss.channel_fixed = !!info->attrs[NL80211_ATTR_FREQ_FIXED];
1266         ibss.privacy = !!info->attrs[NL80211_ATTR_PRIVACY];
1267
1268 --- a/include/linux/ieee80211.h
1269 +++ b/include/linux/ieee80211.h
1270 @@ -1695,6 +1695,23 @@ static inline bool ieee80211_is_robust_m
1271  }
1272
1273  /**
1274 + * ieee80211_is_public_action - check if frame is a public action frame
1275 + * @hdr: the frame
1276 + * @len: length of the frame
1277 + */
1278 +static inline bool ieee80211_is_public_action(struct ieee80211_hdr *hdr,
1279 +                                             size_t len)
1280 +{
1281 +       struct ieee80211_mgmt *mgmt = (void *)hdr;
1282 +
1283 +       if (len < 25)
1284 +               return false;
1285 +       if (!ieee80211_is_action(hdr->frame_control))
1286 +               return false;
1287 +       return mgmt->u.action.category == WLAN_CATEGORY_PUBLIC;
1288 +}
1289 +
1290 +/**
1291   * ieee80211_fhss_chan_to_freq - get channel frequency
1292   * @channel: the FHSS channel
1293   *
1294 --- a/net/mac80211/tx.c
1295 +++ b/net/mac80211/tx.c
1296 @@ -1332,8 +1332,11 @@ static int invoke_tx_handlers(struct iee
1297         if (!(tx->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL))
1298                 CALL_TXH(ieee80211_tx_h_rate_ctrl);
1299
1300 -       if (unlikely(info->flags & IEEE80211_TX_INTFL_RETRANSMISSION))
1301 +       if (unlikely(info->flags & IEEE80211_TX_INTFL_RETRANSMISSION)) {
1302 +               __skb_queue_tail(&tx->skbs, tx->skb);
1303 +               tx->skb = NULL;
1304                 goto txh_done;
1305 +       }
1306
1307         CALL_TXH(ieee80211_tx_h_michael_mic_add);
1308         CALL_TXH(ieee80211_tx_h_sequence);
1309 --- a/net/mac80211/sta_info.c
1310 +++ b/net/mac80211/sta_info.c
1311 @@ -851,6 +851,7 @@ static int __must_check __sta_info_destr
1312         struct ieee80211_sub_if_data *sdata;
1313         unsigned long flags;
1314         int ret, i, ac;
1315 +       struct tid_ampdu_tx *tid_tx;
1316
1317         might_sleep();
1318
1319 @@ -949,6 +950,30 @@ static int __must_check __sta_info_destr
1320         }
1321  #endif
1322
1323 +       /* There could be some memory leaks because of ampdu tx pending queue
1324 +        * not being freed before destroying the station info.
1325 +        *
1326 +        * Make sure that such queues are purged before freeing the station
1327 +        * info.
1328 +        * TODO: We have to somehow postpone the full destruction
1329 +        * until the aggregation stop completes. Refer
1330 +        * http://thread.gmane.org/gmane.linux.kernel.wireless.general/81936
1331 +        */
1332 +       for (i = 0; i < STA_TID_NUM; i++) {
1333 +               if (!sta->ampdu_mlme.tid_tx[i])
1334 +                       continue;
1335 +               tid_tx = sta->ampdu_mlme.tid_tx[i];
1336 +               if (skb_queue_len(&tid_tx->pending)) {
1337 +#ifdef CONFIG_MAC80211_HT_DEBUG
1338 +                       wiphy_debug(local->hw.wiphy, "TX A-MPDU  purging %d "
1339 +                               "packets for tid=%d\n",
1340 +                               skb_queue_len(&tid_tx->pending), i);
1341 +#endif /* CONFIG_MAC80211_HT_DEBUG */
1342 +                       __skb_queue_purge(&tid_tx->pending);
1343 +               }
1344 +               kfree_rcu(tid_tx, rcu_head);
1345 +       }
1346 +
1347         __sta_info_free(local, sta);
1348
1349         return 0;