diff options
author | John W. Linville <linville@tuxdriver.com> | 2009-12-18 17:59:02 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 16:31:37 -0500 |
commit | baeb66fe2306783e3b9a492b03882f2e249b2eeb (patch) | |
tree | 9c904289cf3a3cd5a538f46a4413090c4b277cb9 /net/wireless/nl80211.c | |
parent | 8f648c00039a42e67a9dff034c77d41502dab1f3 (diff) |
wireless: remove CONFIG_WIRELESS_OLD_REGULATORY
This is no longer needed with the availability of
CONFIG_CFG80211_INTERNAL_REGDB.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r-- | net/wireless/nl80211.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 7cb0d647fc34..60f854377f90 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -2550,12 +2550,6 @@ static int nl80211_req_set_reg(struct sk_buff *skb, struct genl_info *info) | |||
2550 | 2550 | ||
2551 | data = nla_data(info->attrs[NL80211_ATTR_REG_ALPHA2]); | 2551 | data = nla_data(info->attrs[NL80211_ATTR_REG_ALPHA2]); |
2552 | 2552 | ||
2553 | #ifdef CONFIG_WIRELESS_OLD_REGULATORY | ||
2554 | /* We ignore world regdom requests with the old regdom setup */ | ||
2555 | if (is_world_regdom(data)) | ||
2556 | return -EINVAL; | ||
2557 | #endif | ||
2558 | |||
2559 | r = regulatory_hint_user(data); | 2553 | r = regulatory_hint_user(data); |
2560 | 2554 | ||
2561 | return r; | 2555 | return r; |