---

yaml --- r: 352554 b: refs/heads/master c: 9537f22 h: refs/heads/master v: v3
git-mirror · Feb 4, 2013 · 2b1ac91 · 2b1ac91
1 parent 1a8ffbc
commit 2b1ac91
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);