aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-02-27 07:35:26 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-02-27 07:35:26 +0000
commitb64ca483ef643c1b86ccd68aee95beacc0f9edd6 (patch)
tree7d509f9da974d00c3e45fc4c3fc0f53a89efa639 /target/linux/generic
parent1a3028b2fc817080d127a8daaa185e25f011a47f (diff)
downloadupstream-b64ca483ef643c1b86ccd68aee95beacc0f9edd6.tar.gz
upstream-b64ca483ef643c1b86ccd68aee95beacc0f9edd6.tar.bz2
upstream-b64ca483ef643c1b86ccd68aee95beacc0f9edd6.zip
kernel: fix 3.18+ if_bridge.h header conflict with musl
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44553
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.18/270-bridge_header_fix.patch10
-rw-r--r--target/linux/generic/patches-3.19/270-bridge_header_fix.patch10
-rw-r--r--target/linux/generic/patches-4.0/270-bridge_header_fix.patch10
3 files changed, 30 insertions, 0 deletions
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"