aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-11-11 16:15:31 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 14:51:51 -0500
commit2a901468c221e778af52603e006a53d286e81f90 (patch)
treeed3232c3197eef59311d4ba531867e28e436f001 /net
parenta09a85a013523a8b572dc5732b5c30e0785195f3 (diff)
cfg80211: add an option to disable processing country IEs
Certain vendors may want to disable the processing of country IEs so that they can continue using the regulatory domain the driver or user has set. Currently there is no way to stop the core from processing country IEs, so add support to the core to ignore country IE hints. Cc: Mihir Shete <smihir@qti.qualcomm.com> Cc: Henri Bahini <hbahini@qca.qualcomm.com> Cc: Tushnim Bhattacharyya <tushnimb@qca.qualcomm.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 6b3051f6a8a7..067c1f63a1ae 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1543,6 +1543,9 @@ __reg_process_hint_country_ie(struct wiphy *wiphy,
1543 if (regdom_changes(country_ie_request->alpha2)) 1543 if (regdom_changes(country_ie_request->alpha2))
1544 return REG_REQ_IGNORE; 1544 return REG_REQ_IGNORE;
1545 return REG_REQ_ALREADY_SET; 1545 return REG_REQ_ALREADY_SET;
1546 } else {
1547 if (wiphy->regulatory_flags & REGULATORY_COUNTRY_IE_IGNORE)
1548 return REG_REQ_IGNORE;
1546 } 1549 }
1547 1550
1548 if (unlikely(!is_an_alpha2(country_ie_request->alpha2))) 1551 if (unlikely(!is_an_alpha2(country_ie_request->alpha2)))