diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-11-21 15:24:31 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-25 09:57:27 +0100 |
| commit | ea9eba6a8b6b5d7a48b902d92dc2adb63b4371c0 (patch) | |
| tree | 6a169aea0871be69b286a47f560a7536e52ffb12 /net | |
| parent | 575f05302e6c75fcea8802a779359f8c927b516e (diff) | |
| download | linux-ea9eba6a8b6b5d7a48b902d92dc2adb63b4371c0.tar.gz | |
cfg80211: remove pointless channel lookup in survey code
We have a channel pointer, and we use its center frequency to look up a channel pointer - which will thus be exactly the same as the original pointer. Remove that pointless lookup and just use the pointer. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/nl80211.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 6e4177701d86..b5e3c489239d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6562,8 +6562,6 @@ static int nl80211_dump_survey(struct sk_buff *skb, } while (1) { - struct ieee80211_channel *chan; - res = rdev_dump_survey(rdev, wdev->netdev, survey_idx, &survey); if (res == -ENOENT) break; @@ -6576,9 +6574,7 @@ static int nl80211_dump_survey(struct sk_buff *skb, goto out; } - chan = ieee80211_get_channel(&rdev->wiphy, - survey.channel->center_freq); - if (!chan || chan->flags & IEEE80211_CHAN_DISABLED) { + if (survey.channel->flags & IEEE80211_CHAN_DISABLED) { survey_idx++; continue; } |