diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-01-22 15:05:48 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:01:15 -0500 |
| commit | e74b1e7fb2f12db36f25af2158ee6e2940e4f138 (patch) | |
| tree | e448c3290ec8d11fcba1cb67680752e9d17b579b /net | |
| parent | 5eebade608d695e30e89d4c5ca6136a58f24ed14 (diff) | |
| download | linux-3.10-e74b1e7fb2f12db36f25af2158ee6e2940e4f138.tar.gz linux-3.10-e74b1e7fb2f12db36f25af2158ee6e2940e4f138.tar.bz2 linux-3.10-e74b1e7fb2f12db36f25af2158ee6e2940e4f138.zip | |
cfg80211: ignore consecutive equal regulatory hints
We ignore regulatory hints for the same alpha2 if we already
have processed the same alpha2 on the current regulatory domain.
For a driver regulatory_hint() this means we copy onto its
wiphy->regd the previously procesed regulatory domain from CRDA
without having to call CRDA again.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/reg.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 4d2d2d4cc0d..c201abd38ad 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1080,8 +1080,13 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by, } return REG_INTERSECT; case REGDOM_SET_BY_DRIVER: - if (last_request->initiator == REGDOM_SET_BY_CORE) - return 0; + if (last_request->initiator == REGDOM_SET_BY_CORE) { + if (is_old_static_regdom(cfg80211_regdomain)) + return 0; + if (!alpha2_equal(cfg80211_regdomain->alpha2, alpha2)) + return 0; + return -EALREADY; + } return REG_INTERSECT; case REGDOM_SET_BY_USER: if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE) @@ -1101,6 +1106,10 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by, return -EAGAIN; } + if (!is_old_static_regdom(cfg80211_regdomain) && + alpha2_equal(cfg80211_regdomain->alpha2, alpha2)) + return -EALREADY; + return 0; } |