From 3fcfbe0b1d0e8e6e63218e88de5452df898cd2f5 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 17 Jun 2015 00:08:30 +0200 Subject: [PATCH] Revert netns_ct ABI change introduced in r44874 Fixes compatiblity with upstream kernel modules. --- ...s_ct-ABI-change-introduced-in-r44874.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 patches/openwrt/0039-Revert-netns_ct-ABI-change-introduced-in-r44874.patch diff --git a/patches/openwrt/0039-Revert-netns_ct-ABI-change-introduced-in-r44874.patch b/patches/openwrt/0039-Revert-netns_ct-ABI-change-introduced-in-r44874.patch new file mode 100644 index 00000000..8e80d3dd --- /dev/null +++ b/patches/openwrt/0039-Revert-netns_ct-ABI-change-introduced-in-r44874.patch @@ -0,0 +1,20 @@ +From: Matthias Schiffer +Date: Wed, 17 Jun 2015 00:03:39 +0200 +Subject: Revert netns_ct ABI change introduced in r44874 + +diff --git a/target/linux/generic/patches-3.10/617-netfilter_skip_filter_compat.patch b/target/linux/generic/patches-3.10/617-netfilter_skip_filter_compat.patch +new file mode 100644 +index 0000000..dce0cd0 +--- /dev/null ++++ b/target/linux/generic/patches-3.10/617-netfilter_skip_filter_compat.patch +@@ -0,0 +1,10 @@ ++--- a/include/net/netns/conntrack.h +++++ b/include/net/netns/conntrack.h ++@@ -80,6 +80,7 @@ struct netns_ct { ++ int sysctl_acct; ++ int sysctl_tstamp; ++ int sysctl_checksum; +++ int skip_filter; ++ unsigned int sysctl_log_invalid; /* Log invalid packets */ ++ int sysctl_auto_assign_helper; ++ bool auto_assign_helper_warned;