aboutsummaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorMister Oyster <oysterized@gmail.com>2017-02-23 15:28:21 +0100
committerMister Oyster <oysterized@gmail.com>2017-04-11 10:57:36 +0200
commit0ae10f96ebc1c8afe5b500823fc3a72efac563aa (patch)
treea8ec622c4cff308ff49b3f93e550634f79fb3402 /net/wireless
parent0a0b2f1eacdeb755d879c343a02bc2771a86af7f (diff)
wlan: get rid of Meizu's CONFIG_NL80211_FASTSCAN
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 9202d929e..be2f0cc2e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6488,25 +6488,6 @@ __cfg80211_alloc_vendor_skb(struct cfg80211_registered_device *rdev,
return NULL;
}
-#ifdef CONFIG_NL80211_FASTSCAN
-static int nl80211_fastscan_do(struct sk_buff *skb, struct genl_info *info)
-{
- struct cfg80211_registered_device *rdev = info->user_ptr[0];
- int err;
-
- if (!info->attrs[NL80211_ATTR_FASTSCAN])
- return -EINVAL;
-
- err = -EOPNOTSUPP;
- if (rdev&&rdev->ops->fastscan_cmd) {
- err = rdev->ops->fastscan_cmd(&rdev->wiphy,nla_data(info->attrs[NL80211_ATTR_FASTSCAN]),
- nla_len(info->attrs[NL80211_ATTR_FASTSCAN]));
- }
-
- return err;
-}
-#endif
-
#ifdef CONFIG_NL80211_TESTMODE
static struct genl_multicast_group nl80211_testmode_mcgrp = {
.name = "testmode",
@@ -8876,15 +8857,6 @@ static struct genl_ops nl80211_ops[] = {
NL80211_FLAG_NEED_RTNL,
},
#endif
-#ifdef CONFIG_NL80211_FASTSCAN
- {
- .cmd = NL80211_CMD_FAST_SCAN,
- .doit = nl80211_fastscan_do,
- .policy = nl80211_policy,
- .internal_flags = NL80211_FLAG_NEED_WIPHY,
- },
-#endif
-
{
.cmd = NL80211_CMD_CONNECT,
.doit = nl80211_connect,