* Re: linux-next: Tree for Apr 23 (netlink)
[not found] <20130423180028.e08f92e6cc72105f67b77491@canb.auug.org.au>
@ 2013-04-23 18:04 ` Randy Dunlap
2013-04-23 19:19 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2013-04-23 18:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, netdev@vger.kernel.org
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'
--
~Randy
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: Tree for Apr 23 (netlink)
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
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2013-04-23 19:19 UTC (permalink / raw)
To: rdunlap; +Cc: sfr, linux-next, linux-kernel, netdev
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:
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)
{
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: linux-next: Tree for Apr 23 (netlink)
2013-04-23 19:19 ` David Miller
@ 2013-04-23 20:27 ` Randy Dunlap
0 siblings, 0 replies; 3+ messages in thread
From: Randy Dunlap @ 2013-04-23 20:27 UTC (permalink / raw)
To: David Miller; +Cc: sfr, linux-next, linux-kernel, netdev
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-23 20:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20130423180028.e08f92e6cc72105f67b77491@canb.auug.org.au>
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 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).