]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
cfg80211: remove a local variable
authorJohannes Berg <johannes.berg@intel.com>
Fri, 1 Feb 2013 00:19:48 +0000 (01:19 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 4 Feb 2013 17:57:46 +0000 (18:57 +0100)
This local variable is only used once, so remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/scan.c

index a56287bb550c0223db1ee7dc7f87a93466a38714..23b7e59c65063788726ce8d0dc616200f8bec786 100644 (file)
@@ -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);