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>

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 7d9f5264a63cc5916f4a12ea52c19bbde17f0011..7d09a712cb1f1353f13310f5c68b38e750d199a6 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -659,9 +659,6 @@ static bool cfg80211_combine_bsses(struct cfg80211_registered_device *dev,
                        continue;
                if (ssidlen && ie[1] != ssidlen)
                        continue;
-               /* that would be odd ... */
-               if (bss->pub.beacon_ies)
-                       continue;
                if (WARN_ON_ONCE(bss->pub.hidden_beacon_bss))
                        continue;
                if (WARN_ON_ONCE(!list_empty(&bss->hidden_list)))