Skip to content

Commit

Permalink
rps: fix net-sysfs build for !CONFIG_RPS
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Rothwell authored and David S. Miller committed Mar 29, 2010
1 parent 10f744d commit 30bde1f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions net/core/net-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ static struct attribute_group wireless_group = {
};
#endif

#ifdef CONFIG_RPS
/*
* RX queue sysfs structures and functions.
*/
Expand Down Expand Up @@ -675,7 +676,7 @@ static void rx_queue_remove_kobjects(struct net_device *net)
kobject_put(&net->_rx[i].kobj);
kset_unregister(net->queues_kset);
}

#endif /* CONFIG_RPS */
#endif /* CONFIG_SYSFS */

#ifdef CONFIG_HOTPLUG
Expand Down Expand Up @@ -739,7 +740,7 @@ void netdev_unregister_kobject(struct net_device * net)
if (!net_eq(dev_net(net), &init_net))
return;

#ifdef CONFIG_SYSFS
#ifdef CONFIG_RPS
rx_queue_remove_kobjects(net);
#endif

Expand Down Expand Up @@ -782,7 +783,7 @@ int netdev_register_kobject(struct net_device *net)
if (error)
return error;

#ifdef CONFIG_SYSFS
#ifdef CONFIG_RPS
error = rx_queue_register_kobjects(net);
if (error) {
device_del(dev);
Expand Down

0 comments on commit 30bde1f

Please sign in to comment.