From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 27 Feb 2015 07:35:26 +0000 (+0000)
Subject: kernel: fix 3.18+ if_bridge.h header conflict with musl
X-Git-Tag: v19.07.0-rc1~14822
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b64ca483ef643c1b86ccd68aee95beacc0f9edd6;p=openwrt%2Fstaging%2Fhauke.git

kernel: fix 3.18+ if_bridge.h header conflict with musl

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 44553
---

diff --git a/target/linux/generic/patches-3.18/270-bridge_header_fix.patch b/target/linux/generic/patches-3.18/270-bridge_header_fix.patch
new file mode 100644
index 0000000000..8b25db400a
--- /dev/null
+++ b/target/linux/generic/patches-3.18/270-bridge_header_fix.patch
@@ -0,0 +1,10 @@
+--- a/include/uapi/linux/if_bridge.h
++++ b/include/uapi/linux/if_bridge.h
+@@ -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"
diff --git a/target/linux/generic/patches-3.19/270-bridge_header_fix.patch b/target/linux/generic/patches-3.19/270-bridge_header_fix.patch
new file mode 100644
index 0000000000..8b25db400a
--- /dev/null
+++ b/target/linux/generic/patches-3.19/270-bridge_header_fix.patch
@@ -0,0 +1,10 @@
+--- a/include/uapi/linux/if_bridge.h
++++ b/include/uapi/linux/if_bridge.h
+@@ -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"
diff --git a/target/linux/generic/patches-4.0/270-bridge_header_fix.patch b/target/linux/generic/patches-4.0/270-bridge_header_fix.patch
new file mode 100644
index 0000000000..8b25db400a
--- /dev/null
+++ b/target/linux/generic/patches-4.0/270-bridge_header_fix.patch
@@ -0,0 +1,10 @@
+--- a/include/uapi/linux/if_bridge.h
++++ b/include/uapi/linux/if_bridge.h
+@@ -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"