From 9134c843b3334712fe2022ae2afec798e79d7a65 Mon Sep 17 00:00:00 2001

From: David Lebrun <david.lebrun@uclouvain.be>

Date: Sun, 15 Jan 2017 15:26:16 +0100

Subject: [PATCH 02/41] ipv6: sr: add missing Kbuild export for header files

Add missing IPv6-SR header files in include/uapi/linux/Kbuild.

Also, prevent seg6_lwt_headroom() from being exported and add

missing linux/types.h include.

Signed-off-by: David Lebrun <david.lebrun@uclouvain.be>

Signed-off-by: David S. Miller <davem@davemloft.net>

---

 include/uapi/linux/Kbuild          | 4 ++++

 include/uapi/linux/seg6.h          | 2 ++

 include/uapi/linux/seg6_hmac.h     | 1 +

 include/uapi/linux/seg6_iptunnel.h | 4 ++++

 4 files changed, 11 insertions(+)

diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild

index f330ba4..e600b50 100644

--- a/include/uapi/linux/Kbuild

+++ b/include/uapi/linux/Kbuild

@@ -379,6 +379,10 @@ header-y += sctp.h

 header-y += sdla.h

 header-y += seccomp.h

 header-y += securebits.h

+header-y += seg6_genl.h

+header-y += seg6.h

+header-y += seg6_hmac.h

+header-y += seg6_iptunnel.h

 header-y += selinux_netlink.h

 header-y += sem.h

 header-y += serial_core.h

diff --git a/include/uapi/linux/seg6.h b/include/uapi/linux/seg6.h

index 052799e..61df8d3 100644

--- a/include/uapi/linux/seg6.h

+++ b/include/uapi/linux/seg6.h

@@ -14,6 +14,8 @@

 #ifndef _UAPI_LINUX_SEG6_H

 #define _UAPI_LINUX_SEG6_H

+#include <linux/types.h>

+

 /*

  * SRH

  */

diff --git a/include/uapi/linux/seg6_hmac.h b/include/uapi/linux/seg6_hmac.h

index b652dfd..e691c75 100644

--- a/include/uapi/linux/seg6_hmac.h

+++ b/include/uapi/linux/seg6_hmac.h

@@ -1,6 +1,7 @@

 #ifndef _UAPI_LINUX_SEG6_HMAC_H

 #define _UAPI_LINUX_SEG6_HMAC_H

+#include <linux/types.h>

 #include <linux/seg6.h>

 #define SEG6_HMAC_SECRET_LEN	64

diff --git a/include/uapi/linux/seg6_iptunnel.h b/include/uapi/linux/seg6_iptunnel.h

index 0f7dbd2..7a7183d 100644

--- a/include/uapi/linux/seg6_iptunnel.h

+++ b/include/uapi/linux/seg6_iptunnel.h

@@ -33,6 +33,8 @@ enum {

 	SEG6_IPTUN_MODE_ENCAP,

 };

+#ifdef __KERNEL__

+

 static inline size_t seg6_lwt_headroom(struct seg6_iptunnel_encap *tuninfo)

 {

 	int encap = (tuninfo->mode == SEG6_IPTUN_MODE_ENCAP);

@@ -42,3 +44,5 @@ static inline size_t seg6_lwt_headroom(struct seg6_iptunnel_encap *tuninfo)

 }

 #endif

+

+#endif

-- 

ldv