diff options
author | Arik Nemtsov <arik@wizery.com> | 2014-07-17 17:14:26 +0300 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-07-21 12:14:04 +0200 |
commit | 13cc8a4a1d24ff1f3b8b6de16779ef925371b18b (patch) | |
tree | 7589ca3656bbc6706d5dda61449a139ea7b212fb /net/mac80211/ht.c | |
parent | 81dd2b8822410e56048b927be779d95a2b6dc186 (diff) | |
download | linux-13cc8a4a1d24ff1f3b8b6de16779ef925371b18b.tar.bz2 |
mac80211: support HT for TDLS stations
Add the HT capabilities and HT operation information elements to TDLS
setup packets where appropriate.
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ht.c')
-rw-r--r-- | net/mac80211/ht.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 15702ff64a4c..568055c02a98 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -150,13 +150,12 @@ bool ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata, /* * If user has specified capability over-rides, take care - * of that if the station we're setting up is the AP that + * of that if the station we're setting up is the AP or TDLS peer that * we advertised a restricted capability set to. Override * our own capabilities and then use those below. */ - if ((sdata->vif.type == NL80211_IFTYPE_STATION || - sdata->vif.type == NL80211_IFTYPE_ADHOC) && - !test_sta_flag(sta, WLAN_STA_TDLS_PEER)) + if (sdata->vif.type == NL80211_IFTYPE_STATION || + sdata->vif.type == NL80211_IFTYPE_ADHOC) ieee80211_apply_htcap_overrides(sdata, &own_cap); /* |