Skip to contentSkip to conversation

netlink: compiling issue, need a dummy function sk_diag_put_rings_cfg when CONFIG_NETLINK_MMAP disabled

PATCH In review Chen Gang 2 participants 3 messages Apr 24, 2013

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Chen Gang

author
#0 lore raw

PATCH 1/1 netlink: compiling issue, need a dummy function sk_diag_put_rings_cfg when CONFIG_NETLINK_MMAP disabled

When disable CONFIG_NETLINK_MMAP, need a dummy function for sk_diag_put_rings_cfg, or will cause compiling issue.

Signed-off-by Chen Gang <[email protected]>
---
 net/netlink/diag.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
net/netlink/diag.c +11 -0
index 4e4aa47..d0ab090 100644
@@ -7,6 +7,8 @@
 
 #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)
 {

@@ -35,6 +37,15 @@ static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb)
 	return ret;
 }
 
+#else /* !CONFIG_NETLINK_MMAP */
+
+static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb)
+{
+	return 0;
+}
+
+#endif /* CONFIG_NETLINK_MMAP */
+
 static int sk_diag_dump_groups(struct sock *sk, struct sk_buff *nlskb)
 {
 	struct netlink_sock *nlk = nlk_sk(sk);
Signature · 1 line
1.7.7.6
author
#2 lore raw
Quoted 11 lines · David Miller

aFrom: Chen Gang <[email protected]>
Date: Wed, 24 Apr 2013 16:09:43 +0800

Quoted 5 lines
Quoted 5 lines

When disable CONFIG_NETLINK_MMAP, need a dummy function for sk_diag_put_rings_cfg, or will cause compiling issue.

Signed-off-by Chen Gang <[email protected]>

This was fixed more than 12 hours ago.

Ok, thanks.

Signature · 3 lines
Chen Gang

Asianux Corporation