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
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]);
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
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]);
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
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) {
33 common->ani.checkani_timer = timestamp;
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
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);
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;
50 + /* disable ANI for 9340 */
51 + if (AR_SREV_9340(ah))
52 + ah->config.enable_ani = false;
54 ath9k_hw_init_mode_regs(ah);
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)
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);
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;
77 @@ -332,7 +332,8 @@ static int ath_reset_internal(struct ath
81 - if (fastcc && !ath9k_hw_check_alive(ah))
82 + if (fastcc && (ah->chip_fullsleep ||
83 + !ath9k_hw_check_alive(ah)))
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) {
91 - ath_dbg(common, ATH_DBG_ANI, "longcal @%lu\n", jiffies);
92 common->ani.longcal_timer = timestamp;
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) {
99 - ath_dbg(common, ATH_DBG_ANI,
100 - "shortcal @%lu\n", jiffies);
101 common->ani.shortcal_timer = timestamp;
102 common->ani.resetcal_timer = timestamp;
104 @@ -584,8 +582,9 @@ void ath_ani_calibrate(unsigned long dat
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) {
114 common->ani.checkani_timer = timestamp;
116 @@ -605,6 +604,11 @@ void ath_ani_calibrate(unsigned long dat
117 ah->rxchainmask, longcal);
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");
125 ath9k_ps_restore(sc);
128 @@ -886,82 +890,6 @@ chip_reset:
132 -static void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw)
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;
139 - ath9k_ps_wakeup(sc);
140 - spin_lock_bh(&sc->sc_pcu_lock);
141 - atomic_set(&ah->intr_ref_cnt, -1);
143 - ath9k_hw_configpcipowersave(ah, false);
146 - ah->curchan = ath9k_cmn_get_curchannel(sc->hw, ah);
148 - r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
151 - "Unable to reset channel (%u MHz), reset status %d\n",
152 - channel->center_freq, r);
155 - ath_complete_reset(sc, true);
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);
162 - spin_unlock_bh(&sc->sc_pcu_lock);
164 - ath9k_ps_restore(sc);
167 -void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw)
169 - struct ath_hw *ah = sc->sc_ah;
170 - struct ieee80211_channel *channel = hw->conf.channel;
173 - ath9k_ps_wakeup(sc);
175 - ath_cancel_work(sc);
177 - spin_lock_bh(&sc->sc_pcu_lock);
180 - * Keep the LED on when the radio is disabled
181 - * during idle unassociated state.
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);
188 - ath_prepare_reset(sc, false, true);
191 - ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
193 - r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
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);
200 - ath9k_hw_phy_disable(ah);
202 - ath9k_hw_configpcipowersave(ah, true);
204 - spin_unlock_bh(&sc->sc_pcu_lock);
205 - ath9k_ps_restore(sc);
208 static int ath_reset(struct ath_softc *sc, bool retry_tx)
211 @@ -1097,6 +1025,9 @@ static int ath9k_start(struct ieee80211_
212 * and then setup of the interrupt mask.
214 spin_lock_bh(&sc->sc_pcu_lock);
216 + atomic_set(&ah->intr_ref_cnt, -1);
218 r = ath9k_hw_reset(ah, init_channel, ah->caldata, false);
221 @@ -1138,6 +1069,18 @@ static int ath9k_start(struct ieee80211_
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);
232 + * Reset key cache to sane defaults (all entries cleared) instead of
233 + * semi-random values after suspend/resume.
235 + ath9k_cmn_init_crypto(sc->sc_ah);
237 spin_unlock_bh(&sc->sc_pcu_lock);
239 if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) &&
240 @@ -1183,6 +1126,13 @@ static void ath9k_tx(struct ieee80211_hw
245 + * Cannot tx while the hardware is in full sleep, it first needs a full
246 + * chip reset to recover from that
248 + if (unlikely(sc->sc_ah->power_mode == ATH9K_PM_FULL_SLEEP))
251 if (unlikely(sc->sc_ah->power_mode != ATH9K_PM_AWAKE)) {
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);
260 mutex_lock(&sc->mutex);
262 @@ -1259,35 +1210,45 @@ static void ath9k_stop(struct ieee80211_
263 * before setting the invalid flag. */
264 ath9k_hw_disable_interrupts(ah);
266 - if (!(sc->sc_flags & SC_OP_INVALID)) {
267 - ath_drain_all_txq(sc, false);
269 - ath9k_hw_phy_disable(ah);
271 - sc->rx.rxlink = NULL;
272 + spin_unlock_bh(&sc->sc_pcu_lock);
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);
280 + prev_idle = sc->ps_idle;
281 + sc->ps_idle = true;
283 + spin_lock_bh(&sc->sc_pcu_lock);
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);
290 + ath_prepare_reset(sc, false, true);
293 dev_kfree_skb_any(sc->rx.frag);
297 - /* disable HAL and put h/w to sleep */
298 - ath9k_hw_disable(ah);
300 + ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
302 - spin_unlock_bh(&sc->sc_pcu_lock);
303 + ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
304 + ath9k_hw_phy_disable(ah);
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);
313 - ath9k_ps_restore(sc);
314 + spin_unlock_bh(&sc->sc_pcu_lock);
316 - sc->ps_idle = true;
317 - ath_radio_disable(sc, hw);
318 + ath9k_ps_restore(sc);
320 sc->sc_flags |= SC_OP_INVALID;
321 + sc->ps_idle = prev_idle;
323 mutex_unlock(&sc->mutex);
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;
331 + ath9k_ps_wakeup(sc);
332 mutex_lock(&sc->mutex);
335 @@ -1639,13 +1600,8 @@ static int ath9k_config(struct ieee80211
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");
344 - disable_radio = true;
347 + ath_cancel_work(sc);
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);
361 - if (disable_radio) {
362 - ath_dbg(common, ATH_DBG_CONFIG, "idle: disabling radio\n");
363 - ath_radio_disable(sc, hw);
366 mutex_unlock(&sc->mutex);
367 + ath9k_ps_restore(sc);
371 @@ -2331,9 +2281,6 @@ static void ath9k_flush(struct ieee80211
378 for (j = 0; j < timeout; j++) {
381 @@ -2351,21 +2298,22 @@ static void ath9k_flush(struct ieee80211
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);
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);
400 - ath_reset(sc, false);
402 + ath_reset(sc, false);
404 - ath9k_ps_restore(sc);
405 - ieee80211_wake_queues(hw);
406 + ath9k_ps_restore(sc);
407 + ieee80211_wake_queues(hw);
411 ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);
412 mutex_unlock(&sc->mutex);
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;
420 - ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);
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.
426 + ath9k_hw_disable(sc->sc_ah);
427 ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP);
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);
434 - ath9k_ps_wakeup(sc);
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);
441 - * Reset key cache to sane defaults (all entries cleared) instead of
442 - * semi-random values after suspend/resume.
444 - ath9k_cmn_init_crypto(sc->sc_ah);
445 - ath9k_ps_restore(sc);
447 - sc->ps_idle = true;
448 - ath_radio_disable(sc, hw);
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);
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
470 + * @NL80211_FEATURE_HT_IBSS: This driver supports IBSS with HT datarates.
472 enum nl80211_feature_flags {
473 NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
474 + NL80211_FEATURE_HT_IBSS = 1 << 1,
478 --- a/include/net/cfg80211.h
479 +++ b/include/net/cfg80211.h
480 @@ -1149,6 +1149,7 @@ struct cfg80211_ibss_params {
483 struct ieee80211_channel *channel;
484 + enum nl80211_channel_type channel_type;
488 @@ -3270,6 +3271,16 @@ void cfg80211_report_obss_beacon(struct
489 const u8 *frame, size_t len,
490 int freq, gfp_t gfp);
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
498 +int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
499 + struct ieee80211_channel *chan,
500 + enum nl80211_channel_type channel_type);
502 /* Logging, debugging and troubleshooting/diagnostic helpers. */
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);
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 @@ -79,10 +79,13 @@ static void ieee80211_send_addba_request
521 memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
522 if (sdata->vif.type == NL80211_IFTYPE_AP ||
523 sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
524 - sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
525 + sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
526 + sdata->vif.type == NL80211_IFTYPE_WDS)
527 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
528 else if (sdata->vif.type == NL80211_IFTYPE_STATION)
529 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
530 + else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
531 + memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
533 mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
534 IEEE80211_STYPE_ACTION);
535 @@ -319,6 +322,38 @@ ieee80211_wake_queue_agg(struct ieee8021
536 __release(agg_queue);
540 + * splice packets from the STA's pending to the local pending,
541 + * requires a call to ieee80211_agg_splice_finish later
543 +static void __acquires(agg_queue)
544 +ieee80211_agg_splice_packets(struct ieee80211_local *local,
545 + struct tid_ampdu_tx *tid_tx, u16 tid)
547 + int queue = ieee80211_ac_from_tid(tid);
548 + unsigned long flags;
550 + ieee80211_stop_queue_agg(local, tid);
552 + if (WARN(!tid_tx, "TID %d gone but expected when splicing aggregates"
553 + " from the pending queue\n", tid))
556 + if (!skb_queue_empty(&tid_tx->pending)) {
557 + spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
558 + /* copy over remaining packets */
559 + skb_queue_splice_tail_init(&tid_tx->pending,
560 + &local->pending[queue]);
561 + spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
565 +static void __releases(agg_queue)
566 +ieee80211_agg_splice_finish(struct ieee80211_local *local, u16 tid)
568 + ieee80211_wake_queue_agg(local, tid);
571 void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
573 struct tid_ampdu_tx *tid_tx;
574 @@ -330,19 +365,17 @@ void ieee80211_tx_ba_session_handle_star
575 tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
578 - * While we're asking the driver about the aggregation,
579 - * stop the AC queue so that we don't have to worry
580 - * about frames that came in while we were doing that,
581 - * which would require us to put them to the AC pending
582 - * afterwards which just makes the code more complex.
583 + * Start queuing up packets for this aggregation session.
584 + * We're going to release them once the driver is OK with
587 - ieee80211_stop_queue_agg(local, tid);
589 clear_bit(HT_AGG_STATE_WANT_START, &tid_tx->state);
592 - * make sure no packets are being processed to get
593 - * valid starting sequence number
594 + * Make sure no packets are being processed. This ensures that
595 + * we have a valid starting sequence number and that in-flight
596 + * packets have been flushed out and no packets for this TID
597 + * will go into the driver during the ampdu_action call.
601 @@ -356,10 +389,11 @@ void ieee80211_tx_ba_session_handle_star
604 spin_lock_bh(&sta->lock);
605 + ieee80211_agg_splice_packets(local, tid_tx, tid);
606 ieee80211_assign_tid_tx(sta, tid, NULL);
607 + ieee80211_agg_splice_finish(local, tid);
608 spin_unlock_bh(&sta->lock);
610 - ieee80211_wake_queue_agg(local, tid);
611 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
612 kfree_rcu(tid_tx, rcu_head);
614 @@ -368,9 +402,6 @@ void ieee80211_tx_ba_session_handle_star
618 - /* we can take packets again now */
619 - ieee80211_wake_queue_agg(local, tid);
621 /* activate the timer for the recipient's addBA response */
622 mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);
623 #ifdef CONFIG_MAC80211_HT_DEBUG
624 @@ -437,7 +468,9 @@ int ieee80211_start_tx_ba_session(struct
625 if (sdata->vif.type != NL80211_IFTYPE_STATION &&
626 sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
627 sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
628 - sdata->vif.type != NL80211_IFTYPE_AP)
629 + sdata->vif.type != NL80211_IFTYPE_AP &&
630 + sdata->vif.type != NL80211_IFTYPE_WDS &&
631 + sdata->vif.type != NL80211_IFTYPE_ADHOC)
634 if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
635 @@ -448,6 +481,27 @@ int ieee80211_start_tx_ba_session(struct
640 + * 802.11n-2009 11.5.1.1: If the initiating STA is an HT STA, is a
641 + * member of an IBSS, and has no other existing Block Ack agreement
642 + * with the recipient STA, then the initiating STA shall transmit a
643 + * Probe Request frame to the recipient STA and shall not transmit an
644 + * ADDBA Request frame unless it receives a Probe Response frame
645 + * from the recipient within dot11ADDBAFailureTimeout.
647 + * The probe request mechanism for ADDBA is currently not implemented,
648 + * but we only build up Block Ack session with HT STAs. This information
649 + * is set when we receive a bss info from a probe response or a beacon.
651 + if (sta->sdata->vif.type == NL80211_IFTYPE_ADHOC &&
652 + !sta->sta.ht_cap.ht_supported) {
653 +#ifdef CONFIG_MAC80211_HT_DEBUG
654 + printk(KERN_DEBUG "BA request denied - IBSS STA %pM"
655 + "does not advertise HT support\n", pubsta->addr);
656 +#endif /* CONFIG_MAC80211_HT_DEBUG */
660 spin_lock_bh(&sta->lock);
662 /* we have tried too many times, receiver does not want A-MPDU */
663 @@ -508,38 +562,6 @@ int ieee80211_start_tx_ba_session(struct
665 EXPORT_SYMBOL(ieee80211_start_tx_ba_session);
668 - * splice packets from the STA's pending to the local pending,
669 - * requires a call to ieee80211_agg_splice_finish later
671 -static void __acquires(agg_queue)
672 -ieee80211_agg_splice_packets(struct ieee80211_local *local,
673 - struct tid_ampdu_tx *tid_tx, u16 tid)
675 - int queue = ieee80211_ac_from_tid(tid);
676 - unsigned long flags;
678 - ieee80211_stop_queue_agg(local, tid);
680 - if (WARN(!tid_tx, "TID %d gone but expected when splicing aggregates"
681 - " from the pending queue\n", tid))
684 - if (!skb_queue_empty(&tid_tx->pending)) {
685 - spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
686 - /* copy over remaining packets */
687 - skb_queue_splice_tail_init(&tid_tx->pending,
688 - &local->pending[queue]);
689 - spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
693 -static void __releases(agg_queue)
694 -ieee80211_agg_splice_finish(struct ieee80211_local *local, u16 tid)
696 - ieee80211_wake_queue_agg(local, tid);
699 static void ieee80211_agg_tx_operational(struct ieee80211_local *local,
700 struct sta_info *sta, u16 tid)
702 --- a/net/mac80211/debugfs_sta.c
703 +++ b/net/mac80211/debugfs_sta.c
704 @@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
705 test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
707 int res = scnprintf(buf, sizeof(buf),
708 - "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
709 + "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
710 TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
711 TEST(PS_DRIVER), TEST(AUTHORIZED),
712 TEST(SHORT_PREAMBLE),
713 - TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
714 + TEST(WME), TEST(CLEAR_PS_FILT),
715 TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
716 TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
717 TEST(TDLS_PEER_AUTH));
718 --- a/net/mac80211/ht.c
719 +++ b/net/mac80211/ht.c
720 @@ -47,7 +47,9 @@ void ieee80211_apply_htcap_overrides(str
723 if (sdata->vif.type != NL80211_IFTYPE_STATION) {
724 - WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_STATION);
725 + /* AP interfaces call this code when adding new stations,
726 + * so just silently ignore non station interfaces.
731 @@ -282,6 +284,8 @@ void ieee80211_send_delba(struct ieee802
732 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
733 else if (sdata->vif.type == NL80211_IFTYPE_STATION)
734 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
735 + else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
736 + memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
738 mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
739 IEEE80211_STYPE_ACTION);
740 --- a/net/mac80211/ibss.c
741 +++ b/net/mac80211/ibss.c
742 @@ -77,6 +77,7 @@ static void __ieee80211_sta_join_ibss(st
743 struct cfg80211_bss *bss;
745 u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
746 + enum nl80211_channel_type channel_type;
748 lockdep_assert_held(&ifibss->mtx);
750 @@ -105,8 +106,16 @@ static void __ieee80211_sta_join_ibss(st
752 sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
754 - local->oper_channel = chan;
755 - WARN_ON(!ieee80211_set_channel_type(local, sdata, NL80211_CHAN_NO_HT));
756 + channel_type = ifibss->channel_type;
757 + if (channel_type > NL80211_CHAN_HT20 &&
758 + !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
759 + channel_type = NL80211_CHAN_HT20;
760 + if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
761 + /* can only fail due to HT40+/- mismatch */
762 + channel_type = NL80211_CHAN_HT20;
763 + WARN_ON(!ieee80211_set_channel_type(local, sdata,
764 + NL80211_CHAN_HT20));
766 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
768 sband = local->hw.wiphy->bands[chan->band];
769 @@ -172,6 +181,19 @@ static void __ieee80211_sta_join_ibss(st
770 memcpy(skb_put(skb, ifibss->ie_len),
771 ifibss->ie, ifibss->ie_len);
773 + /* add HT capability and information IEs */
774 + if (channel_type && sband->ht_cap.ht_supported) {
775 + pos = skb_put(skb, 4 +
776 + sizeof(struct ieee80211_ht_cap) +
777 + sizeof(struct ieee80211_ht_info));
778 + pos = ieee80211_ie_build_ht_cap(pos, &sband->ht_cap,
779 + sband->ht_cap.cap);
780 + pos = ieee80211_ie_build_ht_info(pos,
786 if (local->hw.queues >= 4) {
787 pos = skb_put(skb, 9);
788 *pos++ = WLAN_EID_VENDOR_SPECIFIC;
789 @@ -195,6 +217,7 @@ static void __ieee80211_sta_join_ibss(st
790 bss_change |= BSS_CHANGED_BEACON;
791 bss_change |= BSS_CHANGED_BEACON_ENABLED;
792 bss_change |= BSS_CHANGED_BASIC_RATES;
793 + bss_change |= BSS_CHANGED_HT;
794 bss_change |= BSS_CHANGED_IBSS;
795 sdata->vif.bss_conf.ibss_joined = true;
796 ieee80211_bss_info_change_notify(sdata, bss_change);
797 @@ -268,6 +291,8 @@ static void ieee80211_rx_bss_info(struct
798 u64 beacon_timestamp, rx_timestamp;
800 enum ieee80211_band band = rx_status->band;
801 + struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
802 + bool rates_updated = false;
804 if (elems->ds_params && elems->ds_params_len == 1)
805 freq = ieee80211_channel_to_frequency(elems->ds_params[0],
806 @@ -307,7 +332,7 @@ static void ieee80211_rx_bss_info(struct
808 sta->sta.supp_rates[band]);
810 - rate_control_rate_init(sta);
811 + rates_updated = true;
814 sta = ieee80211_ibss_add_sta(sdata, mgmt->bssid,
815 @@ -318,6 +343,39 @@ static void ieee80211_rx_bss_info(struct
816 if (sta && elems->wmm_info)
817 set_sta_flag(sta, WLAN_STA_WME);
819 + if (sta && elems->ht_info_elem && elems->ht_cap_elem &&
820 + sdata->u.ibss.channel_type != NL80211_CHAN_NO_HT) {
821 + /* we both use HT */
822 + struct ieee80211_sta_ht_cap sta_ht_cap_new;
823 + enum nl80211_channel_type channel_type =
824 + ieee80211_ht_info_to_channel_type(
825 + elems->ht_info_elem);
827 + ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
828 + elems->ht_cap_elem,
832 + * fall back to HT20 if we don't use or use
833 + * the other extension channel
835 + if ((channel_type == NL80211_CHAN_HT40MINUS ||
836 + channel_type == NL80211_CHAN_HT40PLUS) &&
837 + channel_type != sdata->u.ibss.channel_type)
838 + sta_ht_cap_new.cap &=
839 + ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
841 + if (memcmp(&sta->sta.ht_cap, &sta_ht_cap_new,
842 + sizeof(sta_ht_cap_new))) {
843 + memcpy(&sta->sta.ht_cap, &sta_ht_cap_new,
844 + sizeof(sta_ht_cap_new));
845 + rates_updated = true;
849 + if (sta && rates_updated)
850 + rate_control_rate_init(sta);
855 @@ -896,12 +954,18 @@ int ieee80211_ibss_join(struct ieee80211
856 struct cfg80211_ibss_params *params)
861 skb = dev_alloc_skb(sdata->local->hw.extra_tx_headroom +
862 - 36 /* bitrates */ +
864 - 3 /* DS params */ +
865 - 4 /* IBSS params */ +
866 + sizeof(struct ieee80211_hdr_3addr) +
867 + 12 /* struct ieee80211_mgmt.u.beacon */ +
868 + 2 + IEEE80211_MAX_SSID_LEN /* max SSID */ +
869 + 2 + 8 /* max Supported Rates */ +
870 + 3 /* max DS params */ +
871 + 4 /* IBSS params */ +
872 + 2 + (IEEE80211_MAX_SUPP_RATES - 8) +
873 + 2 + sizeof(struct ieee80211_ht_cap) +
874 + 2 + sizeof(struct ieee80211_ht_info) +
878 @@ -922,13 +986,15 @@ int ieee80211_ibss_join(struct ieee80211
879 sdata->vif.bss_conf.beacon_int = params->beacon_interval;
881 sdata->u.ibss.channel = params->channel;
882 + sdata->u.ibss.channel_type = params->channel_type;
883 sdata->u.ibss.fixed_channel = params->channel_fixed;
885 /* fix ourselves to that channel now already */
886 if (params->channel_fixed) {
887 sdata->local->oper_channel = params->channel;
888 - WARN_ON(!ieee80211_set_channel_type(sdata->local, sdata,
889 - NL80211_CHAN_NO_HT));
890 + if (!ieee80211_set_channel_type(sdata->local, sdata,
891 + params->channel_type))
896 @@ -951,6 +1017,23 @@ int ieee80211_ibss_join(struct ieee80211
897 ieee80211_recalc_idle(sdata->local);
898 mutex_unlock(&sdata->local->mtx);
901 + * 802.11n-2009 9.13.3.1: In an IBSS, the HT Protection field is
902 + * reserved, but an HT STA shall protect HT transmissions as though
903 + * the HT Protection field were set to non-HT mixed mode.
905 + * In an IBSS, the RIFS Mode field of the HT Operation element is
906 + * also reserved, but an HT STA shall operate as though this field
910 + sdata->vif.bss_conf.ht_operation_mode |=
911 + IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED
912 + | IEEE80211_HT_PARAM_RIFS_MODE;
914 + changed |= BSS_CHANGED_HT;
915 + ieee80211_bss_info_change_notify(sdata, changed);
917 ieee80211_queue_work(&sdata->local->hw, &sdata->work);
920 --- a/net/mac80211/ieee80211_i.h
921 +++ b/net/mac80211/ieee80211_i.h
922 @@ -474,6 +474,7 @@ struct ieee80211_if_ibss {
925 struct ieee80211_channel *channel;
926 + enum nl80211_channel_type channel_type;
928 unsigned long ibss_join_req;
929 /* probe response/beacon for IBSS */
930 --- a/net/mac80211/iface.c
931 +++ b/net/mac80211/iface.c
932 @@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
934 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
935 struct ieee80211_local *local = sdata->local;
936 - struct sta_info *sta;
939 u32 hw_reconf_flags = 0;
940 @@ -309,27 +308,6 @@ static int ieee80211_do_open(struct net_
942 set_bit(SDATA_STATE_RUNNING, &sdata->state);
944 - if (sdata->vif.type == NL80211_IFTYPE_WDS) {
945 - /* Create STA entry for the WDS peer */
946 - sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
950 - goto err_del_interface;
953 - /* no atomic bitop required since STA is not live yet */
954 - set_sta_flag(sta, WLAN_STA_AUTHORIZED);
956 - res = sta_info_insert(sta);
958 - /* STA has been freed */
959 - goto err_del_interface;
962 - rate_control_rate_init(sta);
966 * set_multicast_list will be invoked by the networking core
967 * which will check whether any increments here were done in
968 @@ -356,8 +334,7 @@ static int ieee80211_do_open(struct net_
969 netif_tx_start_all_queues(dev);
973 - drv_remove_interface(local, sdata);
976 if (!local->open_count)
978 @@ -719,6 +696,70 @@ static void ieee80211_if_setup(struct ne
979 dev->destructor = free_netdev;
982 +static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
983 + struct sk_buff *skb)
985 + struct ieee80211_local *local = sdata->local;
986 + struct ieee80211_rx_status *rx_status;
987 + struct ieee802_11_elems elems;
988 + struct ieee80211_mgmt *mgmt;
989 + struct sta_info *sta;
994 + enum ieee80211_band band = local->hw.conf.channel->band;
995 + struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
997 + rx_status = IEEE80211_SKB_RXCB(skb);
998 + mgmt = (struct ieee80211_mgmt *) skb->data;
999 + stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
1001 + if (stype != IEEE80211_STYPE_BEACON)
1004 + baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
1005 + if (baselen > skb->len)
1008 + ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
1009 + skb->len - baselen, &elems);
1011 + rates = ieee80211_sta_get_rates(local, &elems, band);
1015 + sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
1018 + rcu_read_unlock();
1019 + sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
1027 + sta->last_rx = jiffies;
1028 + sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
1030 + if (elems.ht_cap_elem)
1031 + ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
1032 + elems.ht_cap_elem, &sta->sta.ht_cap);
1034 + if (elems.wmm_param)
1035 + set_sta_flag(sta, WLAN_STA_WME);
1038 + set_sta_flag(sta, WLAN_STA_AUTHORIZED);
1039 + rate_control_rate_init(sta);
1040 + sta_info_insert_rcu(sta);
1043 + rcu_read_unlock();
1046 static void ieee80211_iface_work(struct work_struct *work)
1048 struct ieee80211_sub_if_data *sdata =
1049 @@ -823,6 +864,9 @@ static void ieee80211_iface_work(struct
1051 ieee80211_mesh_rx_queued_mgmt(sdata, skb);
1053 + case NL80211_IFTYPE_WDS:
1054 + ieee80211_wds_rx_queued_mgmt(sdata, skb);
1057 WARN(1, "frame for unexpected interface type");
1059 --- a/net/mac80211/main.c
1060 +++ b/net/mac80211/main.c
1061 @@ -574,7 +574,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(
1062 WIPHY_FLAG_OFFCHAN_TX |
1063 WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
1065 - wiphy->features = NL80211_FEATURE_SK_TX_STATUS;
1066 + wiphy->features = NL80211_FEATURE_SK_TX_STATUS |
1067 + NL80211_FEATURE_HT_IBSS;
1070 wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
1071 --- a/net/mac80211/rx.c
1072 +++ b/net/mac80211/rx.c
1073 @@ -2237,7 +2237,9 @@ ieee80211_rx_h_action(struct ieee80211_r
1074 if (sdata->vif.type != NL80211_IFTYPE_STATION &&
1075 sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
1076 sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
1077 - sdata->vif.type != NL80211_IFTYPE_AP)
1078 + sdata->vif.type != NL80211_IFTYPE_AP &&
1079 + sdata->vif.type != NL80211_IFTYPE_WDS &&
1080 + sdata->vif.type != NL80211_IFTYPE_ADHOC)
1083 /* verify action_code is present */
1084 @@ -2452,13 +2454,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
1086 if (!ieee80211_vif_is_mesh(&sdata->vif) &&
1087 sdata->vif.type != NL80211_IFTYPE_ADHOC &&
1088 - sdata->vif.type != NL80211_IFTYPE_STATION)
1089 + sdata->vif.type != NL80211_IFTYPE_STATION &&
1090 + sdata->vif.type != NL80211_IFTYPE_WDS)
1091 return RX_DROP_MONITOR;
1094 case cpu_to_le16(IEEE80211_STYPE_BEACON):
1095 case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
1096 - /* process for all: mesh, mlme, ibss */
1097 + /* process for all: mesh, mlme, ibss, wds */
1099 case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
1100 case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
1101 @@ -2796,19 +2799,32 @@ static int prepare_for_handlers(struct i
1103 } else if (!ieee80211_bssid_match(bssid,
1106 + * Accept public action frames even when the
1107 + * BSSID doesn't match, this is used for P2P
1108 + * and location updates. Note that mac80211
1109 + * itself never looks at these frames.
1111 if (!(status->rx_flags & IEEE80211_RX_IN_SCAN) &&
1112 - !ieee80211_is_beacon(hdr->frame_control) &&
1113 - !(ieee80211_is_action(hdr->frame_control) &&
1115 + ieee80211_is_public_action(hdr, skb->len))
1117 + if (!(status->rx_flags & IEEE80211_RX_IN_SCAN) &&
1118 + !ieee80211_is_beacon(hdr->frame_control))
1120 status->rx_flags &= ~IEEE80211_RX_RA_MATCH;
1123 case NL80211_IFTYPE_WDS:
1124 - if (bssid || !ieee80211_is_data(hdr->frame_control))
1126 if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2))
1129 + if (ieee80211_is_data(hdr->frame_control) ||
1130 + ieee80211_is_action(hdr->frame_control)) {
1131 + if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
1133 + } else if (!ieee80211_is_beacon(hdr->frame_control))
1138 /* should never get here */
1139 --- a/net/mac80211/sta_info.h
1140 +++ b/net/mac80211/sta_info.h
1142 * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
1144 * @WLAN_STA_WME: Station is a QoS-STA.
1145 - * @WLAN_STA_WDS: Station is one of our WDS peers.
1146 * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
1147 * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
1148 * frame to this station is transmitted.
1149 @@ -60,7 +59,6 @@ enum ieee80211_sta_info_flags {
1150 WLAN_STA_AUTHORIZED,
1151 WLAN_STA_SHORT_PREAMBLE,
1154 WLAN_STA_CLEAR_PS_FILT,
1157 --- a/net/mac80211/util.c
1158 +++ b/net/mac80211/util.c
1159 @@ -1612,6 +1612,11 @@ u8 *ieee80211_ie_build_ht_info(u8 *pos,
1161 if (ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
1162 ht_info->ht_param |= IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;
1165 + * Note: According to 802.11n-2009 9.13.3.1, HT Protection field and
1166 + * RIFS Mode are reserved in IBSS mode, therefore keep them at 0
1168 ht_info->operation_mode = 0x0000;
1169 ht_info->stbc_param = 0x0000;
1171 --- a/net/wireless/chan.c
1172 +++ b/net/wireless/chan.c
1174 * Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
1177 +#include <linux/export.h>
1178 #include <net/cfg80211.h>
1181 @@ -44,9 +45,9 @@ rdev_freq_to_chan(struct cfg80211_regist
1185 -static bool can_beacon_sec_chan(struct wiphy *wiphy,
1186 - struct ieee80211_channel *chan,
1187 - enum nl80211_channel_type channel_type)
1188 +int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
1189 + struct ieee80211_channel *chan,
1190 + enum nl80211_channel_type channel_type)
1192 struct ieee80211_channel *sec_chan;
1194 @@ -75,6 +76,7 @@ static bool can_beacon_sec_chan(struct w
1198 +EXPORT_SYMBOL(cfg80211_can_beacon_sec_chan);
1200 int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
1201 struct wireless_dev *wdev, int freq,
1202 @@ -109,8 +111,8 @@ int cfg80211_set_freq(struct cfg80211_re
1203 switch (channel_type) {
1204 case NL80211_CHAN_HT40PLUS:
1205 case NL80211_CHAN_HT40MINUS:
1206 - if (!can_beacon_sec_chan(&rdev->wiphy, chan,
1208 + if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, chan,
1211 "cfg80211: Secondary channel not "
1212 "allowed to initiate communication\n");
1213 --- a/net/wireless/nl80211.c
1214 +++ b/net/wireless/nl80211.c
1215 @@ -4684,13 +4684,41 @@ static int nl80211_join_ibss(struct sk_b
1216 ibss.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
1219 - ibss.channel = ieee80211_get_channel(wiphy,
1220 - nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]));
1221 + if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
1222 + enum nl80211_channel_type channel_type;
1224 + channel_type = nla_get_u32(
1225 + info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
1226 + if (channel_type != NL80211_CHAN_NO_HT &&
1227 + channel_type != NL80211_CHAN_HT20 &&
1228 + channel_type != NL80211_CHAN_HT40MINUS &&
1229 + channel_type != NL80211_CHAN_HT40PLUS)
1232 + if (channel_type != NL80211_CHAN_NO_HT &&
1233 + !(wiphy->features & NL80211_FEATURE_HT_IBSS))
1236 + ibss.channel_type = channel_type;
1238 + ibss.channel_type = NL80211_CHAN_NO_HT;
1241 + ibss.channel = rdev_freq_to_chan(rdev,
1242 + nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]),
1243 + ibss.channel_type);
1244 if (!ibss.channel ||
1245 ibss.channel->flags & IEEE80211_CHAN_NO_IBSS ||
1246 ibss.channel->flags & IEEE80211_CHAN_DISABLED)
1249 + /* Both channels should be able to initiate communication */
1250 + if ((ibss.channel_type == NL80211_CHAN_HT40PLUS ||
1251 + ibss.channel_type == NL80211_CHAN_HT40MINUS) &&
1252 + !cfg80211_can_beacon_sec_chan(&rdev->wiphy, ibss.channel,
1253 + ibss.channel_type))
1256 ibss.channel_fixed = !!info->attrs[NL80211_ATTR_FREQ_FIXED];
1257 ibss.privacy = !!info->attrs[NL80211_ATTR_PRIVACY];
1259 --- a/include/linux/ieee80211.h
1260 +++ b/include/linux/ieee80211.h
1261 @@ -1695,6 +1695,23 @@ static inline bool ieee80211_is_robust_m
1265 + * ieee80211_is_public_action - check if frame is a public action frame
1267 + * @len: length of the frame
1269 +static inline bool ieee80211_is_public_action(struct ieee80211_hdr *hdr,
1272 + struct ieee80211_mgmt *mgmt = (void *)hdr;
1276 + if (!ieee80211_is_action(hdr->frame_control))
1278 + return mgmt->u.action.category == WLAN_CATEGORY_PUBLIC;
1282 * ieee80211_fhss_chan_to_freq - get channel frequency
1283 * @channel: the FHSS channel
1285 --- a/net/mac80211/tx.c
1286 +++ b/net/mac80211/tx.c
1287 @@ -1332,8 +1332,11 @@ static int invoke_tx_handlers(struct iee
1288 if (!(tx->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL))
1289 CALL_TXH(ieee80211_tx_h_rate_ctrl);
1291 - if (unlikely(info->flags & IEEE80211_TX_INTFL_RETRANSMISSION))
1292 + if (unlikely(info->flags & IEEE80211_TX_INTFL_RETRANSMISSION)) {
1293 + __skb_queue_tail(&tx->skbs, tx->skb);
1298 CALL_TXH(ieee80211_tx_h_michael_mic_add);
1299 CALL_TXH(ieee80211_tx_h_sequence);