summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tdls.c
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2015-08-15 22:39:48 +0300
committerJohannes Berg <johannes.berg@intel.com>2015-09-22 15:21:21 +0200
commitdd55ab59b6234c73522dc533757e89e6a77c2c38 (patch)
tree849e8ec45bb4f2ac017a72caefb2fba9a6f0e70b /net/mac80211/tdls.c
parent82c0cc90d6268a3cd3ee058257d2146188326452 (diff)
downloadlinux-dd55ab59b6234c73522dc533757e89e6a77c2c38.tar.bz2
mac80211: TDLS: check reg with IR-relax on chandef upgrade
When checking if a TDLS chandef can be upgraded, IR-relaxation can be taken into account to allow more channels. Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tdls.c')
-rw-r--r--net/mac80211/tdls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c
index 1bacea793c23..52f3187f90ba 100644
--- a/net/mac80211/tdls.c
+++ b/net/mac80211/tdls.c
@@ -333,8 +333,8 @@ ieee80211_tdls_chandef_vht_upgrade(struct ieee80211_sub_if_data *sdata,
/* proceed to downgrade the chandef until usable or the same */
while (uc.width > max_width &&
- !cfg80211_reg_can_beacon(sdata->local->hw.wiphy,
- &uc, sdata->wdev.iftype))
+ !cfg80211_reg_can_beacon_relax(sdata->local->hw.wiphy, &uc,
+ sdata->wdev.iftype))
ieee80211_chandef_downgrade(&uc);
if (!cfg80211_chandef_identical(&uc, &sta->tdls_chandef)) {