+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -1122,6 +1122,7 @@ struct cfg80211_ibss_params {
+ u8 *ssid;
+ u8 *bssid;
+ struct ieee80211_channel *channel;
++ enum nl80211_channel_type channel_type;
+ u8 *ie;
+ u8 ssid_len, ie_len;
+ u16 beacon_interval;
+@@ -3188,6 +3189,16 @@ void cfg80211_gtk_rekey_notify(struct ne
+ void cfg80211_pmksa_candidate_notify(struct net_device *dev, int index,
+ const u8 *bssid, bool preauth, gfp_t gfp);
+
++/**
++ * cfg80211_can_use_ext_chan - test if ht40 on extension channel can be used
++ * @wiphy: the wiphy
++ * @chan: main channel
++ * @channel_type: HT mode
++ */
++bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
++ struct ieee80211_channel *chan,
++ enum nl80211_channel_type channel_type);
++
+ /* Logging, debugging and troubleshooting/diagnostic helpers. */
+
+ /* wiphy_printk helpers, similar to dev_printk */
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
-@@ -176,6 +176,8 @@ static void ieee80211_send_addba_resp(st
+@@ -180,6 +180,10 @@ static void ieee80211_send_addba_resp(st
memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
else if (sdata->vif.type == NL80211_IFTYPE_STATION)
memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
+ else if (sdata->vif.type == NL80211_IFTYPE_WDS)
+ memcpy(mgmt->bssid, da, ETH_ALEN);
++ else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
++ memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_ACTION);
-@@ -262,7 +264,11 @@ void ieee80211_process_addba_request(str
- "%pM on tid %u\n",
- mgmt->sa, tid);
- #endif /* CONFIG_MAC80211_HT_DEBUG */
-- goto end;
-+
-+ /* delete existing Rx BA session on the same tid */
-+ ___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
-+ WLAN_STATUS_UNSPECIFIED_QOS,
-+ false);
- }
-
- /* prepare A-MPDU MLME for Rx aggregation */
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
-@@ -79,7 +79,8 @@ static void ieee80211_send_addba_request
+@@ -77,10 +77,13 @@ static void ieee80211_send_addba_request
memcpy(mgmt->da, da, ETH_ALEN);
memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
if (sdata->vif.type == NL80211_IFTYPE_AP ||
memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
else if (sdata->vif.type == NL80211_IFTYPE_STATION)
memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
-@@ -398,7 +399,8 @@ int ieee80211_start_tx_ba_session(struct
++ else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
++ memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
+
+ mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+ IEEE80211_STYPE_ACTION);
+@@ -397,7 +400,9 @@ int ieee80211_start_tx_ba_session(struct
*/
if (sdata->vif.type != NL80211_IFTYPE_STATION &&
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
- sdata->vif.type != NL80211_IFTYPE_AP)
+ sdata->vif.type != NL80211_IFTYPE_AP &&
++ sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+ sdata->vif.type != NL80211_IFTYPE_WDS)
return -EINVAL;
- if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
+ if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
-@@ -59,7 +59,7 @@ static ssize_t sta_flags_read(struct fil
- char buf[100];
- struct sta_info *sta = file->private_data;
- u32 staflags = get_sta_flags(sta);
-- int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
-+ int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s",
- staflags & WLAN_STA_AUTH ? "AUTH\n" : "",
- staflags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
- staflags & WLAN_STA_PS_STA ? "PS (sta)\n" : "",
-@@ -67,7 +67,6 @@ static ssize_t sta_flags_read(struct fil
- staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
- staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
- staflags & WLAN_STA_WME ? "WME\n" : "",
-- staflags & WLAN_STA_WDS ? "WDS\n" : "",
- staflags & WLAN_STA_MFP ? "MFP\n" : "");
- return simple_read_from_buffer(userbuf, count, ppos, buf, res);
- }
+@@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
+ test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
+
+ int res = scnprintf(buf, sizeof(buf),
+- "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
++ "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+ TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
+ TEST(PS_DRIVER), TEST(AUTHORIZED),
+ TEST(SHORT_PREAMBLE), TEST(ASSOC_AP),
+- TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
++ TEST(WME), TEST(CLEAR_PS_FILT),
+ TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
+ TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
+ TEST(TDLS_PEER_AUTH));
+--- a/net/mac80211/ht.c
++++ b/net/mac80211/ht.c
+@@ -199,6 +199,8 @@ void ieee80211_send_delba(struct ieee802
+ memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
+ else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+ memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
++ else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
++ memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
+
+ mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+ IEEE80211_STYPE_ACTION);
+--- a/net/mac80211/ibss.c
++++ b/net/mac80211/ibss.c
+@@ -77,6 +77,7 @@ static void __ieee80211_sta_join_ibss(st
+ struct cfg80211_bss *bss;
+ u32 bss_change;
+ u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
++ enum nl80211_channel_type channel_type;
+
+ lockdep_assert_held(&ifibss->mtx);
+
+@@ -104,8 +105,16 @@ static void __ieee80211_sta_join_ibss(st
+
+ sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
+
+- local->oper_channel = chan;
+- WARN_ON(!ieee80211_set_channel_type(local, sdata, NL80211_CHAN_NO_HT));
++ channel_type = ifibss->channel_type;
++ if (channel_type > NL80211_CHAN_HT20 &&
++ !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
++ channel_type = NL80211_CHAN_HT20;
++ if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
++ /* can only fail due to HT40+/- mismatch */
++ channel_type = NL80211_CHAN_HT20;
++ WARN_ON(!ieee80211_set_channel_type(local, sdata,
++ NL80211_CHAN_HT20));
++ }
+ ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
+
+ sband = local->hw.wiphy->bands[chan->band];
+@@ -171,6 +180,18 @@ static void __ieee80211_sta_join_ibss(st
+ memcpy(skb_put(skb, ifibss->ie_len),
+ ifibss->ie, ifibss->ie_len);
+
++ /* add HT capability and information IEs */
++ if (channel_type && sband->ht_cap.ht_supported) {
++ pos = skb_put(skb, 4 +
++ sizeof(struct ieee80211_ht_cap) +
++ sizeof(struct ieee80211_ht_info));
++ pos = ieee80211_ie_build_ht_cap(pos, sband, sband->ht_cap.cap);
++ pos = ieee80211_ie_build_ht_info(pos,
++ &sband->ht_cap,
++ chan,
++ channel_type);
++ }
++
+ if (local->hw.queues >= 4) {
+ pos = skb_put(skb, 9);
+ *pos++ = WLAN_EID_VENDOR_SPECIFIC;
+@@ -194,6 +215,7 @@ static void __ieee80211_sta_join_ibss(st
+ bss_change |= BSS_CHANGED_BEACON;
+ bss_change |= BSS_CHANGED_BEACON_ENABLED;
+ bss_change |= BSS_CHANGED_BASIC_RATES;
++ bss_change |= BSS_CHANGED_HT;
+ bss_change |= BSS_CHANGED_IBSS;
+ sdata->vif.bss_conf.ibss_joined = true;
+ ieee80211_bss_info_change_notify(sdata, bss_change);
+@@ -266,6 +288,7 @@ static void ieee80211_rx_bss_info(struct
+ u64 beacon_timestamp, rx_timestamp;
+ u32 supp_rates = 0;
+ enum ieee80211_band band = rx_status->band;
++ struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
+
+ if (elems->ds_params && elems->ds_params_len == 1)
+ freq = ieee80211_channel_to_frequency(elems->ds_params[0],
+@@ -275,7 +298,10 @@ static void ieee80211_rx_bss_info(struct
+
+ channel = ieee80211_get_channel(local->hw.wiphy, freq);
+
+- if (!channel || channel->flags & IEEE80211_CHAN_DISABLED)
++ if (!channel ||
++ channel->flags & (IEEE80211_CHAN_DISABLED ||
++ IEEE80211_CHAN_NO_IBSS ||
++ IEEE80211_CHAN_RADAR))
+ return;
+
+ if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
+@@ -313,8 +339,41 @@ static void ieee80211_rx_bss_info(struct
+ GFP_ATOMIC);
+ }
+
+- if (sta && elems->wmm_info)
+- set_sta_flag(sta, WLAN_STA_WME);
++ if (sta) {
++ if (elems->wmm_info)
++ set_sta_flag(sta, WLAN_STA_WME);
++
++ /* we both use HT */
++ if (elems->ht_info_elem && elems->ht_cap_elem &&
++ sdata->u.ibss.channel_type) {
++ enum nl80211_channel_type channel_type =
++ ieee80211_ht_info_to_channel_type(
++ elems->ht_info_elem);
++ struct ieee80211_sta_ht_cap sta_ht_cap_new;
++
++ /*
++ * fall back to HT20 if we don't use or use
++ * the other extension channel
++ */
++ if (channel_type > NL80211_CHAN_HT20 &&
++ channel_type != sdata->u.ibss.channel_type)
++ channel_type = NL80211_CHAN_HT20;
++
++ ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
++ elems->ht_cap_elem,
++ &sta_ht_cap_new);
++ if (memcmp(&sta->sta.ht_cap, &sta_ht_cap_new,
++ sizeof(sta_ht_cap_new))) {
++ memcpy(&sta->sta.ht_cap,
++ &sta_ht_cap_new,
++ sizeof(sta_ht_cap_new));
++ rate_control_rate_update(local, sband,
++ sta,
++ IEEE80211_RC_HT_CHANGED,
++ channel_type);
++ }
++ }
++ }
+
+ rcu_read_unlock();
+ }
+@@ -896,10 +955,15 @@ int ieee80211_ibss_join(struct ieee80211
+ struct sk_buff *skb;
+
+ skb = dev_alloc_skb(sdata->local->hw.extra_tx_headroom +
+- 36 /* bitrates */ +
+- 34 /* SSID */ +
+- 3 /* DS params */ +
+- 4 /* IBSS params */ +
++ sizeof(struct ieee80211_hdr_3addr) +
++ 12 /* struct ieee80211_mgmt.u.beacon */ +
++ 2 + IEEE80211_MAX_SSID_LEN /* max SSID */ +
++ 2 + 8 /* max Supported Rates */ +
++ 3 /* max DS params */ +
++ 4 /* IBSS params */ +
++ 2 + (IEEE80211_MAX_SUPP_RATES - 8) +
++ 2 + sizeof(struct ieee80211_ht_cap) +
++ 2 + sizeof(struct ieee80211_ht_info) +
+ params->ie_len);
+ if (!skb)
+ return -ENOMEM;
+@@ -920,13 +984,15 @@ int ieee80211_ibss_join(struct ieee80211
+ sdata->vif.bss_conf.beacon_int = params->beacon_interval;
+
+ sdata->u.ibss.channel = params->channel;
++ sdata->u.ibss.channel_type = params->channel_type;
+ sdata->u.ibss.fixed_channel = params->channel_fixed;
+
+ /* fix ourselves to that channel now already */
+ if (params->channel_fixed) {
+ sdata->local->oper_channel = params->channel;
+- WARN_ON(!ieee80211_set_channel_type(sdata->local, sdata,
+- NL80211_CHAN_NO_HT));
++ if (!ieee80211_set_channel_type(sdata->local, sdata,
++ params->channel_type))
++ return -EINVAL;
+ }
+
+ if (params->ie) {
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -465,6 +465,7 @@ struct ieee80211_if_ibss {
+ u8 ssid_len, ie_len;
+ u8 *ie;
+ struct ieee80211_channel *channel;
++ enum nl80211_channel_type channel_type;
+
+ unsigned long ibss_join_req;
+ /* probe response/beacon for IBSS */
+@@ -1339,6 +1340,12 @@ void ieee80211_recalc_smps(struct ieee80
+ size_t ieee80211_ie_split(const u8 *ies, size_t ielen,
+ const u8 *ids, int n_ids, size_t offset);
+ size_t ieee80211_ie_split_vendor(const u8 *ies, size_t ielen, size_t offset);
++u8 *ieee80211_ie_build_ht_cap(u8 *pos, struct ieee80211_supported_band *sband,
++ u16 cap);
++u8 *ieee80211_ie_build_ht_info(u8 *pos,
++ struct ieee80211_sta_ht_cap *ht_cap,
++ struct ieee80211_channel *channel,
++ enum nl80211_channel_type channel_type);
+
+ /* internal work items */
+ void ieee80211_work_init(struct ieee80211_local *local);
+@@ -1367,6 +1374,8 @@ ieee80211_get_channel_mode(struct ieee80
+ bool ieee80211_set_channel_type(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ enum nl80211_channel_type chantype);
++enum nl80211_channel_type
++ieee80211_ht_info_to_channel_type(struct ieee80211_ht_info *ht_info);
+
+ #ifdef CONFIG_MAC80211_NOINLINE
+ #define debug_noinline noinline
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
- goto err_del_interface;
- }
-
-- /* no locking required since STA is not live yet */
-- sta->flags |= WLAN_STA_AUTHORIZED;
+- /* no atomic bitop required since STA is not live yet */
+- set_sta_flag(sta, WLAN_STA_AUTHORIZED);
-
- res = sta_info_insert(sta);
- if (res) {
err_stop:
if (!local->open_count)
drv_stop(local);
-@@ -718,6 +695,70 @@ static void ieee80211_if_setup(struct ne
+@@ -716,6 +693,70 @@ static void ieee80211_if_setup(struct ne
dev->destructor = free_netdev;
}
+ elems.ht_cap_elem, &sta->sta.ht_cap);
+
+ if (elems.wmm_param)
-+ set_sta_flags(sta, WLAN_STA_WME);
++ set_sta_flag(sta, WLAN_STA_WME);
+
+ if (new) {
-+ sta->flags = WLAN_STA_AUTHORIZED;
++ set_sta_flag(sta, WLAN_STA_AUTHORIZED);
+ rate_control_rate_init(sta);
+ sta_info_insert_rcu(sta);
+ }
static void ieee80211_iface_work(struct work_struct *work)
{
struct ieee80211_sub_if_data *sdata =
-@@ -822,6 +863,9 @@ static void ieee80211_iface_work(struct
+@@ -820,6 +861,9 @@ static void ieee80211_iface_work(struct
break;
ieee80211_mesh_rx_queued_mgmt(sdata, skb);
break;
break;
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -2137,7 +2137,8 @@ ieee80211_rx_h_action(struct ieee80211_r
+@@ -2211,7 +2211,9 @@ ieee80211_rx_h_action(struct ieee80211_r
*/
if (sdata->vif.type != NL80211_IFTYPE_STATION &&
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
- sdata->vif.type != NL80211_IFTYPE_AP)
+ sdata->vif.type != NL80211_IFTYPE_AP &&
++ sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+ sdata->vif.type != NL80211_IFTYPE_WDS)
break;
/* verify action_code is present */
-@@ -2335,13 +2336,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+@@ -2426,13 +2428,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
if (!ieee80211_vif_is_mesh(&sdata->vif) &&
sdata->vif.type != NL80211_IFTYPE_ADHOC &&
break;
case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
-@@ -2680,10 +2682,16 @@ static int prepare_for_handlers(struct i
+@@ -2775,10 +2778,16 @@ static int prepare_for_handlers(struct i
}
break;
case NL80211_IFTYPE_WDS:
/* should never get here */
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
-@@ -31,7 +31,6 @@
+@@ -32,7 +32,6 @@
* frames.
* @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP.
* @WLAN_STA_WME: Station is a QoS-STA.
* @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
* IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
* frame to this station is transmitted.
-@@ -54,7 +53,6 @@ enum ieee80211_sta_info_flags {
- WLAN_STA_SHORT_PREAMBLE = 1<<4,
- WLAN_STA_ASSOC_AP = 1<<5,
- WLAN_STA_WME = 1<<6,
-- WLAN_STA_WDS = 1<<7,
- WLAN_STA_CLEAR_PS_FILT = 1<<9,
- WLAN_STA_MFP = 1<<10,
- WLAN_STA_BLOCK_BA = 1<<11,
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -360,6 +360,7 @@ void ath_beacon_tasklet(unsigned long da
- struct ath_common *common = ath9k_hw_common(ah);
- struct ath_buf *bf = NULL;
- struct ieee80211_vif *vif;
-+ struct ath_tx_status ts;
- int slot;
- u32 bfaddr, bc = 0;
-
-@@ -384,7 +385,9 @@ void ath_beacon_tasklet(unsigned long da
- ath_dbg(common, ATH_DBG_BSTUCK,
- "beacon is officially stuck\n");
- sc->sc_flags |= SC_OP_TSF_RESET;
-+ spin_lock(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock(&sc->sc_pcu_lock);
- }
-
- return;
-@@ -464,6 +467,11 @@ void ath_beacon_tasklet(unsigned long da
- ath9k_hw_txstart(ah, sc->beacon.beaconq);
-
- sc->beacon.ast_be_xmit += bc; /* XXX per-vif? */
-+ if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
-+ spin_lock_bh(&sc->sc_pcu_lock);
-+ ath9k_hw_txprocdesc(ah, bf->bf_desc, (void *)&ts);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
-+ }
- }
- }
-
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -617,8 +617,11 @@ void ath_hw_check(struct work_struct *wo
- ath_dbg(common, ATH_DBG_RESET, "Possible baseband hang, "
- "busy=%d (try %d)\n", busy, sc->hw_busy_count + 1);
- if (busy >= 99) {
-- if (++sc->hw_busy_count >= 3)
-+ if (++sc->hw_busy_count >= 3) {
-+ spin_lock_bh(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
-+ }
- } else if (busy >= 0)
- sc->hw_busy_count = 0;
-
-@@ -637,7 +640,9 @@ static void ath_hw_pll_rx_hang_check(str
- /* Rx is hung for more than 500ms. Reset it */
- ath_dbg(common, ATH_DBG_RESET,
- "Possible RX hang, resetting");
-+ spin_lock_bh(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
- count = 0;
- }
- } else
-@@ -674,7 +679,9 @@ void ath9k_tasklet(unsigned long data)
-
- if ((status & ATH9K_INT_FATAL) ||
- (status & ATH9K_INT_BB_WATCHDOG)) {
-+ spin_lock(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock(&sc->sc_pcu_lock);
- return;
- }
-
-@@ -980,7 +987,6 @@ int ath_reset(struct ath_softc *sc, bool
- del_timer_sync(&common->ani.timer);
-
- ath9k_ps_wakeup(sc);
-- spin_lock_bh(&sc->sc_pcu_lock);
-
- ieee80211_stop_queues(hw);
-
-@@ -1023,7 +1029,6 @@ int ath_reset(struct ath_softc *sc, bool
+@@ -61,7 +60,6 @@ enum ieee80211_sta_info_flags {
+ WLAN_STA_SHORT_PREAMBLE,
+ WLAN_STA_ASSOC_AP,
+ WLAN_STA_WME,
+- WLAN_STA_WDS,
+ WLAN_STA_CLEAR_PS_FILT,
+ WLAN_STA_MFP,
+ WLAN_STA_BLOCK_BA,
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -836,23 +836,8 @@ int ieee80211_build_preq_ies(struct ieee
+ offset = noffset;
}
- ieee80211_wake_queues(hw);
-- spin_unlock_bh(&sc->sc_pcu_lock);
-
- /* Start ANI */
- if (!common->disable_ani)
-@@ -2326,9 +2331,9 @@ static void ath9k_flush(struct ieee80211
- ath9k_ps_wakeup(sc);
- spin_lock_bh(&sc->sc_pcu_lock);
- drain_txq = ath_drain_all_txq(sc, false);
-- spin_unlock_bh(&sc->sc_pcu_lock);
- if (!drain_txq)
- ath_reset(sc, false);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
- ath9k_ps_restore(sc);
- ieee80211_wake_queues(hw);
-
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -565,11 +565,8 @@ static void ath_tx_complete_aggr(struct
-
- rcu_read_unlock();
-
-- if (needreset) {
-- spin_unlock_bh(&sc->sc_pcu_lock);
-+ if (needreset)
- ath_reset(sc, false);
-- spin_lock_bh(&sc->sc_pcu_lock);
+- if (sband->ht_cap.ht_supported) {
+- u16 cap = sband->ht_cap.cap;
+- __le16 tmp;
+-
+- *pos++ = WLAN_EID_HT_CAPABILITY;
+- *pos++ = sizeof(struct ieee80211_ht_cap);
+- memset(pos, 0, sizeof(struct ieee80211_ht_cap));
+- tmp = cpu_to_le16(cap);
+- memcpy(pos, &tmp, sizeof(u16));
+- pos += sizeof(u16);
+- *pos++ = sband->ht_cap.ampdu_factor |
+- (sband->ht_cap.ampdu_density <<
+- IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT);
+- memcpy(pos, &sband->ht_cap.mcs, sizeof(sband->ht_cap.mcs));
+- pos += sizeof(sband->ht_cap.mcs);
+- pos += 2 + 4 + 1; /* ext info, BF cap, antsel */
- }
- }
-
- static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
-@@ -664,7 +661,8 @@ static int ath_compute_num_delims(struct
- * TODO - this could be improved to be dependent on the rate.
- * The hardware can keep up at lower rates, but not higher rates
- */
-- if (fi->keyix != ATH9K_TXKEYIX_INVALID)
-+ if ((fi->keyix != ATH9K_TXKEYIX_INVALID) &&
-+ !(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA))
- ndelim += ATH_AGGR_ENCRYPTDELIM;
++ if (sband->ht_cap.ht_supported)
++ pos = ieee80211_ie_build_ht_cap(pos, sband, sband->ht_cap.cap);
/*
-@@ -2169,7 +2167,9 @@ static void ath_tx_complete_poll_work(st
- if (needreset) {
- ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
- "tx hung, resetting the chip\n");
-+ spin_lock_bh(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
+ * If adding more here, adjust code in main.c
+@@ -1443,3 +1428,100 @@ int ieee80211_add_ext_srates_ie(struct i
}
-
- ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
---- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-@@ -236,7 +236,7 @@ static void ar9003_paprd_get_gain_table(
- memset(entry, 0, sizeof(ah->paprd_gain_table_entries));
- memset(index, 0, sizeof(ah->paprd_gain_table_index));
-
-- for (i = 0; i < 32; i++) {
-+ for (i = 0; i < PAPRD_GAIN_TABLE_ENTRIES; i++) {
- entry[i] = REG_READ(ah, reg);
- index[i] = (entry[i] >> 24) & 0xff;
- reg += 4;
-@@ -246,13 +246,13 @@ static void ar9003_paprd_get_gain_table(
- static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,
- int target_power)
- {
-- int olpc_gain_delta = 0;
-+ int olpc_gain_delta = 0, cl_gain_mod;
- int alpha_therm, alpha_volt;
- int therm_cal_value, volt_cal_value;
- int therm_value, volt_value;
- int thermal_gain_corr, voltage_gain_corr;
- int desired_scale, desired_gain = 0;
-- u32 reg;
-+ u32 reg_olpc = 0, reg_cl_gain = 0;
-
- REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
- AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
-@@ -271,15 +271,29 @@ static unsigned int ar9003_get_desired_g
- volt_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
- AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE);
-
-- if (chain == 0)
-- reg = AR_PHY_TPC_11_B0;
-- else if (chain == 1)
-- reg = AR_PHY_TPC_11_B1;
-- else
-- reg = AR_PHY_TPC_11_B2;
-+ switch (chain) {
-+ case 0:
-+ reg_olpc = AR_PHY_TPC_11_B0;
-+ reg_cl_gain = AR_PHY_CL_TAB_0;
-+ break;
-+ case 1:
-+ reg_olpc = AR_PHY_TPC_11_B1;
-+ reg_cl_gain = AR_PHY_CL_TAB_1;
+ return 0;
+ }
++
++u8 *ieee80211_ie_build_ht_cap(u8 *pos, struct ieee80211_supported_band *sband,
++ u16 cap)
++{
++ __le16 tmp;
++
++ *pos++ = WLAN_EID_HT_CAPABILITY;
++ *pos++ = sizeof(struct ieee80211_ht_cap);
++ memset(pos, 0, sizeof(struct ieee80211_ht_cap));
++
++ /* capability flags */
++ tmp = cpu_to_le16(cap);
++ memcpy(pos, &tmp, sizeof(u16));
++ pos += sizeof(u16);
++
++ /* AMPDU parameters */
++ *pos++ = sband->ht_cap.ampdu_factor |
++ (sband->ht_cap.ampdu_density <<
++ IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT);
++
++ /* MCS set */
++ memcpy(pos, &sband->ht_cap.mcs, sizeof(sband->ht_cap.mcs));
++ pos += sizeof(sband->ht_cap.mcs);
++
++ /* extended capabilities */
++ pos += sizeof(__le16);
++
++ /* BF capabilities */
++ pos += sizeof(__le32);
++
++ /* antenna selection */
++ pos += sizeof(u8);
++
++ return pos;
++}
++
++u8 *ieee80211_ie_build_ht_info(u8 *pos,
++ struct ieee80211_sta_ht_cap *ht_cap,
++ struct ieee80211_channel *channel,
++ enum nl80211_channel_type channel_type)
++{
++ struct ieee80211_ht_info *ht_info;
++ /* Build HT Information */
++ *pos++ = WLAN_EID_HT_INFORMATION;
++ *pos++ = sizeof(struct ieee80211_ht_info);
++ ht_info = (struct ieee80211_ht_info *)pos;
++ ht_info->control_chan =
++ ieee80211_frequency_to_channel(channel->center_freq);
++ switch (channel_type) {
++ case NL80211_CHAN_HT40MINUS:
++ ht_info->ht_param = IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+ break;
-+ case 2:
-+ reg_olpc = AR_PHY_TPC_11_B2;
-+ reg_cl_gain = AR_PHY_CL_TAB_2;
++ case NL80211_CHAN_HT40PLUS:
++ ht_info->ht_param = IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+ break;
++ case NL80211_CHAN_HT20:
+ default:
-+ ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,
-+ "Invalid chainmask: %d\n", chain);
++ ht_info->ht_param = IEEE80211_HT_PARAM_CHA_SEC_NONE;
+ break;
+ }
-
-- olpc_gain_delta = REG_READ_FIELD(ah, reg,
-+ olpc_gain_delta = REG_READ_FIELD(ah, reg_olpc,
- AR_PHY_TPC_11_OLPC_GAIN_DELTA);
-+ cl_gain_mod = REG_READ_FIELD(ah, reg_cl_gain,
-+ AR_PHY_CL_TAB_CL_GAIN_MOD);
-
- if (olpc_gain_delta >= 128)
- olpc_gain_delta = olpc_gain_delta - 256;
-@@ -289,7 +303,7 @@ static unsigned int ar9003_get_desired_g
- voltage_gain_corr = (alpha_volt * (volt_value - volt_cal_value) +
- (128 / 2)) / 128;
- desired_gain = target_power - olpc_gain_delta - thermal_gain_corr -
-- voltage_gain_corr + desired_scale;
-+ voltage_gain_corr + desired_scale + cl_gain_mod;
-
- return desired_gain;
- }
-@@ -727,7 +741,7 @@ int ar9003_paprd_setup_gain_table(struct
- desired_gain = ar9003_get_desired_gain(ah, chain, train_power);
-
- gain_index = 0;
-- for (i = 0; i < 32; i++) {
-+ for (i = 0; i < PAPRD_GAIN_TABLE_ENTRIES; i++) {
- if (ah->paprd_gain_table_index[i] >= desired_gain)
- break;
- gain_index++;
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -1121,6 +1121,9 @@
- #define AR_PHY_POWERTX_RATE8_POWERTXHT40_5 0x3F00
- #define AR_PHY_POWERTX_RATE8_POWERTXHT40_5_S 8
-
-+#define AR_PHY_CL_TAB_CL_GAIN_MOD 0x1f
-+#define AR_PHY_CL_TAB_CL_GAIN_MOD_S 0
-+
- void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
-
- #endif /* AR9003_PHY_H */
---- a/drivers/net/wireless/ath/ath5k/eeprom.c
-+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
-@@ -691,14 +691,12 @@ ath5k_eeprom_free_pcal_info(struct ath5k
- if (!chinfo[pier].pd_curves)
- continue;
-
-- for (pdg = 0; pdg < ee->ee_pd_gains[mode]; pdg++) {
-+ for (pdg = 0; pdg < AR5K_EEPROM_N_PD_CURVES; pdg++) {
- struct ath5k_pdgain_info *pd =
- &chinfo[pier].pd_curves[pdg];
-
-- if (pd != NULL) {
-- kfree(pd->pd_step);
-- kfree(pd->pd_pwr);
-- }
-+ kfree(pd->pd_step);
-+ kfree(pd->pd_pwr);
- }
-
- kfree(chinfo[pier].pd_curves);
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-@@ -229,6 +229,7 @@ static void ar9003_hw_fill_txdesc(struct
- static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
- struct ath_tx_status *ts)
- {
-+ struct ar9003_txc *txc = (struct ar9003_txc *) ds;
- struct ar9003_txs *ads;
- u32 status;
-
-@@ -238,7 +239,11 @@ static int ar9003_hw_proc_txdesc(struct
- if ((status & AR_TxDone) == 0)
- return -EINPROGRESS;
-
-- ah->ts_tail = (ah->ts_tail + 1) % ah->ts_size;
-+ ts->qid = MS(ads->ds_info, AR_TxQcuNum);
-+ if (!txc || (MS(txc->info, AR_TxQcuNum) == ts->qid))
-+ ah->ts_tail = (ah->ts_tail + 1) % ah->ts_size;
-+ else
-+ return -ENOENT;
-
- if ((MS(ads->ds_info, AR_DescId) != ATHEROS_VENDOR_ID) ||
- (MS(ads->ds_info, AR_TxRxDesc) != 1)) {
-@@ -254,7 +259,6 @@ static int ar9003_hw_proc_txdesc(struct
- ts->ts_seqnum = MS(status, AR_SeqNum);
- ts->tid = MS(status, AR_TxTid);
-
-- ts->qid = MS(ads->ds_info, AR_TxQcuNum);
- ts->desc_id = MS(ads->status1, AR_TxDescId);
- ts->ts_tstamp = ads->status4;
- ts->ts_status = 0;
---- a/net/mac80211/wpa.c
-+++ b/net/mac80211/wpa.c
-@@ -15,6 +15,7 @@
- #include <linux/gfp.h>
- #include <asm/unaligned.h>
- #include <net/mac80211.h>
-+#include <crypto/aes.h>
-
- #include "ieee80211_i.h"
- #include "michael.h"
-@@ -86,6 +87,11 @@ ieee80211_rx_h_michael_mic_verify(struct
- struct sk_buff *skb = rx->skb;
- struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-+ int queue = rx->queue;
++ if (ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
++ ht_info->ht_param |= IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;
++ ht_info->operation_mode = 0x0000;
++ ht_info->stbc_param = 0x0000;
+
-+ /* otherwise, TKIP is vulnerable to TID 0 vs. non-QoS replays */
-+ if (rx->queue == NUM_RX_DATA_QUEUES - 1)
-+ queue = 0;
-
- /*
- * it makes no sense to check for MIC errors on anything other
-@@ -148,8 +154,8 @@ ieee80211_rx_h_michael_mic_verify(struct
-
- update_iv:
- /* update IV in key information to be able to detect replays */
-- rx->key->u.tkip.rx[rx->queue].iv32 = rx->tkip_iv32;
-- rx->key->u.tkip.rx[rx->queue].iv16 = rx->tkip_iv16;
-+ rx->key->u.tkip.rx[queue].iv32 = rx->tkip_iv32;
-+ rx->key->u.tkip.rx[queue].iv16 = rx->tkip_iv16;
-
- return RX_CONTINUE;
-
-@@ -165,6 +171,7 @@ static int tkip_encrypt_skb(struct ieee8
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
- struct ieee80211_key *key = tx->key;
- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-+ unsigned long flags;
- unsigned int hdrlen;
- int len, tail;
- u8 *pos;
-@@ -192,11 +199,12 @@ static int tkip_encrypt_skb(struct ieee8
- pos += hdrlen;
-
- /* Increase IV for the frame */
-+ spin_lock_irqsave(&key->u.tkip.txlock, flags);
- key->u.tkip.tx.iv16++;
- if (key->u.tkip.tx.iv16 == 0)
- key->u.tkip.tx.iv32++;
--
-- pos = ieee80211_tkip_add_iv(pos, key, key->u.tkip.tx.iv16);
-+ pos = ieee80211_tkip_add_iv(pos, key);
-+ spin_unlock_irqrestore(&key->u.tkip.txlock, flags);
-
- /* hwaccel - with software IV */
- if (info->control.hw_key)
-@@ -205,9 +213,8 @@ static int tkip_encrypt_skb(struct ieee8
- /* Add room for ICV */
- skb_put(skb, TKIP_ICV_LEN);
-
-- hdr = (struct ieee80211_hdr *) skb->data;
- return ieee80211_tkip_encrypt_data(tx->local->wep_tx_tfm,
-- key, pos, len, hdr->addr2);
-+ key, skb, pos, len);
- }
-
-
-@@ -235,6 +242,11 @@ ieee80211_crypto_tkip_decrypt(struct iee
- struct ieee80211_key *key = rx->key;
- struct sk_buff *skb = rx->skb;
- struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
-+ int queue = rx->queue;
++ /* It seems that Basic MCS set and Supported MCS set
++ are identical for the first 10 bytes */
++ memset(&ht_info->basic_set, 0, 16);
++ memcpy(&ht_info->basic_set, &ht_cap->mcs, 10);
+
-+ /* otherwise, TKIP is vulnerable to TID 0 vs. non-QoS replays */
-+ if (rx->queue == NUM_RX_DATA_QUEUES - 1)
-+ queue = 0;
-
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-
-@@ -255,7 +267,7 @@ ieee80211_crypto_tkip_decrypt(struct iee
- res = ieee80211_tkip_decrypt_data(rx->local->wep_rx_tfm,
- key, skb->data + hdrlen,
- skb->len - hdrlen, rx->sta->sta.addr,
-- hdr->addr1, hwaccel, rx->queue,
-+ hdr->addr1, hwaccel, queue,
- &rx->tkip_iv32,
- &rx->tkip_iv16);
- if (res != TKIP_DECRYPT_OK)
-@@ -283,6 +295,8 @@ static void ccmp_special_blocks(struct s
- unsigned int hdrlen;
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-
-+ memset(scratch, 0, 6 * AES_BLOCK_LEN);
++ return pos + sizeof(struct ieee80211_ht_info);
++}
+
- b_0 = scratch + 3 * AES_BLOCK_LEN;
- aad = scratch + 4 * AES_BLOCK_LEN;
-
-@@ -373,8 +387,10 @@ static int ccmp_encrypt_skb(struct ieee8
- struct ieee80211_key *key = tx->key;
- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- int hdrlen, len, tail;
-- u8 *pos, *pn;
-- int i;
-+ u8 *pos;
-+ u8 pn[6];
-+ u64 pn64;
-+ u8 scratch[6 * AES_BLOCK_LEN];
-
- if (info->control.hw_key &&
- !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV)) {
-@@ -402,14 +418,14 @@ static int ccmp_encrypt_skb(struct ieee8
- hdr = (struct ieee80211_hdr *) pos;
- pos += hdrlen;
-
-- /* PN = PN + 1 */
-- pn = key->u.ccmp.tx_pn;
-+ pn64 = atomic64_inc_return(&key->u.ccmp.tx_pn);
-
-- for (i = CCMP_PN_LEN - 1; i >= 0; i--) {
-- pn[i]++;
-- if (pn[i])
-- break;
-- }
-+ pn[5] = pn64;
-+ pn[4] = pn64 >> 8;
-+ pn[3] = pn64 >> 16;
-+ pn[2] = pn64 >> 24;
-+ pn[1] = pn64 >> 32;
-+ pn[0] = pn64 >> 40;
-
- ccmp_pn2hdr(pos, pn, key->conf.keyidx);
-
-@@ -418,8 +434,8 @@ static int ccmp_encrypt_skb(struct ieee8
- return 0;
-
- pos += CCMP_HDR_LEN;
-- ccmp_special_blocks(skb, pn, key->u.ccmp.tx_crypto_buf, 0);
-- ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, key->u.ccmp.tx_crypto_buf, pos, len,
-+ ccmp_special_blocks(skb, pn, scratch, 0);
-+ ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, scratch, pos, len,
- pos, skb_put(skb, CCMP_MIC_LEN));
-
- return 0;
-@@ -475,11 +491,12 @@ ieee80211_crypto_ccmp_decrypt(struct iee
- }
-
- if (!(status->flag & RX_FLAG_DECRYPTED)) {
-+ u8 scratch[6 * AES_BLOCK_LEN];
- /* hardware didn't decrypt/verify MIC */
-- ccmp_special_blocks(skb, pn, key->u.ccmp.rx_crypto_buf, 1);
-+ ccmp_special_blocks(skb, pn, scratch, 1);
-
- if (ieee80211_aes_ccm_decrypt(
-- key->u.ccmp.tfm, key->u.ccmp.rx_crypto_buf,
-+ key->u.ccmp.tfm, scratch,
- skb->data + hdrlen + CCMP_HDR_LEN, data_len,
- skb->data + skb->len - CCMP_MIC_LEN,
- skb->data + hdrlen + CCMP_HDR_LEN))
---- a/drivers/net/wireless/b43/xmit.c
-+++ b/drivers/net/wireless/b43/xmit.c
-@@ -323,8 +323,7 @@ int b43_generate_txhdr(struct b43_wldev
- /* we give the phase1key and iv16 here, the key is stored in
- * shm. With that the hardware can do phase 2 and encryption.
- */
-- ieee80211_get_tkip_key(info->control.hw_key, skb_frag,
-- IEEE80211_TKIP_P1_KEY, (u8*)phase1key);
-+ ieee80211_get_tkip_p1k(info->control.hw_key, skb_frag, phase1key);
- /* phase1key is in host endian. Copy to little-endian txhdr->iv. */
- for (i = 0; i < 5; i++) {
- txhdr->iv[i * 2 + 0] = phase1key[i];
---- a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
-+++ b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
-@@ -240,8 +240,7 @@ static void iwl4965_tx_cmd_build_hwcrypt
-
- case WLAN_CIPHER_SUITE_TKIP:
- tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
-- ieee80211_get_tkip_key(keyconf, skb_frag,
-- IEEE80211_TKIP_P2_KEY, tx_cmd->key);
-+ ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
- IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");
- break;
-
---- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
-@@ -497,8 +497,7 @@ static void iwlagn_tx_cmd_build_hwcrypto
-
- case WLAN_CIPHER_SUITE_TKIP:
- tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
-- ieee80211_get_tkip_key(keyconf, skb_frag,
-- IEEE80211_TKIP_P2_KEY, tx_cmd->key);
-+ ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
- IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");
- break;
-
---- a/include/net/mac80211.h
-+++ b/include/net/mac80211.h
-@@ -960,21 +960,6 @@ enum sta_notify_cmd {
- };
-
- /**
-- * enum ieee80211_tkip_key_type - get tkip key
-- *
-- * Used by drivers which need to get a tkip key for skb. Some drivers need a
-- * phase 1 key, others need a phase 2 key. A single function allows the driver
-- * to get the key, this enum indicates what type of key is required.
-- *
-- * @IEEE80211_TKIP_P1_KEY: the driver needs a phase 1 key
-- * @IEEE80211_TKIP_P2_KEY: the driver needs a phase 2 key
-- */
--enum ieee80211_tkip_key_type {
-- IEEE80211_TKIP_P1_KEY,
-- IEEE80211_TKIP_P2_KEY,
--};
--
--/**
- * enum ieee80211_hw_flags - hardware flags
- *
- * These flags are used to indicate hardware capabilities to
-@@ -2568,21 +2553,33 @@ struct sk_buff *
- ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
-
- /**
-- * ieee80211_get_tkip_key - get a TKIP rc4 for skb
-+ * ieee80211_get_tkip_p1k - get a TKIP phase 1 key
-+ *
-+ * This function returns the TKIP phase 1 key for the IV32 taken
-+ * from the given packet.
-+ *
-+ * @keyconf: the parameter passed with the set key
-+ * @skb: the packet to take the IV32 value from that will be encrypted
-+ * with this P1K
-+ * @p1k: a buffer to which the key will be written, as 5 u16 values
-+ */
-+void ieee80211_get_tkip_p1k(struct ieee80211_key_conf *keyconf,
-+ struct sk_buff *skb, u16 *p1k);
++enum nl80211_channel_type
++ieee80211_ht_info_to_channel_type(struct ieee80211_ht_info *ht_info)
++{
++ enum nl80211_channel_type channel_type;
+
-+/**
-+ * ieee80211_get_tkip_p2k - get a TKIP phase 2 key
- *
-- * This function computes a TKIP rc4 key for an skb. It computes
-- * a phase 1 key if needed (iv16 wraps around). This function is to
-- * be used by drivers which can do HW encryption but need to compute
-- * to phase 1/2 key in SW.
-+ * This function computes the TKIP RC4 key for the IV values
-+ * in the packet.
- *
- * @keyconf: the parameter passed with the set key
-- * @skb: the skb for which the key is needed
-- * @type: TBD
-- * @key: a buffer to which the key will be written
-- */
--void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
-- struct sk_buff *skb,
-- enum ieee80211_tkip_key_type type, u8 *key);
-+ * @skb: the packet to take the IV32/IV16 values from that will be
-+ * encrypted with this key
-+ * @p2k: a buffer to which the key will be written, 16 bytes
-+ */
-+void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf,
-+ struct sk_buff *skb, u8 *p2k);
++ if (!ht_info)
++ return NL80211_CHAN_NO_HT;
+
- /**
- * ieee80211_wake_queue - wake specific queue
- * @hw: pointer as obtained from ieee80211_alloc_hw().
---- a/net/mac80211/key.c
-+++ b/net/mac80211/key.c
-@@ -333,6 +333,7 @@ struct ieee80211_key *ieee80211_key_allo
- get_unaligned_le16(seq);
- }
- }
-+ spin_lock_init(&key->u.tkip.txlock);
- break;
- case WLAN_CIPHER_SUITE_CCMP:
- key->conf.iv_len = CCMP_HDR_LEN;
---- a/net/mac80211/key.h
-+++ b/net/mac80211/key.h
-@@ -52,9 +52,10 @@ enum ieee80211_internal_tkip_state {
- };
-
- struct tkip_ctx {
-- u32 iv32;
-- u16 iv16;
-- u16 p1k[5];
-+ u32 iv32; /* current iv32 */
-+ u16 iv16; /* current iv16 */
-+ u16 p1k[5]; /* p1k cache */
-+ u32 p1k_iv32; /* iv32 for which p1k computed */
- enum ieee80211_internal_tkip_state state;
- };
-
-@@ -71,6 +72,9 @@ struct ieee80211_key {
-
- union {
- struct {
-+ /* protects tx context */
-+ spinlock_t txlock;
++ switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
++ case IEEE80211_HT_PARAM_CHA_SEC_NONE:
++ channel_type = NL80211_CHAN_HT20;
++ break;
++ case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
++ channel_type = NL80211_CHAN_HT40PLUS;
++ break;
++ case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
++ channel_type = NL80211_CHAN_HT40MINUS;
++ break;
++ default:
++ channel_type = NL80211_CHAN_NO_HT;
++ }
+
- /* last used TSC */
- struct tkip_ctx tx;
++ return channel_type;
++}
+--- a/net/mac80211/work.c
++++ b/net/mac80211/work.c
+@@ -118,7 +118,6 @@ static void ieee80211_add_ht_ie(struct s
+ u8 *pos;
+ u32 flags = channel->flags;
+ u16 cap = sband->ht_cap.cap;
+- __le16 tmp;
-@@ -78,7 +82,7 @@ struct ieee80211_key {
- struct tkip_ctx rx[NUM_RX_DATA_QUEUES];
- } tkip;
- struct {
-- u8 tx_pn[6];
-+ atomic64_t tx_pn;
- /*
- * Last received packet number. The first
- * NUM_RX_DATA_QUEUES counters are used with Data
-@@ -88,12 +92,9 @@ struct ieee80211_key {
- u8 rx_pn[NUM_RX_DATA_QUEUES + 1][6];
- struct crypto_cipher *tfm;
- u32 replays; /* dot11RSNAStatsCCMPReplays */
-- /* scratch buffers for virt_to_page() (crypto API) */
- #ifndef AES_BLOCK_LEN
- #define AES_BLOCK_LEN 16
- #endif
-- u8 tx_crypto_buf[6 * AES_BLOCK_LEN];
-- u8 rx_crypto_buf[6 * AES_BLOCK_LEN];
- } ccmp;
- struct {
- u8 tx_pn[6];
---- a/net/mac80211/tkip.c
-+++ b/net/mac80211/tkip.c
-@@ -101,6 +101,7 @@ static void tkip_mixing_phase1(const u8
- p1k[4] += tkipS(p1k[3] ^ get_unaligned_le16(tk + 0 + j)) + i;
+ if (!sband->ht_cap.ht_supported)
+ return;
+@@ -169,34 +168,8 @@ static void ieee80211_add_ht_ie(struct s
}
- ctx->state = TKIP_STATE_PHASE1_DONE;
-+ ctx->p1k_iv32 = tsc_IV32;
- }
-
- static void tkip_mixing_phase2(const u8 *tk, struct tkip_ctx *ctx,
-@@ -140,60 +141,72 @@ static void tkip_mixing_phase2(const u8
- /* Add TKIP IV and Ext. IV at @pos. @iv0, @iv1, and @iv2 are the first octets
- * of the IV. Returns pointer to the octet following IVs (i.e., beginning of
- * the packet payload). */
--u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16)
-+u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key)
- {
-- pos = write_tkip_iv(pos, iv16);
-+ lockdep_assert_held(&key->u.tkip.txlock);
-+
-+ pos = write_tkip_iv(pos, key->u.tkip.tx.iv16);
- *pos++ = (key->conf.keyidx << 6) | (1 << 5) /* Ext IV */;
- put_unaligned_le32(key->u.tkip.tx.iv32, pos);
- return pos + 4;
- }
--void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
-- struct sk_buff *skb, enum ieee80211_tkip_key_type type,
-- u8 *outkey)
-+static void ieee80211_compute_tkip_p1k(struct ieee80211_key *key, u32 iv32)
- {
-- struct ieee80211_key *key = (struct ieee80211_key *)
-- container_of(keyconf, struct ieee80211_key, conf);
-- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-- u8 *data;
-- const u8 *tk;
-- struct tkip_ctx *ctx;
-- u16 iv16;
-- u32 iv32;
+ /* reserve and fill IE */
-
-- data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
-- iv16 = data[2] | (data[0] << 8);
-- iv32 = get_unaligned_le32(&data[4]);
+ pos = skb_put(skb, sizeof(struct ieee80211_ht_cap) + 2);
+- *pos++ = WLAN_EID_HT_CAPABILITY;
+- *pos++ = sizeof(struct ieee80211_ht_cap);
+- memset(pos, 0, sizeof(struct ieee80211_ht_cap));
-
-- tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
-- ctx = &key->u.tkip.tx;
+- /* capability flags */
+- tmp = cpu_to_le16(cap);
+- memcpy(pos, &tmp, sizeof(u16));
+- pos += sizeof(u16);
-
--#ifdef CONFIG_MAC80211_TKIP_DEBUG
-- printk(KERN_DEBUG "TKIP encrypt: iv16 = 0x%04x, iv32 = 0x%08x\n",
-- iv16, iv32);
-+ struct ieee80211_sub_if_data *sdata = key->sdata;
-+ struct tkip_ctx *ctx = &key->u.tkip.tx;
-+ const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
-
-- if (iv32 != ctx->iv32) {
-- printk(KERN_DEBUG "skb: iv32 = 0x%08x key: iv32 = 0x%08x\n",
-- iv32, ctx->iv32);
-- printk(KERN_DEBUG "Wrap around of iv16 in the middle of a "
-- "fragmented packet\n");
-- }
--#endif
-+ lockdep_assert_held(&key->u.tkip.txlock);
-
-- /* Update the p1k only when the iv16 in the packet wraps around, this
-- * might occur after the wrap around of iv16 in the key in case of
-- * fragmented packets. */
-- if (iv16 == 0 || ctx->state == TKIP_STATE_NOT_INIT)
-- tkip_mixing_phase1(tk, ctx, hdr->addr2, iv32);
-+ /*
-+ * Update the P1K when the IV32 is different from the value it
-+ * had when we last computed it (or when not initialised yet).
-+ * This might flip-flop back and forth if packets are processed
-+ * out-of-order due to the different ACs, but then we have to
-+ * just compute the P1K more often.
-+ */
-+ if (ctx->p1k_iv32 != iv32 || ctx->state == TKIP_STATE_NOT_INIT)
-+ tkip_mixing_phase1(tk, ctx, sdata->vif.addr, iv32);
-+}
-
-- if (type == IEEE80211_TKIP_P1_KEY) {
-- memcpy(outkey, ctx->p1k, sizeof(u16) * 5);
-- return;
-- }
-+void ieee80211_get_tkip_p1k(struct ieee80211_key_conf *keyconf,
-+ struct sk_buff *skb, u16 *p1k)
-+{
-+ struct ieee80211_key *key = (struct ieee80211_key *)
-+ container_of(keyconf, struct ieee80211_key, conf);
-+ struct tkip_ctx *ctx = &key->u.tkip.tx;
-+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-+ const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
-+ u32 iv32 = get_unaligned_le32(&data[4]);
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&key->u.tkip.txlock, flags);
-+ ieee80211_compute_tkip_p1k(key, iv32);
-+ memcpy(p1k, ctx->p1k, sizeof(ctx->p1k));
-+ spin_unlock_irqrestore(&key->u.tkip.txlock, flags);
-+}
-+EXPORT_SYMBOL(ieee80211_get_tkip_p1k);
+- /* AMPDU parameters */
+- *pos++ = sband->ht_cap.ampdu_factor |
+- (sband->ht_cap.ampdu_density <<
+- IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT);
+-
+- /* MCS set */
+- memcpy(pos, &sband->ht_cap.mcs, sizeof(sband->ht_cap.mcs));
+- pos += sizeof(sband->ht_cap.mcs);
+-
+- /* extended capabilities */
+- pos += sizeof(__le16);
+-
+- /* BF capabilities */
+- pos += sizeof(__le32);
+-
+- /* antenna selection */
+- pos += sizeof(u8);
++ ieee80211_ie_build_ht_cap(pos, sband, cap);
+ }
-- tkip_mixing_phase2(tk, ctx, iv16, outkey);
-+void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf,
-+ struct sk_buff *skb, u8 *p2k)
-+{
-+ struct ieee80211_key *key = (struct ieee80211_key *)
-+ container_of(keyconf, struct ieee80211_key, conf);
-+ const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
-+ struct tkip_ctx *ctx = &key->u.tkip.tx;
-+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-+ const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
-+ u32 iv32 = get_unaligned_le32(&data[4]);
-+ u16 iv16 = data[2] | (data[0] << 8);
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&key->u.tkip.txlock, flags);
-+ ieee80211_compute_tkip_p1k(key, iv32);
-+ tkip_mixing_phase2(tk, ctx, iv16, p2k);
-+ spin_unlock_irqrestore(&key->u.tkip.txlock, flags);
+ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
+--- a/net/wireless/chan.c
++++ b/net/wireless/chan.c
+@@ -44,9 +44,9 @@ rdev_freq_to_chan(struct cfg80211_regist
+ return chan;
}
--EXPORT_SYMBOL(ieee80211_get_tkip_key);
-+EXPORT_SYMBOL(ieee80211_get_tkip_p2k);
- /*
- * Encrypt packet payload with TKIP using @key. @pos is a pointer to the
-@@ -204,19 +217,15 @@ EXPORT_SYMBOL(ieee80211_get_tkip_key);
- */
- int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
- struct ieee80211_key *key,
-- u8 *pos, size_t payload_len, u8 *ta)
-+ struct sk_buff *skb,
-+ u8 *payload, size_t payload_len)
+-static bool can_beacon_sec_chan(struct wiphy *wiphy,
+- struct ieee80211_channel *chan,
+- enum nl80211_channel_type channel_type)
++bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
++ struct ieee80211_channel *chan,
++ enum nl80211_channel_type channel_type)
{
- u8 rc4key[16];
-- struct tkip_ctx *ctx = &key->u.tkip.tx;
-- const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
--
-- /* Calculate per-packet key */
-- if (ctx->iv16 == 0 || ctx->state == TKIP_STATE_NOT_INIT)
-- tkip_mixing_phase1(tk, ctx, ta, ctx->iv32);
-
-- tkip_mixing_phase2(tk, ctx, ctx->iv16, rc4key);
-+ ieee80211_get_tkip_p2k(&key->conf, skb, rc4key);
+ struct ieee80211_channel *sec_chan;
+ int diff;
+@@ -75,6 +75,7 @@ static bool can_beacon_sec_chan(struct w
-- return ieee80211_wep_encrypt_data(tfm, rc4key, 16, pos, payload_len);
-+ return ieee80211_wep_encrypt_data(tfm, rc4key, 16,
-+ payload, payload_len);
+ return true;
}
++EXPORT_SYMBOL(cfg80211_can_beacon_sec_chan);
+
+ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
+ struct wireless_dev *wdev, int freq,
+@@ -109,8 +110,8 @@ int cfg80211_set_freq(struct cfg80211_re
+ switch (channel_type) {
+ case NL80211_CHAN_HT40PLUS:
+ case NL80211_CHAN_HT40MINUS:
+- if (!can_beacon_sec_chan(&rdev->wiphy, chan,
+- channel_type)) {
++ if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, chan,
++ channel_type)) {
+ printk(KERN_DEBUG
+ "cfg80211: Secondary channel not "
+ "allowed to initiate communication\n");
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -4574,13 +4574,34 @@ static int nl80211_join_ibss(struct sk_b
+ ibss.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
+ }
- /* Decrypt packet payload with TKIP using @key. @pos is a pointer to the
---- a/net/mac80211/tkip.h
-+++ b/net/mac80211/tkip.h
-@@ -13,11 +13,13 @@
- #include <linux/crypto.h>
- #include "key.h"
-
--u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16);
-+u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key);
+- ibss.channel = ieee80211_get_channel(wiphy,
+- nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]));
++ if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
++ enum nl80211_channel_type channel_type;
++
++ channel_type = nla_get_u32(
++ info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
++ if (channel_type > NL80211_CHAN_HT40PLUS)
++ return -EINVAL;
++ ibss.channel_type = channel_type;
++ } else {
++ ibss.channel_type = NL80211_CHAN_NO_HT;
++ }
++
++ ibss.channel = rdev_freq_to_chan(rdev,
++ nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]),
++ ibss.channel_type);
+ if (!ibss.channel ||
++ ibss.channel->flags & IEEE80211_CHAN_RADAR ||
+ ibss.channel->flags & IEEE80211_CHAN_NO_IBSS ||
+ ibss.channel->flags & IEEE80211_CHAN_DISABLED)
+ return -EINVAL;
- int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
-- struct ieee80211_key *key,
-- u8 *pos, size_t payload_len, u8 *ta);
-+ struct ieee80211_key *key,
-+ struct sk_buff *skb,
-+ u8 *payload, size_t payload_len);
++ /* Both channels should be able to initiate communication */
++ if ((ibss.channel_type == NL80211_CHAN_HT40PLUS ||
++ ibss.channel_type == NL80211_CHAN_HT40MINUS) &&
++ !cfg80211_can_beacon_sec_chan(&rdev->wiphy, ibss.channel,
++ ibss.channel_type))
++ return -EINVAL;
+
- enum {
- TKIP_DECRYPT_OK = 0,
- TKIP_DECRYPT_NO_EXT_IV = -1,
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -209,6 +209,7 @@ static int ieee80211_get_key(struct wiph
- u8 seq[6] = {0};
- struct key_params params;
- struct ieee80211_key *key = NULL;
-+ u64 pn64;
- u32 iv32;
- u16 iv16;
- int err = -ENOENT;
-@@ -256,12 +257,13 @@ static int ieee80211_get_key(struct wiph
- params.seq_len = 6;
- break;
- case WLAN_CIPHER_SUITE_CCMP:
-- seq[0] = key->u.ccmp.tx_pn[5];
-- seq[1] = key->u.ccmp.tx_pn[4];
-- seq[2] = key->u.ccmp.tx_pn[3];
-- seq[3] = key->u.ccmp.tx_pn[2];
-- seq[4] = key->u.ccmp.tx_pn[1];
-- seq[5] = key->u.ccmp.tx_pn[0];
-+ pn64 = atomic64_read(&key->u.ccmp.tx_pn);
-+ seq[0] = pn64;
-+ seq[1] = pn64 >> 8;
-+ seq[2] = pn64 >> 16;
-+ seq[3] = pn64 >> 24;
-+ seq[4] = pn64 >> 32;
-+ seq[5] = pn64 >> 40;
- params.seq = seq;
- params.seq_len = 6;
- break;
---- a/net/mac80211/debugfs_key.c
-+++ b/net/mac80211/debugfs_key.c
-@@ -79,6 +79,7 @@ static ssize_t key_tx_spec_read(struct f
- size_t count, loff_t *ppos)
- {
- const u8 *tpn;
-+ u64 pn;
- char buf[20];
- int len;
- struct ieee80211_key *key = file->private_data;
-@@ -94,9 +95,10 @@ static ssize_t key_tx_spec_read(struct f
- key->u.tkip.tx.iv16);
- break;
- case WLAN_CIPHER_SUITE_CCMP:
-- tpn = key->u.ccmp.tx_pn;
-+ pn = atomic64_read(&key->u.ccmp.tx_pn);
- len = scnprintf(buf, sizeof(buf), "%02x%02x%02x%02x%02x%02x\n",
-- tpn[0], tpn[1], tpn[2], tpn[3], tpn[4], tpn[5]);
-+ (u8)(pn >> 40), (u8)(pn >> 32), (u8)(pn >> 24),
-+ (u8)(pn >> 16), (u8)(pn >> 8), (u8)pn);
- break;
- case WLAN_CIPHER_SUITE_AES_CMAC:
- tpn = key->u.aes_cmac.tx_pn;
+ ibss.channel_fixed = !!info->attrs[NL80211_ATTR_FREQ_FIXED];
+ ibss.privacy = !!info->attrs[NL80211_ATTR_PRIVACY];
+
projects / openwrt.git / blobdiff