This is a note to let you know that I've just added the patch titled
cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY
to the 2.6.37-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cfg80211-fix-allowing-country-ies-for-wiphy_flag_strict_regulatory.patch
and it can be found in the queue-2.6.37 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 749b527b21465fb079796c03ffb4302584dc31c1 Mon Sep 17 00:00:00 2001
From: Luis R. Rodriguez <[email protected]>
Date: Wed, 20 Oct 2010 10:18:54 -0700
Subject: cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY
From: Luis R. Rodriguez <[email protected]>
commit 749b527b21465fb079796c03ffb4302584dc31c1 upstream.
We should be enabling country IE hints for WIPHY_FLAG_STRICT_REGULATORY
even if we haven't yet recieved regulatory domain hint for the driver
if it needed one. Without this Country IEs are not passed on to drivers
that have set WIPHY_FLAG_STRICT_REGULATORY, today this is just all
Atheros chipset drivers: ath5k, ath9k, ar9170, carl9170.
This was part of the original design, however it was completely
overlooked...
Cc: Easwar Krishnan <[email protected]>
Signed-off-by: Luis R. Rodriguez <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
include/net/cfg80211.h | 15 ++++++++-------
net/wireless/reg.c | 1 +
2 files changed, 9 insertions(+), 7 deletions(-)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1321,13 +1321,14 @@ struct cfg80211_ops {
* initiator is %REGDOM_SET_BY_CORE).
* @WIPHY_FLAG_STRICT_REGULATORY: tells us the driver for this device will
* ignore regulatory domain settings until it gets its own regulatory
- * domain via its regulatory_hint(). After its gets its own regulatory
- * domain it will only allow further regulatory domain settings to
- * further enhance compliance. For example if channel 13 and 14 are
- * disabled by this regulatory domain no user regulatory domain can
- * enable these channels at a later time. This can be used for devices
- * which do not have calibration information gauranteed for frequencies
- * or settings outside of its regulatory domain.
+ * domain via its regulatory_hint() unless the regulatory hint is
+ * from a country IE. After its gets its own regulatory domain it will
+ * only allow further regulatory domain settings to further enhance
+ * compliance. For example if channel 13 and 14 are disabled by this
+ * regulatory domain no user regulatory domain can enable these channels
+ * at a later time. This can be used for devices which do not have
+ * calibration information guaranteed for frequencies or settings
+ * outside of its regulatory domain.
* @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure
* that passive scan flags and beaconing flags may not be lifted by
* cfg80211 due to regulatory beacon hints. For more information on beacon
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -813,6 +813,7 @@ static bool ignore_reg_update(struct wip
* desired regulatory domain set
*/
if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd &&
+ initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
!is_world_regdom(last_request->alpha2))
return true;
return false;
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.37/ath9k-fix-assumptions-for-idle-calls-on-suspend-resume.patch
queue-2.6.37/ath9k_hw-disabled-paprd-for-ar9003.patch
queue-2.6.37/cfg80211-fix-disabling-channels-based-on-hints.patch
queue-2.6.37/cfg80211-fix-allowing-country-ies-for-wiphy_flag_strict_regulatory.patch
queue-2.6.37/ath9k-fix-aphy-wiphy-idle-mismatch.patch
queue-2.6.37/cfg80211-pass-the-reg-hint-initiator-to-helpers.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
