lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rps: fix net-sysfs build for !CONFIG_RPS

Browse Source 
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>
This commit is contained in:
Stephen Rothwell
2010-03-29 01:00:44 -07:00
committed by David S. Miller
parent 10f744d205
commit 30bde1f507
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/net-sysfs.c
View File

@@ -466,6 +466,7 @@ static struct attribute_group wireless_group = {
}; };
#endif #endif
#ifdef CONFIG_RPS
/* /*
* RX queue sysfs structures and functions. * RX queue sysfs structures and functions.
*/ */
@@ -675,7 +676,7 @@ static void rx_queue_remove_kobjects(struct net_device *net)
kobject_put(&net->_rx[i].kobj); kobject_put(&net->_rx[i].kobj);
kset_unregister(net->queues_kset); kset_unregister(net->queues_kset);
} }
#endif /* CONFIG_RPS */
#endif /* CONFIG_SYSFS */ #endif /* CONFIG_SYSFS */
#ifdef CONFIG_HOTPLUG #ifdef CONFIG_HOTPLUG
@@ -739,7 +740,7 @@ void netdev_unregister_kobject(struct net_device * net)
if (!net_eq(dev_net(net), &init_net)) if (!net_eq(dev_net(net), &init_net))
return; return;
#ifdef CONFIG_SYSFS #ifdef CONFIG_RPS
rx_queue_remove_kobjects(net); rx_queue_remove_kobjects(net);
#endif #endif
@@ -782,7 +783,7 @@ int netdev_register_kobject(struct net_device *net)
if (error) if (error)
return error; return error;
#ifdef CONFIG_SYSFS #ifdef CONFIG_RPS
error = rx_queue_register_kobjects(net); error = rx_queue_register_kobjects(net);
if (error) { if (error) {
device_del(dev); device_del(dev);