aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/940-cleanup-offload-hooks-on-netdev-unregister.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-06-27 22:21:57 +0200
committerJohn Crispin <john@phrozen.org>2018-07-02 07:04:48 +0200
commitf4ac88b5097685950c6f6ba0077840f85446389f (patch)
treee59cf8cc6d784d5110d14d0faa57d266c63a88e7 /target/linux/generic/hack-4.14/940-cleanup-offload-hooks-on-netdev-unregister.patch
parent8e622aae583904a87f358535294bbe5e0088ef8c (diff)
downloadupstream-f4ac88b5097685950c6f6ba0077840f85446389f.tar.gz
upstream-f4ac88b5097685950c6f6ba0077840f85446389f.tar.bz2
upstream-f4ac88b5097685950c6f6ba0077840f85446389f.zip
kernel: bump 4.14 to 4.14.52
Refreshed all patches Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.14/940-cleanup-offload-hooks-on-netdev-unregister.patch')
-rw-r--r--target/linux/generic/hack-4.14/940-cleanup-offload-hooks-on-netdev-unregister.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic/hack-4.14/940-cleanup-offload-hooks-on-netdev-unregister.patch b/target/linux/generic/hack-4.14/940-cleanup-offload-hooks-on-netdev-unregister.patch
index 7b0b234722..6638a5e949 100644
--- a/target/linux/generic/hack-4.14/940-cleanup-offload-hooks-on-netdev-unregister.patch
+++ b/target/linux/generic/hack-4.14/940-cleanup-offload-hooks-on-netdev-unregister.patch
@@ -37,11 +37,9 @@ Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
net/netfilter/xt_FLOWOFFLOAD.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
-diff --git a/net/netfilter/xt_FLOWOFFLOAD.c b/net/netfilter/xt_FLOWOFFLOAD.c
-index ab6259e..3bea08e 100644
--- a/net/netfilter/xt_FLOWOFFLOAD.c
+++ b/net/netfilter/xt_FLOWOFFLOAD.c
-@@ -337,10 +337,41 @@ static void xt_flowoffload_table_cleanup(struct nf_flowtable *table)
+@@ -340,10 +340,41 @@ static void xt_flowoffload_table_cleanup
nf_flow_table_free(table);
}
@@ -83,7 +81,7 @@ index ab6259e..3bea08e 100644
INIT_DELAYED_WORK(&hook_work, xt_flowoffload_hook_work);
ret = xt_flowoffload_table_init(&nf_flowtable);
-@@ -358,6 +389,7 @@ static void __exit xt_flowoffload_tg_exit(void)
+@@ -361,6 +392,7 @@ static void __exit xt_flowoffload_tg_exi
{
xt_unregister_target(&offload_tg_reg);
xt_flowoffload_table_cleanup(&nf_flowtable);
@@ -91,6 +89,3 @@ index ab6259e..3bea08e 100644
}
MODULE_LICENSE("GPL");
---
-2.17.0
-