summaryrefslogtreecommitdiff
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2009-12-18 22:59:02 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2009-12-28 21:31:37 (GMT)
commitbaeb66fe2306783e3b9a492b03882f2e249b2eeb (patch)
tree9c904289cf3a3cd5a538f46a4413090c4b277cb9 /net/wireless/nl80211.c
parent8f648c00039a42e67a9dff034c77d41502dab1f3 (diff)
downloadlinux-fsl-qoriq-baeb66fe2306783e3b9a492b03882f2e249b2eeb.tar.xz
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.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 7cb0d64..60f8543 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)
data = nla_data(info->attrs[NL80211_ATTR_REG_ALPHA2]);
-#ifdef CONFIG_WIRELESS_OLD_REGULATORY
- /* We ignore world regdom requests with the old regdom setup */
- if (is_world_regdom(data))
- return -EINVAL;
-#endif
-
r = regulatory_hint_user(data);
return r;