Browse Source

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>
Zhao, Gang 11 years ago
parent
commit
4da6462213
1 changed files with 0 additions and 3 deletions
  1. 0 3
      net/wireless/scan.c

+ 0 - 3
net/wireless/scan.c

@@ -659,9 +659,6 @@ static bool cfg80211_combine_bsses(struct cfg80211_registered_device *dev,
 			continue;
 			continue;
 		if (ssidlen && ie[1] != ssidlen)
 		if (ssidlen && ie[1] != ssidlen)
 			continue;
 			continue;
-		/* that would be odd ... */
-		if (bss->pub.beacon_ies)
-			continue;
 		if (WARN_ON_ONCE(bss->pub.hidden_beacon_bss))
 		if (WARN_ON_ONCE(bss->pub.hidden_beacon_bss))
 			continue;
 			continue;
 		if (WARN_ON_ONCE(!list_empty(&bss->hidden_list)))
 		if (WARN_ON_ONCE(!list_empty(&bss->hidden_list)))