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

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

cfg80211: rename reg_device_remove() to wiphy_regulatory_deregister() 



This makes it clearer what we're doing. This now makes a bit
more sense given that regardless of the wiphy if the cell
base station hint feature is supported we will be modifying the
way the regulatory core behaves.

Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 57b5ce07

net/wireless/core.c

+5 −3
Original line number Diff line number Diff line
@@ -653,9 +653,11 @@ void wiphy_unregister(struct wiphy *wiphy) 
	/* nothing */

	cfg80211_unlock_rdev(rdev);



	/* If this device got a regulatory hint tell core its

	 * free to listen now to a new shiny device regulatory hint */

	reg_device_remove(wiphy);

	/*

	 * If this device got a regulatory hint tell core its

	 * free to listen now to a new shiny device regulatory hint

	 */

	wiphy_regulatory_deregister(wiphy);



	cfg80211_rdev_list_generation++;

	device_del(&rdev->wiphy.dev);

net/wireless/reg.c

+1 −1
Original line number Diff line number Diff line
@@ -2391,7 +2391,7 @@ void wiphy_regulatory_register(struct wiphy *wiphy) 
}



/* Caller must hold cfg80211_mutex */

void reg_device_remove(struct wiphy *wiphy)

void wiphy_regulatory_deregister(struct wiphy *wiphy)

{

	struct wiphy *request_wiphy = NULL;

net/wireless/reg.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ int regulatory_hint_user(const char *alpha2, 


int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env);

void wiphy_regulatory_register(struct wiphy *wiphy);

void reg_device_remove(struct wiphy *wiphy);

void wiphy_regulatory_deregister(struct wiphy *wiphy);



int __init regulatory_init(void);

void regulatory_exit(void);