From: Zhao, Gang <gamerh2o@gmail.com>
Date: Wed, 19 Mar 2014 09:04:35 +0000 (+0800)
Subject: cfg80211: remove unnecessary check
X-Git-Tag: v3.15-rc1~113^2~93^2^2~5^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4da64622131b6b0cd1211e220dc88cc15007b59d;p=karo-tx-linux.git

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 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,
 			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)))