diff options
| author |  Jason Xing <kernelxing@tencent.com>
| 2024-03-25 20:36:14 +0800 |
|---|---|---|
| committer |  Pablo Neira Ayuso <pablo@netfilter.org>
| 2024-05-06 16:29:21 +0200 |
| commit | 8edc27fc4f220179189932cb5f537f2e90a32b87 (patch) | |
| tree | b007b705b15a205a8b39864d30eda64dad2f71f2 /net/netfilter | |
| parent | netfilter: conntrack: dccp: try not to drop skb in conntrack (diff) | |
| download | linux-8edc27fc4f220179189932cb5f537f2e90a32b87.tar.gz linux-8edc27fc4f220179189932cb5f537f2e90a32b87.tar.bz2 linux-8edc27fc4f220179189932cb5f537f2e90a32b87.zip | |
netfilter: use NF_DROP instead of -NF_DROP
At the beginning in 2009 one patch [1] introduced collecting drop
counter in nf_conntrack_in() by returning -NF_DROP. Later, another
patch [2] changed the return value of tcp_packet() which now is
renamed to nf_conntrack_tcp_packet() from -NF_DROP to NF_DROP. As
we can see, that -NF_DROP should be corrected.
Similarly, there are other two points where the -NF_DROP is used.
Well, as NF_DROP is equal to 0, inverting NF_DROP makes no sense
as patch [2] said many years ago.
[1]
commit 7d1e04598e5e ("netfilter: nf_conntrack: account packets drop by tcp_packet()")
[2]
commit ec8d540969da ("netfilter: conntrack: fix dropping packet after l4proto->packet()")
Signed-off-by: Jason Xing <kernelxing@tencent.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index c63868666bd9..6102dc09cdd3 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -2024,7 +2024,7 @@ repeat: goto repeat; NF_CT_STAT_INC_ATOMIC(state->net, invalid); - if (ret == -NF_DROP) + if (ret == NF_DROP) NF_CT_STAT_INC_ATOMIC(state->net, drop); ret = -ret; |