f07fe36f22
Move patches to backport-5.10, since the series was accepted upstream Signed-off-by: Felix Fietkau <nbd@nbd.name>
23 lines
680 B
Diff
23 lines
680 B
Diff
From: YueHaibing <yuehaibing@huawei.com>
|
|
Date: Tue, 23 Mar 2021 00:56:21 +0100
|
|
Subject: [PATCH] netfilter: conntrack: Remove unused variable
|
|
declaration
|
|
|
|
commit e97c3e278e95 ("tproxy: split off ipv6 defragmentation to a separate
|
|
module") left behind this.
|
|
|
|
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
|
|
--- a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
|
|
+++ b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
|
|
@@ -4,7 +4,4 @@
|
|
|
|
extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;
|
|
|
|
-#include <linux/sysctl.h>
|
|
-extern struct ctl_table nf_ct_ipv6_sysctl_table[];
|
|
-
|
|
#endif /* _NF_CONNTRACK_IPV6_H*/
|