From: Randy Dunlap <rdunlap@infradead.org>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: linux-next: Tree for Apr 23 (netlink)
Date: Tue, 23 Apr 2013 13:27:20 -0700 [thread overview]
Message-ID: <5176EEA8.1010507@infradead.org> (raw)
In-Reply-To: <20130423.151949.1174398672200053405.davem@davemloft.net>
On 04/23/13 12:19, David Miller wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> Date: Tue, 23 Apr 2013 11:04:18 -0700
>
>> On 04/23/13 01:00, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20130422:
>>>
>>> The net-next tree lost its build failure but gained another for which I
>>> applied a patch.
>>>
>>
>>
>> when CONFIG_NETLINK_MMAP is not enabled:
>>
>> net/netlink/diag.c: In function 'sk_diag_put_rings_cfg':
>> net/netlink/diag.c:28:17: error: 'struct netlink_sock' has no member named 'pg_vec_lock'
>> net/netlink/diag.c:29:29: error: 'struct netlink_sock' has no member named 'rx_ring'
>> net/netlink/diag.c:31:30: error: 'struct netlink_sock' has no member named 'tx_ring'
>> net/netlink/diag.c:33:19: error: 'struct netlink_sock' has no member named 'pg_vec_lock'
>
> Thanks Randy, I'm testing out the following fix:
>
Works for me. Thanks.
Acked-by: Randy Dunlap <rdunlap@infradead.org>
> diff --git a/net/netlink/diag.c b/net/netlink/diag.c
> index 4e4aa47..1af2962 100644
> --- a/net/netlink/diag.c
> +++ b/net/netlink/diag.c
> @@ -7,6 +7,7 @@
>
> #include "af_netlink.h"
>
> +#ifdef CONFIG_NETLINK_MMAP
> static int sk_diag_put_ring(struct netlink_ring *ring, int nl_type,
> struct sk_buff *nlskb)
> {
> @@ -34,6 +35,12 @@ static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb)
>
> return ret;
> }
> +#else
> +static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb)
> +{
> + return 0;
> +}
> +#endif
>
> static int sk_diag_dump_groups(struct sock *sk, struct sk_buff *nlskb)
> {
> --
--
~Randy
next prev parent reply other threads:[~2013-04-23 20:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-23 8:00 linux-next: Tree for Apr 23 Stephen Rothwell
2013-04-23 18:04 ` linux-next: Tree for Apr 23 (netlink) Randy Dunlap
2013-04-23 19:19 ` David Miller
2013-04-23 20:27 ` Randy Dunlap [this message]
[not found] ` <20130423180028.e08f92e6cc72105f67b77491-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2013-04-23 18:53 ` linux-next: Tree for Apr 23 (usb storage) Randy Dunlap
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=5176EEA8.1010507@infradead.org \
--to=rdunlap@infradead.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).