From: Arik Nemtsov <arik@wizery.com>
Date: Wed, 2 Mar 2016 21:28:31 +0000 (+0200)
Subject: mac80211: TDLS: always downgrade invalid chandefs
X-Git-Tag: android-x86-7.1-r1~1720^2^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=db8d99774c2682559b7648857697b9b588c6795a;p=android-x86%2Fkernel.git

mac80211: TDLS: always downgrade invalid chandefs

Even if the current chandef width is equal to the station's max-BW, it
doesn't mean it's a valid width for TDLS. Make sure to always check
regulatory constraints in these cases.

Fixes: 0fabfaafec3a ("mac80211: upgrade BW of TDLS peers when possible")
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>
---

diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c
index c9eeb3f12808..43f13abe89c7 100644
--- a/net/mac80211/tdls.c
+++ b/net/mac80211/tdls.c
@@ -332,7 +332,7 @@ ieee80211_tdls_chandef_vht_upgrade(struct ieee80211_sub_if_data *sdata,
 		return;
 
 	/* proceed to downgrade the chandef until usable or the same */
-	while (uc.width > max_width &&
+	while (uc.width > max_width ||
 	       !cfg80211_reg_can_beacon_relax(sdata->local->hw.wiphy, &uc,
 					      sdata->wdev.iftype))
 		ieee80211_chandef_downgrade(&uc);