aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_sysfs.c4
-rw-r--r--net/bridge/br_sysfs_if.c4
-rw-r--r--net/core/net-sysfs.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index bd7568ac87fc..0ed38740388c 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -78,7 +78,7 @@ static struct class_device_attribute *bt_attrs[] = {
78}; 78};
79 79
80#ifdef CONFIG_HOTPLUG 80#ifdef CONFIG_HOTPLUG
81static int bt_hotplug(struct class_device *cdev, char **envp, int num_envp, char *buf, int size) 81static int bt_uevent(struct class_device *cdev, char **envp, int num_envp, char *buf, int size)
82{ 82{
83 struct hci_dev *hdev = class_get_devdata(cdev); 83 struct hci_dev *hdev = class_get_devdata(cdev);
84 int n, i = 0; 84 int n, i = 0;
@@ -107,7 +107,7 @@ struct class bt_class = {
107 .name = "bluetooth", 107 .name = "bluetooth",
108 .release = bt_release, 108 .release = bt_release,
109#ifdef CONFIG_HOTPLUG 109#ifdef CONFIG_HOTPLUG
110 .hotplug = bt_hotplug, 110 .uevent = bt_uevent,
111#endif 111#endif
112}; 112};
113 113
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index f6a19d53eaeb..2ebdc23bbe26 100644
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -248,7 +248,7 @@ int br_sysfs_addif(struct net_bridge_port *p)
248 if (err) 248 if (err)
249 goto out2; 249 goto out2;
250 250
251 kobject_hotplug(&p->kobj, KOBJ_ADD); 251 kobject_uevent(&p->kobj, KOBJ_ADD);
252 return 0; 252 return 0;
253 out2: 253 out2:
254 kobject_del(&p->kobj); 254 kobject_del(&p->kobj);
@@ -260,7 +260,7 @@ void br_sysfs_removeif(struct net_bridge_port *p)
260{ 260{
261 pr_debug("br_sysfs_removeif\n"); 261 pr_debug("br_sysfs_removeif\n");
262 sysfs_remove_link(&p->br->ifobj, p->dev->name); 262 sysfs_remove_link(&p->br->ifobj, p->dev->name);
263 kobject_hotplug(&p->kobj, KOBJ_REMOVE); 263 kobject_uevent(&p->kobj, KOBJ_REMOVE);
264 kobject_del(&p->kobj); 264 kobject_del(&p->kobj);
265} 265}
266 266
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index e2137f3e489d..198655dd9a77 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -369,14 +369,14 @@ static struct attribute_group wireless_group = {
369#endif 369#endif
370 370
371#ifdef CONFIG_HOTPLUG 371#ifdef CONFIG_HOTPLUG
372static int netdev_hotplug(struct class_device *cd, char **envp, 372static int netdev_uevent(struct class_device *cd, char **envp,
373 int num_envp, char *buf, int size) 373 int num_envp, char *buf, int size)
374{ 374{
375 struct net_device *dev = to_net_dev(cd); 375 struct net_device *dev = to_net_dev(cd);
376 int i = 0; 376 int i = 0;
377 int n; 377 int n;
378 378
379 /* pass interface in env to hotplug. */ 379 /* pass interface to uevent. */
380 envp[i++] = buf; 380 envp[i++] = buf;
381 n = snprintf(buf, size, "INTERFACE=%s", dev->name) + 1; 381 n = snprintf(buf, size, "INTERFACE=%s", dev->name) + 1;
382 buf += n; 382 buf += n;
@@ -408,7 +408,7 @@ static struct class net_class = {
408 .name = "net", 408 .name = "net",
409 .release = netdev_release, 409 .release = netdev_release,
410#ifdef CONFIG_HOTPLUG 410#ifdef CONFIG_HOTPLUG
411 .hotplug = netdev_hotplug, 411 .uevent = netdev_uevent,
412#endif 412#endif
413}; 413};
414 414