From 2b1ac91f40c7519d53cfac8877fe000828a160c3 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 1 Feb 2013 01:19:48 +0100 Subject: [PATCH] --- yaml --- r: 352554 b: refs/heads/master c: 9537f227b44762591a5598b79522789c573d34b3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/scan.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 95395e6f1f78..6e37b44678e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b1af4792a2aa686483fc9bb2155f7269fa6399c +refs/heads/master: 9537f227b44762591a5598b79522789c573d34b3 diff --git a/trunk/net/wireless/scan.c b/trunk/net/wireless/scan.c index a56287bb550c..23b7e59c6506 100644 --- a/trunk/net/wireless/scan.c +++ b/trunk/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);