From: Tom Herbert <therbert@google.com>
Date: Tue, 23 Mar 2010 01:06:47 +0000 (-0700)
Subject: rps: Fix build with CONFIG_SYSFS enabled
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e880eb6c5c9d98e389ffc0d8947f75d70785361a;p=deliverable%2Flinux.git

rps: Fix build with CONFIG_SYSFS enabled

Fix build with CONFIG_SYSFS not enabled.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 7a46343d5ae3..f6b6bfee72ae 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -739,7 +739,9 @@ void netdev_unregister_kobject(struct net_device * net)
 	if (!net_eq(dev_net(net), &init_net))
 		return;
 
+#ifdef CONFIG_SYSFS
 	rx_queue_remove_kobjects(net);
+#endif
 
 	device_del(dev);
 }
@@ -780,11 +782,13 @@ int netdev_register_kobject(struct net_device *net)
 	if (error)
 		return error;
 
+#ifdef CONFIG_SYSFS
 	error = rx_queue_register_kobjects(net);
 	if (error) {
 		device_del(dev);
 		return error;
 	}
+#endif
 
 	return error;
 }