summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-01 01:19:48 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-02-04 18:57:46 +0100
commit9537f227b44762591a5598b79522789c573d34b3 (patch)
treed99cb4fcc120664daebf34faf138342225dcf349 /net/wireless
parentcfg80211: use lockdep to assert lock is held (diff)
downloadlinux-9537f227b44762591a5598b79522789c573d34b3.tar.xz
linux-9537f227b44762591a5598b79522789c573d34b3.zip
cfg80211: remove a local variable
This local variable is only used once, so remove it. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/scan.c5
1 files changed, 2 insertions, 3 deletions
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);