commit 0f500a5f6cadac888d5d3fce326452372d1a8343
author Luis R. Rodriguez <mcgrof@do-not-panic.com> Wed Dec 19 10:53:04 2012 -0800
committer Johannes Berg <johannes.berg@intel.com> Thu Jan 03 13:01:38 2013 +0100
tree aa44c923191fff33e55a4320e2ae26811966fbc2
parent 3195e489a878aaa3b735d4a1b7c5c79b3786efed

cfg80211: move world roaming check for beacon hints

We should not add new beacon hints even if the wiphy
is not world roaming. Without this we were always adding
a beacon hint if not world roaming for every non world
roaming wiphy interface.

Tested-by: Ben Greear <greearb@candelatech.com>
Reported-by: Ben Greear <greearb@candelatech.com>
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
[fix locking]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

net/wireless/reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index b68eeef..0b35de0 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1044,6 +1044,9 @@
 
 	chan->beacon_found = true;
 
+	if (!reg_is_world_roaming(wiphy))
+		return;
+
 	if (wiphy->flags & WIPHY_FLAG_DISABLE_BEACON_HINTS)
 		return;
 
@@ -1110,8 +1113,6 @@
 	 */
 	if (!last_request)
 		return;
-	if (!reg_is_world_roaming(wiphy))
-		return;
 	wiphy_update_beacon_reg(wiphy);
 }
 
@@ -1593,11 +1594,8 @@
 	struct cfg80211_registered_device *rdev;
 	struct reg_beacon *pending_beacon, *tmp;
 
-	/*
-	 * No need to hold the reg_mutex here as we just touch wiphys
-	 * and do not read or access regulatory variables.
-	 */
 	mutex_lock(&cfg80211_mutex);
+	mutex_lock(&reg_mutex);
 
 	/* This goes through the _pending_ beacon list */
 	spin_lock_bh(&reg_pending_beacons_lock);
@@ -1615,6 +1613,7 @@
 	}
 
 	spin_unlock_bh(&reg_pending_beacons_lock);
+	mutex_unlock(&reg_mutex);
 	mutex_unlock(&cfg80211_mutex);
 }