From b64ca483ef643c1b86ccd68aee95beacc0f9edd6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau <nbd@openwrt.org> Date: Fri, 27 Feb 2015 07:35:26 +0000 Subject: [PATCH] kernel: fix 3.18+ if_bridge.h header conflict with musl Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44553 --- .../generic/patches-3.18/270-bridge_header_fix.patch | 10 ++++++++++ .../generic/patches-3.19/270-bridge_header_fix.patch | 10 ++++++++++ .../generic/patches-4.0/270-bridge_header_fix.patch | 10 ++++++++++ 3 files changed, 30 insertions(+) create mode 100644 target/linux/generic/patches-3.18/270-bridge_header_fix.patch create mode 100644 target/linux/generic/patches-3.19/270-bridge_header_fix.patch create mode 100644 target/linux/generic/patches-4.0/270-bridge_header_fix.patch 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" -- GitLab