leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cfg80211: rename reg_device_remove() to wiphy_regulatory_deregister()

Browse Source 
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>
This commit is contained in:
Luis R. Rodriguez 2012-07-12 11:49:19 -07:00 committed by Johannes Berg
parent 57b5ce072e
commit bfead0808c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/wireless/core.c
View File

@ -653,9 +653,11 @@ void wiphy_unregister(struct wiphy *wiphy)
/* nothing */ /* nothing */
cfg80211_unlock_rdev(rdev); 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 */ * If this device got a regulatory hint tell core its
reg_device_remove(wiphy); * free to listen now to a new shiny device regulatory hint
*/
wiphy_regulatory_deregister(wiphy);
cfg80211_rdev_list_generation++; cfg80211_rdev_list_generation++;
device_del(&rdev->wiphy.dev); device_del(&rdev->wiphy.dev);

2
net/wireless/reg.c
View File

@ -2391,7 +2391,7 @@ void wiphy_regulatory_register(struct wiphy *wiphy)
} }
/* Caller must hold cfg80211_mutex */ /* Caller must hold cfg80211_mutex */
void reg_device_remove(struct wiphy *wiphy) void wiphy_regulatory_deregister(struct wiphy *wiphy)
{ {
struct wiphy *request_wiphy = NULL; struct wiphy *request_wiphy = NULL;

2
net/wireless/reg.h
View File

@ -27,7 +27,7 @@ int regulatory_hint_user(const char *alpha2,
int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env); int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env);
void wiphy_regulatory_register(struct wiphy *wiphy); 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); int __init regulatory_init(void);
void regulatory_exit(void); void regulatory_exit(void);