Skip to content

Commit

Permalink
cfg80211: rename reg_device_remove() to wiphy_regulatory_deregister()
Browse files Browse the repository at this point in the history
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: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Luis R. Rodriguez authored and Johannes Berg committed Jul 17, 2012
1 parent 57b5ce0 commit bfead08
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions net/wireless/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion net/wireless/reg.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bfead08

Please sign in to comment.