From 00b46f0662dfda2204f3d8d8fa9e0be6bc177c01 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 23 Nov 2019 22:44:39 +0100
Subject: [PATCH] modules: update OpenWrt base
f97d2351e2c1 ath79: remove ath10k drivers from Archer C7 v1 profile
7c321e00dd19 kernel: nf_conntrack_rtcache: fix WARNING on rmmod
2a2f9ffe81ce kernel: nf_conntrack_rtcache: fix WARNING on forward path
---
modules | 2 +-
...ix-cleanup-on-netns-delete-and-rmmod.patch | 63 -------------------
2 files changed, 1 insertion(+), 64 deletions(-)
delete mode 100644 patches/openwrt/0006-Revert-kernel-nf_conntrack_rtcache-fix-cleanup-on-netns-delete-and-rmmod.patch
diff --git a/modules b/modules
index 56755d568..fa4c14357 100644
--- a/modules
+++ b/modules
@@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing gluon'
OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-19.07
-OPENWRT_COMMIT=15ce616c2de797259cc125f1ece5f2358ea4bd5a
+OPENWRT_COMMIT=f97d2351e2c1282cdfa0e5126bd6eef56d0e8252
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-19.07
diff --git a/patches/openwrt/0006-Revert-kernel-nf_conntrack_rtcache-fix-cleanup-on-netns-delete-and-rmmod.patch b/patches/openwrt/0006-Revert-kernel-nf_conntrack_rtcache-fix-cleanup-on-netns-delete-and-rmmod.patch
deleted file mode 100644
index 77470bf9a..000000000
--- a/patches/openwrt/0006-Revert-kernel-nf_conntrack_rtcache-fix-cleanup-on-netns-delete-and-rmmod.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 23 Nov 2019 16:43:00 +0100
-Subject: Revert "kernel: nf_conntrack_rtcache: fix cleanup on netns delete and rmmod"
-
-This reverts commit 436dbf12aa7381bd6db1b03b36be5a73df386eb4.
-
-https://bugs.openwrt.org/index.php?do=details&task_id=2624
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
-index d745a970269061c56ef92677db0e85e96207f58b..8a6fba4307c2f7f7384f7274f39cf54c1a0ea7ae 100644
---- a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
-+++ b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
-@@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
- # netlink interface for nf_conntrack
- --- /dev/null
- +++ b/net/netfilter/nf_conntrack_rtcache.c
--@@ -0,0 +1,440 @@
-+@@ -0,0 +1,428 @@
- +/* route cache for netfilter.
- + *
- + * (C) 2014 Red Hat GmbH
-@@ -444,11 +444,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
- + .destroy = nf_conn_rtcache_destroy,
- +};
- +
--+static int __net_init rtcache_net_init(struct net *net)
--+{
--+ return nf_register_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
--+}
--+
- +static void __net_exit rtcache_net_exit(struct net *net)
- +{
- + /* remove hooks so no new connections get rtcache extension */
-@@ -456,7 +451,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
- +}
- +
- +static struct pernet_operations rtcache_ops_net_ops = {
--+ .init = rtcache_net_init,
- + .exit = rtcache_net_exit,
- +};
- +
-@@ -537,11 +531,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
- + synchronize_net();
- +
- + unregister_netdevice_notifier(&nf_rtcache_notifier);
--+ unregister_pernet_subsys(&rtcache_ops_net_ops);
--+ for_each_net(net)
--+ nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
--+
--+ synchronize_net();
- +
- + rtnl_lock();
- +
-@@ -558,7 +547,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
- + }
- +
- + rtnl_unlock();
--+
- + synchronize_net();
- + nf_ct_extend_unregister(&rtcache_extend);
- +}
--
GitLab