mirror of
https://github.com/torvalds/linux.git
synced 2024-12-16 08:02:17 +00:00
net/wireless: add COUNTRY to to regulatory device uevent
Regulatory devices issue change uevents to inform userspace of a need to call the crda tool; however these can often be sent before udevd is running, and were not previously included in the results of udevadm trigger (which requests a new change event using the /uevent attribute of the sysfs object). Add a uevent function to the device type which includes the COUNTRY information from the last request if it has yet to be processed, the case of multiple requests is already handled in the code by checking whether an unprocessed one is queued in the same manner and refusing to queue a new one. The existing udev rule continues to work as before. Signed-off-by: Scott James Remnant <keybuk@google.com> Acked-By: Kay Sievers <kay.sievers@vrfy.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
80751e2b8f
commit
4d9d88d121
@ -63,6 +63,10 @@ static struct regulatory_request *last_request;
|
||||
/* To trigger userspace events */
|
||||
static struct platform_device *reg_pdev;
|
||||
|
||||
static struct device_type reg_device_type = {
|
||||
.uevent = reg_device_uevent,
|
||||
};
|
||||
|
||||
/*
|
||||
* Central wireless core regulatory domains, we only need two,
|
||||
* the current one and a world regulatory domain in case we have no
|
||||
@ -362,16 +366,11 @@ static inline void reg_regdb_query(const char *alpha2) {}
|
||||
|
||||
/*
|
||||
* This lets us keep regulatory code which is updated on a regulatory
|
||||
* basis in userspace.
|
||||
* basis in userspace. Country information is filled in by
|
||||
* reg_device_uevent
|
||||
*/
|
||||
static int call_crda(const char *alpha2)
|
||||
{
|
||||
char country_env[9 + 2] = "COUNTRY=";
|
||||
char *envp[] = {
|
||||
country_env,
|
||||
NULL
|
||||
};
|
||||
|
||||
if (!is_world_regdom((char *) alpha2))
|
||||
pr_info("Calling CRDA for country: %c%c\n",
|
||||
alpha2[0], alpha2[1]);
|
||||
@ -381,10 +380,7 @@ static int call_crda(const char *alpha2)
|
||||
/* query internal regulatory database (if it exists) */
|
||||
reg_regdb_query(alpha2);
|
||||
|
||||
country_env[8] = alpha2[0];
|
||||
country_env[9] = alpha2[1];
|
||||
|
||||
return kobject_uevent_env(®_pdev->dev.kobj, KOBJ_CHANGE, envp);
|
||||
return kobject_uevent(®_pdev->dev.kobj, KOBJ_CHANGE);
|
||||
}
|
||||
|
||||
/* Used by nl80211 before kmalloc'ing our regulatory domain */
|
||||
@ -2087,6 +2083,25 @@ int set_regdom(const struct ieee80211_regdomain *rd)
|
||||
return r;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
{
|
||||
if (last_request && !last_request->processed) {
|
||||
if (add_uevent_var(env, "COUNTRY=%c%c",
|
||||
last_request->alpha2[0],
|
||||
last_request->alpha2[1]))
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
{
|
||||
return -ENODEV;
|
||||
}
|
||||
#endif /* CONFIG_HOTPLUG */
|
||||
|
||||
/* Caller must hold cfg80211_mutex */
|
||||
void reg_device_remove(struct wiphy *wiphy)
|
||||
{
|
||||
@ -2118,6 +2133,8 @@ int __init regulatory_init(void)
|
||||
if (IS_ERR(reg_pdev))
|
||||
return PTR_ERR(reg_pdev);
|
||||
|
||||
reg_pdev->dev.type = ®_device_type;
|
||||
|
||||
spin_lock_init(®_requests_lock);
|
||||
spin_lock_init(®_pending_beacons_lock);
|
||||
|
||||
|
@ -8,6 +8,7 @@ bool reg_is_valid_request(const char *alpha2);
|
||||
|
||||
int regulatory_hint_user(const char *alpha2);
|
||||
|
||||
int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env);
|
||||
void reg_device_remove(struct wiphy *wiphy);
|
||||
|
||||
int __init regulatory_init(void);
|
||||
|
Loading…
Reference in New Issue
Block a user