86 lines
2.2 KiB
Diff
86 lines
2.2 KiB
Diff
Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
|
|
|
|
--- include/linux/if_bridge.h 2015-09-01 01:31:15.000000000 +0200
|
|
+++ include/linux/if_bridge.h 2015-09-14 16:23:24.472434012 +0200
|
|
@@ -15,7 +15,6 @@
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/if_ether.h>
|
|
-#include <linux/in6.h>
|
|
|
|
#define SYSFS_BRIDGE_ATTR "bridge"
|
|
#define SYSFS_BRIDGE_FDB "brforward"
|
|
--- include/linux/if_tunnel.h.orig
|
|
+++ include/linux/if_tunnel.h
|
|
@@ -2,9 +2,7 @@
|
|
#define _IF_TUNNEL_H_
|
|
|
|
#include <linux/types.h>
|
|
-#include <linux/if.h>
|
|
#include <linux/ip.h>
|
|
-#include <linux/in6.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
|
|
--- include/linux/l2tp.h.orig 2017-02-20 17:47:52.000000000 +0100
|
|
+++ include/linux/l2tp.h 2017-03-01 13:28:13.023515139 +0100
|
|
@@ -9,8 +9,6 @@
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/socket.h>
|
|
-#include <linux/in.h>
|
|
-#include <linux/in6.h>
|
|
|
|
#define IPPROTO_L2TP 115
|
|
|
|
--- include/linux/netfilter.h 2015-09-01 01:31:15.000000000 +0200
|
|
+++ include/linux/netfilter.h 2015-09-14 16:27:34.928205553 +0200
|
|
@@ -4,8 +4,6 @@
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/sysctl.h>
|
|
-#include <linux/in.h>
|
|
-#include <linux/in6.h>
|
|
|
|
/* Responses from hook functions. */
|
|
#define NF_DROP 0
|
|
--- include/linux/xfrm.h 2015-09-01 01:31:15.000000000 +0200
|
|
+++ include/linux/xfrm.h 2015-09-14 16:23:24.473434008 +0200
|
|
@@ -1,7 +1,6 @@
|
|
#ifndef _LINUX_XFRM_H
|
|
#define _LINUX_XFRM_H
|
|
|
|
-#include <linux/in6.h>
|
|
#include <linux/types.h>
|
|
|
|
/* All of the structures in this file may not change size as they are
|
|
--- include/utils.h 2015-09-01 01:31:15.000000000 +0200
|
|
+++ include/utils.h 2015-09-14 16:23:24.472434012 +0200
|
|
@@ -1,6 +1,7 @@
|
|
#ifndef __UTILS_H__
|
|
#define __UTILS_H__ 1
|
|
|
|
+#include <sys/param.h> /* MAXPATHLEN */
|
|
#include <sys/types.h>
|
|
#include <asm/types.h>
|
|
#include <resolv.h>
|
|
--- include/linux/netfilter_ipv4/ip_tables.h.orig
|
|
+++ include/linux/netfilter_ipv4/ip_tables.h
|
|
@@ -17,7 +17,6 @@
|
|
|
|
#include <linux/types.h>
|
|
|
|
-#include <linux/if.h>
|
|
#include <linux/netfilter_ipv4.h>
|
|
|
|
#include <linux/netfilter/x_tables.h>
|
|
--- include/bpf_scm.h.orig
|
|
+++ include/bpf_scm.h
|
|
@@ -3,6 +3,7 @@
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
+#include <sys/un.h>
|
|
|
|
#include "utils.h"
|
|
#include "bpf_elf.h"
|