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>

1 files changed, 2 insertions, 1 deletions

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 89e0d8b3cf1e..af9132cea931 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;