From: Randy Dunlap <randy.dunlap@oracle.com>
To: Tom Herbert <therbert@google.com>
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: Re: rps: Fix build with CONFIG_SYSFS enabled
Date: Mon, 22 Mar 2010 14:48:47 -0700 [thread overview]
Message-ID: <4BA7E5BF.1080805@oracle.com> (raw)
In-Reply-To: <alpine.DEB.1.00.1003221355380.25849@pokey.mtv.corp.google.com>
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
next prev parent reply other threads:[~2010-03-22 21:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-22 20:57 rps: Fix build with CONFIG_SYSFS enabled Tom Herbert
2010-03-22 21:48 ` Randy Dunlap [this message]
2010-03-23 1:07 ` David Miller
2010-03-23 1:07 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BA7E5BF.1080805@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=therbert@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).