298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: fix 5.19 patch build error

Browse Source
This commit is contained in:
lean 2022-08-04 19:19:25 +08:00
parent 690ee8c181
commit 94f7c18695
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch
View File

@ -53,32 +53,31 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
e = nf_ct_ecache_find(ct); e = nf_ct_ecache_find(ct);
if (e == NULL) if (e == NULL)
@@ -128,10 +135,12 @@ nf_conntrack_event_report(enum ip_conntr @@ -117,20 +124,24 @@
u32 portid, int report) u32 portid, int report)
{ {
#ifdef CONFIG_NF_CONNTRACK_EVENTS #ifdef CONFIG_NF_CONNTRACK_EVENTS
+#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS +#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
const struct net *net = nf_ct_net(ct); if (nf_ct_ecache_exist(ct))
return nf_conntrack_eventmask_report(1 << event, ct, portid, report);
if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb)) #endif
return 0; return 0;
+#endif +#endif
}
return nf_conntrack_eventmask_report(1 << event, ct, portid, report); static inline int
#else
@@ -143,10 +152,12 @@ static inline int
nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct) nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct)
{ {
#ifdef CONFIG_NF_CONNTRACK_EVENTS #ifdef CONFIG_NF_CONNTRACK_EVENTS
+#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS +#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
const struct net *net = nf_ct_net(ct); if (nf_ct_ecache_exist(ct))
return nf_conntrack_eventmask_report(1 << event, ct, 0, 0);
if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb)) #endif
return 0; return 0;
+#endif +#endif
}
return nf_conntrack_eventmask_report(1 << event, ct, 0, 0); #ifdef CONFIG_NF_CONNTRACK_EVENTS
#else
--- a/include/net/netns/conntrack.h --- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h
@@ -112,6 +112,9 @@ struct netns_ct { @@ -112,6 +112,9 @@ struct netns_ct {