diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-29 04:00:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-29 04:00:44 -0400 |
commit | 30bde1f5076a9b6bd4b6a168523930ce242c7449 (patch) | |
tree | 541596568b322479246ada5d92e73a0a041cb212 /net/core/net-sysfs.c | |
parent | 10f744d205dde72a0016dbdb11e239da8269958b (diff) |
rps: fix net-sysfs build for !CONFIG_RPS
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/net-sysfs.c')
-rw-r--r-- | net/core/net-sysfs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index f6b6bfee72ae..1e7fdd6029a2 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c | |||
@@ -466,6 +466,7 @@ static struct attribute_group wireless_group = { | |||
466 | }; | 466 | }; |
467 | #endif | 467 | #endif |
468 | 468 | ||
469 | #ifdef CONFIG_RPS | ||
469 | /* | 470 | /* |
470 | * RX queue sysfs structures and functions. | 471 | * RX queue sysfs structures and functions. |
471 | */ | 472 | */ |
@@ -675,7 +676,7 @@ static void rx_queue_remove_kobjects(struct net_device *net) | |||
675 | kobject_put(&net->_rx[i].kobj); | 676 | kobject_put(&net->_rx[i].kobj); |
676 | kset_unregister(net->queues_kset); | 677 | kset_unregister(net->queues_kset); |
677 | } | 678 | } |
678 | 679 | #endif /* CONFIG_RPS */ | |
679 | #endif /* CONFIG_SYSFS */ | 680 | #endif /* CONFIG_SYSFS */ |
680 | 681 | ||
681 | #ifdef CONFIG_HOTPLUG | 682 | #ifdef CONFIG_HOTPLUG |
@@ -739,7 +740,7 @@ void netdev_unregister_kobject(struct net_device * net) | |||
739 | if (!net_eq(dev_net(net), &init_net)) | 740 | if (!net_eq(dev_net(net), &init_net)) |
740 | return; | 741 | return; |
741 | 742 | ||
742 | #ifdef CONFIG_SYSFS | 743 | #ifdef CONFIG_RPS |
743 | rx_queue_remove_kobjects(net); | 744 | rx_queue_remove_kobjects(net); |
744 | #endif | 745 | #endif |
745 | 746 | ||
@@ -782,7 +783,7 @@ int netdev_register_kobject(struct net_device *net) | |||
782 | if (error) | 783 | if (error) |
783 | return error; | 784 | return error; |
784 | 785 | ||
785 | #ifdef CONFIG_SYSFS | 786 | #ifdef CONFIG_RPS |
786 | error = rx_queue_register_kobjects(net); | 787 | error = rx_queue_register_kobjects(net); |
787 | if (error) { | 788 | if (error) { |
788 | device_del(dev); | 789 | device_del(dev); |