diff options
author | Zhao, Gang <gamerh2o@gmail.com> | 2014-03-19 05:04:35 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-03-19 16:29:57 -0400 |
commit | 4da64622131b6b0cd1211e220dc88cc15007b59d (patch) | |
tree | 424b61a6d74544cec3b1f76511aec02020dd23c2 /net/wireless | |
parent | fb378c231daf93c7c806848e8247781322867ece (diff) |
cfg80211: remove unnecessary check
RCU pointer bss->pub.beacon_ies is checked before in previous
statement:
if (rcu_access_pointer(bss->pub.beacon_ies))
continue;
There is no need to check it twice(and in the wrong way :) ).
Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/scan.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 7d9f5264a63c..7d09a712cb1f 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
@@ -659,9 +659,6 @@ static bool cfg80211_combine_bsses(struct cfg80211_registered_device *dev, | |||
659 | continue; | 659 | continue; |
660 | if (ssidlen && ie[1] != ssidlen) | 660 | if (ssidlen && ie[1] != ssidlen) |
661 | continue; | 661 | continue; |
662 | /* that would be odd ... */ | ||
663 | if (bss->pub.beacon_ies) | ||
664 | continue; | ||
665 | if (WARN_ON_ONCE(bss->pub.hidden_beacon_bss)) | 662 | if (WARN_ON_ONCE(bss->pub.hidden_beacon_bss)) |
666 | continue; | 663 | continue; |
667 | if (WARN_ON_ONCE(!list_empty(&bss->hidden_list))) | 664 | if (WARN_ON_ONCE(!list_empty(&bss->hidden_list))) |