From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 1 Feb 2013 00:19:48 +0000 (+0100)
Subject: cfg80211: remove a local variable
X-Git-Tag: firefly_0821_release~3680^2~921^2~28^2^2~26^2~82
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9537f227b44762591a5598b79522789c573d34b3;p=firefly-linux-kernel-4.4.55.git

cfg80211: remove a local variable

This local variable is only used once, so remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index a56287bb550c..23b7e59c6506 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -583,16 +583,15 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev,
 				kfree_rcu((struct cfg80211_bss_ies *)old,
 					  rcu_head);
 		} else if (rcu_access_pointer(tmp->pub.beacon_ies)) {
-			const struct cfg80211_bss_ies *old, *ies;
+			const struct cfg80211_bss_ies *old;
 
 			old = rcu_access_pointer(found->pub.beacon_ies);
-			ies = rcu_access_pointer(found->pub.ies);
 
 			rcu_assign_pointer(found->pub.beacon_ies,
 					   tmp->pub.beacon_ies);
 
 			/* Override IEs if they were from a beacon before */
-			if (old == ies)
+			if (old == rcu_access_pointer(found->pub.ies))
 				rcu_assign_pointer(found->pub.ies,
 						   tmp->pub.beacon_ies);