diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-03-17 13:56:06 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-17 13:56:58 -0700 |
| commit | e243f39685af1bd6d837fa7bff40c1afdf3eb7fa (patch) | |
| tree | 61e9d9b74a0814f950a693ebe8061293e4960b1e /net/netfilter/nf_conntrack_core.c | |
| parent | 1abea24af42c35c6eb537e4402836e2cde2a5b13 (diff) | |
| parent | 551acdc3c3d2b6bc97f11e31dcf960bc36343bfc (diff) | |
| download | linux-e243f39685af1bd6d837fa7bff40c1afdf3eb7fa.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 9b7f9c966f7330..d1a58ed357a4ee 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1757,9 +1757,6 @@ resolve_normal_ct(struct nf_conn *tmpl, return 0; if (IS_ERR(h)) return PTR_ERR(h); - - ct = nf_ct_tuplehash_to_ctrack(h); - ct->local_origin = state->hook == NF_INET_LOCAL_OUT; } ct = nf_ct_tuplehash_to_ctrack(h); |