aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-01-22 15:05:54 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:01:19 -0500
commit24ed1da1337b92e3b0a89f2c2b7cd33b9a8fcb62 (patch)
treeeed6ed519de2db3aafb46d244117fb87fa56cfa1
parent9a95371aa26e3cb9fb1340362912000088ff3c3e (diff)
cfg80211: allow users to help a driver's compliance
Let users be more compliant if so desired. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/wireless/reg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 89e0d8b3cf1..af9132cea93 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -764,8 +764,9 @@ static int freq_reg_info_regd(struct wiphy *wiphy,
regd = custom_regd ? custom_regd : cfg80211_regdomain;
/* Follow the driver's regulatory domain, if present, unless a country
- * IE has been processed */
+ * IE has been processed or a user wants to help complaince further */
if (last_request->initiator != REGDOM_SET_BY_COUNTRY_IE &&
+ last_request->initiator != REGDOM_SET_BY_USER &&
wiphy->regd)
regd = wiphy->regd;