* rps: Fix build with CONFIG_SYSFS enabled
@ 2010-03-22 20:57 Tom Herbert
2010-03-22 21:48 ` Randy Dunlap
2010-03-23 1:07 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Tom Herbert @ 2010-03-22 20:57 UTC (permalink / raw)
To: davem; +Cc: netdev
Fix build with CONFIG_SYSFS not enabled.
Signed-off-by: Tom Herbert <therbert@google.com>
---
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 7a46343..f6b6bfe 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;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: rps: Fix build with CONFIG_SYSFS enabled
2010-03-22 20:57 rps: Fix build with CONFIG_SYSFS enabled Tom Herbert
@ 2010-03-22 21:48 ` Randy Dunlap
2010-03-23 1:07 ` David Miller
2010-03-23 1:07 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2010-03-22 21:48 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, netdev
On 03/22/10 13:57, Tom Herbert wrote:
> Fix build with CONFIG_SYSFS not enabled.
>
>
> Signed-off-by: Tom Herbert <therbert@google.com>
> ---
> diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
> index 7a46343..f6b6bfe 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;
> }
>
> --
Dave, this patch and Eric's patch both build OK. Your choice...
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: rps: Fix build with CONFIG_SYSFS enabled
2010-03-22 20:57 rps: Fix build with CONFIG_SYSFS enabled Tom Herbert
2010-03-22 21:48 ` Randy Dunlap
@ 2010-03-23 1:07 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2010-03-23 1:07 UTC (permalink / raw)
To: therbert; +Cc: netdev
From: Tom Herbert <therbert@google.com>
Date: Mon, 22 Mar 2010 13:57:56 -0700 (PDT)
> Fix build with CONFIG_SYSFS not enabled.
>
> Signed-off-by: Tom Herbert <therbert@google.com>
Applied, thanks everyone.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-23 1:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-22 20:57 rps: Fix build with CONFIG_SYSFS enabled Tom Herbert
2010-03-22 21:48 ` Randy Dunlap
2010-03-23 1:07 ` David Miller
2010-03-23 1:07 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).