fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux: refresh shortcut-fe patches

Browse Source
This commit is contained in:
CN_SZTL 2020-11-13 17:53:52 +00:00
parent 77a15e9d59
commit 6e6805917e
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/generic/hack-4.14/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

@ -162,7 +162,7 @@
+EXPORT_SYMBOL_GPL(br_dev_update_stats);
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
@@ -162,7 +162,11 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,
@@ -162,7 +162,11 @@ int nf_conntrack_eventmask_report(unsign
rcu_read_lock();
notify = rcu_dereference(net->ct.nf_conntrack_event_cb);
@ -189,7 +189,7 @@
if (unlikely(ret < 0 || missed)) {
spin_lock_bh(&ct->lock);
if (ret < 0) {
@@ -263,7 +274,11 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct)
@@ -263,7 +274,11 @@ void nf_ct_deliver_cached_events(struct
rcu_read_lock();
notify = rcu_dereference(net->ct.nf_conntrack_event_cb);
@ -201,8 +201,7 @@
goto out_unlock;
e = nf_ct_ecache_find(ct);
if (e == NULL)
@@ -287,7 +300,15 @@ void nf_ct_deliver_cached_events(struct
@@ -287,7 +302,15 @@ void nf_ct_deliver_cached_events(struct
item.portid = 0;
item.report = 0;
@ -218,7 +217,7 @@
if (likely(ret == 0 && !missed))
goto out_unlock;
@@ -340,6 +363,11 @@ int nf_conntrack_register_notifier(struct net *net, struct notifier_block *nb)
@@ -340,6 +363,11 @@ int nf_conntrack_register_notifier(struc
{
return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb);
}
@ -230,7 +229,7 @@
#else
int nf_conntrack_register_notifier(struct net *net,
struct nf_ct_event_notifier *new)
@@ -369,6 +397,11 @@ int nf_conntrack_unregister_notifier(struct net *net, struct notifier_block *nb)
@@ -369,6 +397,11 @@ int nf_conntrack_unregister_notifier(str
{
return atomic_notifier_chain_unregister(&net->ct.nf_conntrack_chain, nb);
}

10
target/linux/generic/hack-4.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

@ -162,7 +162,7 @@
+EXPORT_SYMBOL_GPL(br_dev_update_stats);
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
@@ -164,7 +164,11 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,
@@ -164,7 +164,11 @@ int nf_conntrack_eventmask_report(unsign
rcu_read_lock();
notify = rcu_dereference(net->ct.nf_conntrack_event_cb);
@ -189,7 +189,7 @@
if (unlikely(ret < 0 || missed)) {
spin_lock_bh(&ct->lock);
if (ret < 0) {
@@ -265,7 +276,11 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct)
@@ -265,7 +276,11 @@ void nf_ct_deliver_cached_events(struct
rcu_read_lock();
notify = rcu_dereference(net->ct.nf_conntrack_event_cb);
@ -201,7 +201,7 @@
goto out_unlock;
e = nf_ct_ecache_find(ct);
@@ -289,7 +304,15 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct)
@@ -289,7 +304,15 @@ void nf_ct_deliver_cached_events(struct
item.portid = 0;
item.report = 0;
@ -217,7 +217,7 @@
if (likely(ret == 0 && !missed))
goto out_unlock;
@@ -342,6 +365,11 @@ int nf_conntrack_register_notifier(struct net *net, struct notifier_block *nb)
@@ -342,6 +365,11 @@ int nf_conntrack_register_notifier(struc
{
return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb);
}
@ -229,7 +229,7 @@
#else
int nf_conntrack_register_notifier(struct net *net,
struct nf_ct_event_notifier *new)
@@ -371,6 +399,11 @@ int nf_conntrack_unregister_notifier(struct net *net, struct notifier_block *nb)
@@ -371,6 +399,11 @@ int nf_conntrack_unregister_notifier(str
{
return atomic_notifier_chain_unregister(&net->ct.nf_conntrack_chain, nb);
}