diff mbox

linux-next: Tree for Apr 23 (netlink)

Message ID 20130423.151949.1174398672200053405.davem@davemloft.net
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

David Miller April 23, 2013, 7:19 p.m. UTC 
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:

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Randy Dunlap April 23, 2013, 8:27 p.m. UTC | #1 
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)
>  {
> --
diff mbox

Patch

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)
 {