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

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

cfg80211: make regulatory_update() static 



Now that we have wiphy_regulatory_register() we can
tuck away the core's regulatory_update() call there
and make it static.

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

net/wireless/core.c

+0 −1
Original line number Diff line number Diff line
@@ -543,7 +543,6 @@ int wiphy_register(struct wiphy *wiphy) 


	/* set up regulatory info */

	wiphy_regulatory_register(wiphy);

	regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);



	list_add_rcu(&rdev->list, &cfg80211_rdev_list);

	cfg80211_rdev_list_generation++;

net/wireless/reg.c

+4 −2
Original line number Diff line number Diff line
@@ -1232,7 +1232,7 @@ static void wiphy_update_regulatory(struct wiphy *wiphy, 
		wiphy->reg_notifier(wiphy, last_request);

}



void regulatory_update(struct wiphy *wiphy,

static void regulatory_update(struct wiphy *wiphy,

			      enum nl80211_reg_initiator setby)

{

	mutex_lock(&reg_mutex);
@@ -2388,6 +2388,8 @@ void wiphy_regulatory_register(struct wiphy *wiphy) 
		reg_num_devs_support_basehint++;



	mutex_unlock(&reg_mutex);



	regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);

}



/* Caller must hold cfg80211_mutex */

net/wireless/reg.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ void regulatory_exit(void); 


int set_regdom(const struct ieee80211_regdomain *rd);



void regulatory_update(struct wiphy *wiphy, enum nl80211_reg_initiator setby);

bool reg_last_request_cell_base(void);



/**