Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f500a5f authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Johannes Berg
Browse files

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: default avatarBen Greear <greearb@candelatech.com>
Reported-by: default avatarBen Greear <greearb@candelatech.com>
Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
[fix locking]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3195e489

net/wireless/reg.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -1044,6 +1044,9 @@ static void handle_reg_beacon(struct wiphy *wiphy, unsigned int chan_idx, 




	chan->beacon_found = true;

	chan->beacon_found = true;





	if (!reg_is_world_roaming(wiphy))

		return;



	if (wiphy->flags & WIPHY_FLAG_DISABLE_BEACON_HINTS)

	if (wiphy->flags & WIPHY_FLAG_DISABLE_BEACON_HINTS)

		return;

		return;
@@ -1110,8 +1113,6 @@ static void reg_process_beacons(struct wiphy *wiphy) 
	 */

	 */

	if (!last_request)

	if (!last_request)

		return;

		return;

	if (!reg_is_world_roaming(wiphy))

		return;

	wiphy_update_beacon_reg(wiphy);

	wiphy_update_beacon_reg(wiphy);

}

}
@@ -1593,11 +1594,8 @@ static void reg_process_pending_beacon_hints(void) 
	struct cfg80211_registered_device *rdev;

	struct cfg80211_registered_device *rdev;

	struct reg_beacon *pending_beacon, *tmp;

	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(&cfg80211_mutex);

	mutex_lock(&reg_mutex);





	/* This goes through the _pending_ beacon list */

	/* This goes through the _pending_ beacon list */

	spin_lock_bh(&reg_pending_beacons_lock);

	spin_lock_bh(&reg_pending_beacons_lock);
@@ -1615,6 +1613,7 @@ static void reg_process_pending_beacon_hints(void) 
	}

	}





	spin_unlock_bh(&reg_pending_beacons_lock);

	spin_unlock_bh(&reg_pending_beacons_lock);

	mutex_unlock(&reg_mutex);

	mutex_unlock(&cfg80211_mutex);

	mutex_unlock(&cfg80211_mutex);

}

}