diff options
author | Greg KH <gregkh@linuxfoundation.org> | 2012-12-21 08:44:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-22 03:03:00 -0500 |
commit | 8baf82b368d23aed5c96b01ed7110cdccdd18725 (patch) | |
tree | d67ced86c08d6773030d4a816951fcafa4d21a16 /net/core | |
parent | 03ce758e56c483bf5d0035dbd1a53ca2940a3eb0 (diff) |
CONFIG_HOTPLUG removal from networking core
CONFIG_HOTPLUG is always enabled now, so remove the unused code that was
trying to be compiled out when this option was disabled, in the
networking core.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/net-sysfs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 334efd5d67a9..28c5f5aa7ca7 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c | |||
@@ -1334,7 +1334,6 @@ struct kobj_ns_type_operations net_ns_type_operations = { | |||
1334 | }; | 1334 | }; |
1335 | EXPORT_SYMBOL_GPL(net_ns_type_operations); | 1335 | EXPORT_SYMBOL_GPL(net_ns_type_operations); |
1336 | 1336 | ||
1337 | #ifdef CONFIG_HOTPLUG | ||
1338 | static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) | 1337 | static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) |
1339 | { | 1338 | { |
1340 | struct net_device *dev = to_net_dev(d); | 1339 | struct net_device *dev = to_net_dev(d); |
@@ -1353,7 +1352,6 @@ static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) | |||
1353 | exit: | 1352 | exit: |
1354 | return retval; | 1353 | return retval; |
1355 | } | 1354 | } |
1356 | #endif | ||
1357 | 1355 | ||
1358 | /* | 1356 | /* |
1359 | * netdev_release -- destroy and free a dead device. | 1357 | * netdev_release -- destroy and free a dead device. |
@@ -1382,9 +1380,7 @@ static struct class net_class = { | |||
1382 | #ifdef CONFIG_SYSFS | 1380 | #ifdef CONFIG_SYSFS |
1383 | .dev_attrs = net_class_attributes, | 1381 | .dev_attrs = net_class_attributes, |
1384 | #endif /* CONFIG_SYSFS */ | 1382 | #endif /* CONFIG_SYSFS */ |
1385 | #ifdef CONFIG_HOTPLUG | ||
1386 | .dev_uevent = netdev_uevent, | 1383 | .dev_uevent = netdev_uevent, |
1387 | #endif | ||
1388 | .ns_type = &net_ns_type_operations, | 1384 | .ns_type = &net_ns_type_operations, |
1389 | .namespace = net_namespace, | 1385 | .namespace = net_namespace, |
1390 | }; | 1386 | }; |