summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2017-02-16 18:04:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-21 17:21:37 +0200
commit939f4f6ec7414246d7a6ff3cafc0eea42c699eac (patch)
tree9ad3f2ee33a918565540ca87e183880e00b650cc
parentad50561ba7a664bc581826c9d57d137fcf17bfa5 (diff)
downloadlinux-stable-939f4f6ec7414246d7a6ff3cafc0eea42c699eac.tar.gz
linux-stable-939f4f6ec7414246d7a6ff3cafc0eea42c699eac.tar.bz2
linux-stable-939f4f6ec7414246d7a6ff3cafc0eea42c699eac.zip
uapi: fix linux/mroute6.h userspace compilation errors
[ Upstream commit 72aa107df6a275cf03359934ca5799a2be7a1bf7 ] Include <linux/in6.h> to fix the following linux/mroute6.h userspace compilation errors: /usr/include/linux/mroute6.h:80:22: error: field 'mf6cc_origin' has incomplete type struct sockaddr_in6 mf6cc_origin; /* Origin of mcast */ /usr/include/linux/mroute6.h:81:22: error: field 'mf6cc_mcastgrp' has incomplete type struct sockaddr_in6 mf6cc_mcastgrp; /* Group in question */ /usr/include/linux/mroute6.h:91:22: error: field 'src' has incomplete type struct sockaddr_in6 src; /usr/include/linux/mroute6.h:92:22: error: field 'grp' has incomplete type struct sockaddr_in6 grp; /usr/include/linux/mroute6.h:132:18: error: field 'im6_src' has incomplete type struct in6_addr im6_src, im6_dst; /usr/include/linux/mroute6.h:132:27: error: field 'im6_dst' has incomplete type struct in6_addr im6_src, im6_dst; Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/uapi/linux/mroute6.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h
index 5062fb5751e1..ed5721148768 100644
--- a/include/uapi/linux/mroute6.h
+++ b/include/uapi/linux/mroute6.h
@@ -4,6 +4,7 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/sockios.h>
+#include <linux/in6.h> /* For struct sockaddr_in6. */
/*
* Based on the MROUTING 3.5 defines primarily to keep