diff options
| author | Florian Westphal <fw@strlen.de> | 2023-10-06 11:27:29 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-10-10 16:34:28 +0200 |
| commit | 8a23f4ab92f9b7f258ca28cce2e34b80f56ab9d1 (patch) | |
| tree | 31c4115e4c882443d7a3c13098a89e651376dba0 /net/netfilter/nf_conntrack_helper.c | |
| parent | 99ab9f84b85ec3eec099278bff61269ad0b078ce (diff) | |
| download | linux-8a23f4ab92f9b7f258ca28cce2e34b80f56ab9d1.tar.gz | |
netfilter: conntrack: simplify nf_conntrack_alter_reply
nf_conntrack_alter_reply doesn't do helper reassignment anymore.
Remove the comments that make this claim.
Furthermore, remove dead code from the function and place ot
in nf_conntrack.h.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net/netfilter/nf_conntrack_helper.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_helper.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index f22691f838536..4ed5878cb25b1 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -194,12 +194,7 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl, struct nf_conntrack_helper *helper = NULL; struct nf_conn_help *help; - /* We already got a helper explicitly attached. The function - * nf_conntrack_alter_reply - in case NAT is in use - asks for looking - * the helper up again. Since now the user is in full control of - * making consistent helper configurations, skip this automatic - * re-lookup, otherwise we'll lose the helper. - */ + /* We already got a helper explicitly attached (e.g. nft_ct) */ if (test_bit(IPS_HELPER_BIT, &ct->status)) return 0; |