Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: chromeos/compat-wireless/drivers/net/wireless/ath/regd.c

Issue 6898014: ath9k: add 0x6C regulatory domain support for new modules (Closed) Base URL: ssh://gitrw.chromium.org:9222/kernel.git@master
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromeos/compat-wireless/drivers/net/wireless/ath/regd_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/compat-wireless/drivers/net/wireless/ath/regd.c
diff --git a/chromeos/compat-wireless/drivers/net/wireless/ath/regd.c b/chromeos/compat-wireless/drivers/net/wireless/ath/regd.c
index 2b14775e6bc63adc44e5a46faa790123f97271bf..5647f6352bcb2c35e929e8df8c634f765e24efa9 100644
--- a/chromeos/compat-wireless/drivers/net/wireless/ath/regd.c
+++ b/chromeos/compat-wireless/drivers/net/wireless/ath/regd.c
@@ -97,8 +97,8 @@ static const struct ieee80211_regdomain ath_world_regdom_66_69 = {
}
};
-/* Can be used by 0x67, 0x6A and 0x68 */
-static const struct ieee80211_regdomain ath_world_regdom_67_68_6A = {
+/* Can be used by 0x67, 0x68, 0x6A and 0x6C */
+static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = {
.n_reg_rules = 4,
.alpha2 = "99",
.reg_rules = {
@@ -151,7 +151,8 @@ ieee80211_regdomain *ath_world_regdomain(struct ath_regulatory *reg)
case 0x67:
case 0x68:
case 0x6A:
- return &ath_world_regdom_67_68_6A;
+ case 0x6C:
+ return &ath_world_regdom_67_68_6A_6C;
default:
WARN_ON(1);
return ath_default_world_regdomain();
@@ -326,6 +327,7 @@ static void ath_reg_apply_world_flags(struct wiphy *wiphy,
case 0x63:
case 0x66:
case 0x67:
+ case 0x6C:
ath_reg_apply_beaconing_flags(wiphy, initiator);
break;
case 0x68:
« no previous file with comments | « no previous file | chromeos/compat-wireless/drivers/net/wireless/ath/regd_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698