diff options
| author | LorDClockaN <davor@losinj.com> | 2014-06-18 15:09:32 +0200 |
|---|---|---|
| committer | LorDClockaN <davor@losinj.com> | 2014-06-18 15:09:32 +0200 |
| commit | 3d258ae906ee28e8f43f1fe1f51d48a63b5fd1ca (patch) | |
| tree | daf27e2d6c97a18c9525ec3207a6aa6191165a2d /net/wireless | |
| parent | 69a8edcfd8ca6987626f20cd5a78051f43f532e9 (diff) | |
| parent | c795f63b44d1f605b84261bd9a76e53f6f1a0b7d (diff) | |
Change-Id: I1801401160f3216c9e2621b4cb337b3c11d82c9e
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/reg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 796a0eeb26a..97d7cb1842f 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -898,13 +898,11 @@ static void handle_channel(struct wiphy *wiphy, chan->max_reg_power = (int) MBM_TO_DBM(power_rule->max_eirp); if (chan->orig_mpwr) { /* - * Devices that have their own custom regulatory domain - * but also use WIPHY_FLAG_STRICT_REGULATORY will follow the - * passed country IE power settings. + * Devices that use NL80211_COUNTRY_IE_FOLLOW_POWER will always + * follow the passed country IE power settings. */ if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE && - wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY && - wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) + wiphy->country_ie_pref & NL80211_COUNTRY_IE_FOLLOW_POWER) chan->max_power = chan->max_reg_power; else chan->max_power = min(chan->orig_mpwr, @@ -1322,6 +1320,8 @@ static int ignore_request(struct wiphy *wiphy, case NL80211_REGDOM_SET_BY_CORE: return 0; case NL80211_REGDOM_SET_BY_COUNTRY_IE: + if (wiphy->country_ie_pref & NL80211_COUNTRY_IE_IGNORE_CORE) + return -EALREADY; last_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx); |