diff options
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r-- | net/wireless/reg.c | 3 |
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, | |||
764 | regd = custom_regd ? custom_regd : cfg80211_regdomain; | 764 | regd = custom_regd ? custom_regd : cfg80211_regdomain; |
765 | 765 | ||
766 | /* Follow the driver's regulatory domain, if present, unless a country | 766 | /* Follow the driver's regulatory domain, if present, unless a country |
767 | * IE has been processed */ | 767 | * IE has been processed or a user wants to help complaince further */ |
768 | if (last_request->initiator != REGDOM_SET_BY_COUNTRY_IE && | 768 | if (last_request->initiator != REGDOM_SET_BY_COUNTRY_IE && |
769 | last_request->initiator != REGDOM_SET_BY_USER && | ||
769 | wiphy->regd) | 770 | wiphy->regd) |
770 | regd = wiphy->regd; | 771 | regd = wiphy->regd; |
771 | 772 | ||