diff options
Diffstat (limited to 'net')
| -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 5ed615f94e0c..99d41831d76e 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
| @@ -661,7 +661,8 @@ static int freq_reg_info_regd(struct wiphy *wiphy, | |||
| 661 | * Follow the driver's regulatory domain, if present, unless a country | 661 | * Follow the driver's regulatory domain, if present, unless a country |
| 662 | * IE has been processed or a user wants to help complaince further | 662 | * IE has been processed or a user wants to help complaince further |
| 663 | */ | 663 | */ |
| 664 | if (last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE && | 664 | if (!custom_regd && |
| 665 | last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE && | ||
| 665 | last_request->initiator != NL80211_REGDOM_SET_BY_USER && | 666 | last_request->initiator != NL80211_REGDOM_SET_BY_USER && |
| 666 | wiphy->regd) | 667 | wiphy->regd) |
| 667 | regd = wiphy->regd; | 668 | regd = wiphy->regd; |