Skip to content

Commit bfead08

Browse files
mcgrofjmberg-intel
authored andcommitted
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: Luis R. Rodriguez <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
1 parent 57b5ce0 commit bfead08

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

net/wireless/core.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -653,9 +653,11 @@ void wiphy_unregister(struct wiphy *wiphy)
653653
/* nothing */
654654
cfg80211_unlock_rdev(rdev);
655655

656-
/* If this device got a regulatory hint tell core its
657-
* free to listen now to a new shiny device regulatory hint */
658-
reg_device_remove(wiphy);
656+
/*
657+
* If this device got a regulatory hint tell core its
658+
* free to listen now to a new shiny device regulatory hint
659+
*/
660+
wiphy_regulatory_deregister(wiphy);
659661

660662
cfg80211_rdev_list_generation++;
661663
device_del(&rdev->wiphy.dev);

net/wireless/reg.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,7 @@ void wiphy_regulatory_register(struct wiphy *wiphy)
23912391
}
23922392

23932393
/* Caller must hold cfg80211_mutex */
2394-
void reg_device_remove(struct wiphy *wiphy)
2394+
void wiphy_regulatory_deregister(struct wiphy *wiphy)
23952395
{
23962396
struct wiphy *request_wiphy = NULL;
23972397

net/wireless/reg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ int regulatory_hint_user(const char *alpha2,
2727

2828
int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env);
2929
void wiphy_regulatory_register(struct wiphy *wiphy);
30-
void reg_device_remove(struct wiphy *wiphy);
30+
void wiphy_regulatory_deregister(struct wiphy *wiphy);
3131

3232
int __init regulatory_init(void);
3333
void regulatory_exit(void);

0 commit comments

Comments
 (0)