Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4da64622 authored by Zhao, Gang's avatar Zhao, Gang Committed by Johannes Berg
Browse files

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: default avatarZhao, Gang <gamerh2o@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent fb378c23

net/wireless/scan.c

+0 −3
Original line number Diff line number Diff line
@@ -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)))