Linux Netfilter development
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org,
	pabeni@redhat.com, edumazet@google.com, fw@strlen.de
Subject: [PATCH nf-next 14/19] netfilter: cttimeout: remove 'l3num' attr check
Date: Thu, 27 Jun 2024 13:27:08 +0200	[thread overview]
Message-ID: <20240627112713.4846-15-pablo@netfilter.org> (raw)
In-Reply-To: <20240627112713.4846-1-pablo@netfilter.org>

From: Lin Ma <linma@zju.edu.cn>

After commit dd2934a95701 ("netfilter: conntrack: remove l3->l4 mapping
information"), the attribute of type `CTA_TIMEOUT_L3PROTO` is not used
any more in function cttimeout_default_set.

However, the previous commit ea9cf2a55a7b ("netfilter: cttimeout: remove
set but not used variable 'l3num'") forgot to remove the attribute
present check when removing the related variable.

This commit removes that check to ensure consistency.

Signed-off-by: Lin Ma <linma@zju.edu.cn>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nfnetlink_cttimeout.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
index f466af4f8531..eab4f476b47f 100644
--- a/net/netfilter/nfnetlink_cttimeout.c
+++ b/net/netfilter/nfnetlink_cttimeout.c
@@ -366,8 +366,7 @@ static int cttimeout_default_set(struct sk_buff *skb,
 	__u8 l4num;
 	int ret;
 
-	if (!cda[CTA_TIMEOUT_L3PROTO] ||
-	    !cda[CTA_TIMEOUT_L4PROTO] ||
+	if (!cda[CTA_TIMEOUT_L4PROTO] ||
 	    !cda[CTA_TIMEOUT_DATA])
 		return -EINVAL;
 
-- 
2.30.2


  parent reply	other threads:[~2024-06-27 11:27 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-27 11:26 [PATCH nf-next 00/19] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2024-06-27 11:26 ` [PATCH nf-next 01/19] netfilter: nf_tables: make struct nft_trans first member of derived subtypes Pablo Neira Ayuso
2024-06-27 11:26 ` [PATCH nf-next 02/19] netfilter: nf_tables: move bind list_head into relevant subtypes Pablo Neira Ayuso
2024-06-27 11:26 ` [PATCH nf-next 03/19] netfilter: nf_tables: compact chain+ft transaction objects Pablo Neira Ayuso
2024-06-27 11:26 ` [PATCH nf-next 04/19] netfilter: nf_tables: reduce trans->ctx.table references Pablo Neira Ayuso
2024-06-27 11:26 ` [PATCH nf-next 05/19] netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctx Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 06/19] netfilter: nf_tables: pass more specific nft_trans_chain where possible Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 07/19] netfilter: nf_tables: avoid usage of embedded nft_ctx Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 08/19] netfilter: nf_tables: store chain pointer in rule transaction Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 09/19] netfilter: nf_tables: reduce trans->ctx.chain references Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 10/19] netfilter: nf_tables: pass nft_table to destroy function Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 11/19] netfilter: nf_tables: do not store nft_ctx in transaction objects Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 12/19] ipvs: Avoid unnecessary calls to skb_is_gso_sctp Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 13/19] netfilter: nf_conncount: fix wrong variable type Pablo Neira Ayuso
2024-06-27 11:27 ` Pablo Neira Ayuso [this message]
2024-06-27 11:27 ` [PATCH nf-next 15/19] netfilter: nf_tables: rise cap on SELinux secmark context Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 16/19] netfilter: nfnetlink_queue: unbreak SCTP traffic Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 17/19] selftests: netfilter: nft_queue.sh: sctp coverage Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 18/19] selftests: netfilter: nft_queue.sh: add test for disappearing listener Pablo Neira Ayuso
2024-06-27 11:27 ` [PATCH nf-next 19/19] netfilter: xt_recent: Lift restrictions on max hitcount value Pablo Neira Ayuso
2024-06-27 11:28 ` [PATCH nf-next 00/19] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2024-06-27 18:32   ` Jakub Kicinski
2024-06-27 20:00     ` Florian Westphal
2024-06-28 13:36     ` Pablo Neira Ayuso
2024-06-28 15:17     ` Florian Westphal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240627112713.4846-15-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=fw@strlen.de \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox