summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-04-23 15:39:03 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-23 15:39:03 -0400
commit3dec2246c2ff11beb24ca1950f074b2bcbc85953 (patch)
tree1241f84a112d11d82d9a921daa8bd4034a8bd0d8
parentc002090cfaad91859ae25bb7ee24dac8ec1f3188 (diff)
downloadlinux-3dec2246c2ff11beb24ca1950f074b2bcbc85953.tar.gz
linux-3dec2246c2ff11beb24ca1950f074b2bcbc85953.tar.bz2
linux-3dec2246c2ff11beb24ca1950f074b2bcbc85953.zip
netlink: Fix build with mmap disabled.
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' Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/netlink/diag.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/netlink/diag.c b/net/netlink/diag.c
index 4e4aa471cd05..1af29624b92f 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)
{