From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
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)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
