1. Patchew
  2. linux
  3. View series

[PATCH net v2] selftests: netfilter: conntrack_dump_flush: remove unused variables and fix typo

Qingshuang Fu posted 1 patch 1 month, 3 weeks ago 
.../net/netfilter/conntrack_dump_flush.c      | 31 +++++++++----------
1 file changed, 14 insertions(+), 17 deletions(-)
[PATCH net v2] selftests: netfilter: conntrack_dump_flush: remove unused variables and fix typo
Posted by Qingshuang Fu 1 month, 3 weeks ago 
From: Qingshuang Fu <fuqingshuang@kylinos.cn>

Remove unused 'rplnlh' in conntrack_data_insert(), and remove unused
'rplnlh' and 'nest' variables in conntrack_count_zone() and
conntrack_flush_zone(). These variables were declared but never used
since their introduction.

Also fix typo: rename misspelled conntracK_count_zone() to
conntrack_count_zone().

Reviewed-by: Fernando Fernandez Mancera <fmancera@suse.de>
Signed-off-by: Qingshuang Fu <fuqingshuang@kylinos.cn>
---
v2:
  - Drop Fixes tag as this is a cleanup, not a bug fix
  - Add Reviewed-by tag from Fernando Fernandez Mancera
  - Also fix the typo in function name conntracK_count_zone
  - Link to v1: https://lore.kernel.org/all/20260806075052.1934904-1-fffsqian@163.com/
---
 .../net/netfilter/conntrack_dump_flush.c      | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c b/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
index 5cecb8a1bc94..31b8250ddc53 100644
--- a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
+++ b/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
@@ -102,7 +102,6 @@ static int conntrack_data_insert(struct mnl_socket *sock, struct nlmsghdr *nlh,
 				 uint16_t zone)
 {
 	char buf[MNL_SOCKET_BUFFER_SIZE];
-	struct nlmsghdr *rplnlh;
 	unsigned int portid;
 	int ret;
 
@@ -216,12 +215,11 @@ static int count_entries(const struct nlmsghdr *nlh, void *data)
 	return MNL_CB_OK;
 }
 
-static int conntracK_count_zone(struct mnl_socket *sock, uint16_t zone)
+static int conntrack_count_zone(struct mnl_socket *sock, uint16_t zone)
 {
 	char buf[MNL_SOCKET_BUFFER_SIZE];
-	struct nlmsghdr *nlh, *rplnlh;
+	struct nlmsghdr *nlh;
 	struct nfgenmsg *nfh;
-	struct nlattr *nest;
 	unsigned int portid;
 	int ret;
 
@@ -266,9 +264,8 @@ static int conntracK_count_zone(struct mnl_socket *sock, uint16_t zone)
 static int conntrack_flush_zone(struct mnl_socket *sock, uint16_t zone)
 {
 	char buf[MNL_SOCKET_BUFFER_SIZE];
-	struct nlmsghdr *nlh, *rplnlh;
+	struct nlmsghdr *nlh;
 	struct nfgenmsg *nfh;
-	struct nlattr *nest;
 	unsigned int portid;
 	int ret;
 
@@ -326,7 +323,7 @@ FIXTURE_SETUP(conntrack_dump_flush)
 	ret = mnl_socket_bind(self->sock, 0, MNL_SOCKET_AUTOPID);
 	EXPECT_EQ(ret, 0);
 
-	ret = conntracK_count_zone(self->sock, TEST_ZONE_ID);
+	ret = conntrack_count_zone(self->sock, TEST_ZONE_ID);
 	if (ret < 0 && errno == EPERM)
 		SKIP(return, "Needs to be run as root");
 	else if (ret < 0 && errno == EOPNOTSUPP)
@@ -423,7 +420,7 @@ FIXTURE_SETUP(conntrack_dump_flush)
 					 NF_CT_DEFAULT_ZONE_ID);
 	EXPECT_EQ(ret, 0);
 
-	ret = conntracK_count_zone(self->sock, TEST_ZONE_ID);
+	ret = conntrack_count_zone(self->sock, TEST_ZONE_ID);
 	EXPECT_GE(ret, 2);
 	if (ret > 2)
 		SKIP(return, "kernel does not support filtering by zone");
@@ -437,7 +434,7 @@ TEST_F(conntrack_dump_flush, test_dump_by_zone)
 {
 	int ret;
 
-	ret = conntracK_count_zone(self->sock, TEST_ZONE_ID);
+	ret = conntrack_count_zone(self->sock, TEST_ZONE_ID);
 	EXPECT_EQ(ret, 2);
 }
 
@@ -447,13 +444,13 @@ TEST_F(conntrack_dump_flush, test_flush_by_zone)
 
 	ret = conntrack_flush_zone(self->sock, TEST_ZONE_ID);
 	EXPECT_EQ(ret, 0);
-	ret = conntracK_count_zone(self->sock, TEST_ZONE_ID);
+	ret = conntrack_count_zone(self->sock, TEST_ZONE_ID);
 	EXPECT_EQ(ret, 0);
-	ret = conntracK_count_zone(self->sock, TEST_ZONE_ID + 1);
+	ret = conntrack_count_zone(self->sock, TEST_ZONE_ID + 1);
 	EXPECT_EQ(ret, 2);
-	ret = conntracK_count_zone(self->sock, TEST_ZONE_ID + 2);
+	ret = conntrack_count_zone(self->sock, TEST_ZONE_ID + 2);
 	EXPECT_EQ(ret, 2);
-	ret = conntracK_count_zone(self->sock, NF_CT_DEFAULT_ZONE_ID);
+	ret = conntrack_count_zone(self->sock, NF_CT_DEFAULT_ZONE_ID);
 	EXPECT_EQ(ret, 2);
 }
 
@@ -463,13 +460,13 @@ TEST_F(conntrack_dump_flush, test_flush_by_zone_default)
 
 	ret = conntrack_flush_zone(self->sock, NF_CT_DEFAULT_ZONE_ID);
 	EXPECT_EQ(ret, 0);
-	ret = conntracK_count_zone(self->sock, TEST_ZONE_ID);
+	ret = conntrack_count_zone(self->sock, TEST_ZONE_ID);
 	EXPECT_EQ(ret, 2);
-	ret = conntracK_count_zone(self->sock, TEST_ZONE_ID + 1);
+	ret = conntrack_count_zone(self->sock, TEST_ZONE_ID + 1);
 	EXPECT_EQ(ret, 2);
-	ret = conntracK_count_zone(self->sock, TEST_ZONE_ID + 2);
+	ret = conntrack_count_zone(self->sock, TEST_ZONE_ID + 2);
 	EXPECT_EQ(ret, 2);
-	ret = conntracK_count_zone(self->sock, NF_CT_DEFAULT_ZONE_ID);
+	ret = conntrack_count_zone(self->sock, NF_CT_DEFAULT_ZONE_ID);
 	EXPECT_EQ(ret, 0);
 }
 

base-commit: 0d839570765118029aa8bf4a95444c6a11aacf85
-- 
2.25.1
Re: [PATCH net v2] selftests: netfilter: conntrack_dump_flush: remove unused variables and fix typo
Posted by Hangbin Liu 1 month, 3 weeks ago 
On Fri, Aug 07, 2026 at 03:59:28PM +0800, Qingshuang Fu wrote:
> From: Qingshuang Fu <fuqingshuang@kylinos.cn>
> 
> Remove unused 'rplnlh' in conntrack_data_insert(), and remove unused
> 'rplnlh' and 'nest' variables in conntrack_count_zone() and
> conntrack_flush_zone(). These variables were declared but never used
> since their introduction.
> 
> Also fix typo: rename misspelled conntracK_count_zone() to
> conntrack_count_zone().
> 
> Reviewed-by: Fernando Fernandez Mancera <fmancera@suse.de>
> Signed-off-by: Qingshuang Fu <fuqingshuang@kylinos.cn>

> ---
> v2:
>   - Drop Fixes tag as this is a cleanup, not a bug fix

If not a bug fix, you should target to net-next.

Reviewed-by: Hangbin Liu <liuhangbin@kylinos.cn>
Re: [PATCH net v2] selftests: netfilter: conntrack_dump_flush: remove unused variables and fix typo
Posted by Pablo Neira Ayuso 1 month, 3 weeks ago 
On Fri, Aug 07, 2026 at 05:07:13PM +0800, Hangbin Liu wrote:
> On Fri, Aug 07, 2026 at 03:59:28PM +0800, Qingshuang Fu wrote:
> > From: Qingshuang Fu <fuqingshuang@kylinos.cn>
> > 
> > Remove unused 'rplnlh' in conntrack_data_insert(), and remove unused
> > 'rplnlh' and 'nest' variables in conntrack_count_zone() and
> > conntrack_flush_zone(). These variables were declared but never used
> > since their introduction.
> > 
> > Also fix typo: rename misspelled conntracK_count_zone() to
> > conntrack_count_zone().
> > 
> > Reviewed-by: Fernando Fernandez Mancera <fmancera@suse.de>
> > Signed-off-by: Qingshuang Fu <fuqingshuang@kylinos.cn>
> 
> > ---
> > v2:
> >   - Drop Fixes tag as this is a cleanup, not a bug fix
> 
> If not a bug fix, you should target to net-next.

We will handle this though the nf-next tree.

Thanks.
Re: [PATCH net v2] selftests: netfilter: conntrack_dump_flush: remove unused variables and fix typo
Posted by Hangbin Liu 1 month, 3 weeks ago 
On Fri, Aug 07, 2026 at 12:23:45PM +0200, Pablo Neira Ayuso wrote:
> On Fri, Aug 07, 2026 at 05:07:13PM +0800, Hangbin Liu wrote:
> > On Fri, Aug 07, 2026 at 03:59:28PM +0800, Qingshuang Fu wrote:
> > > From: Qingshuang Fu <fuqingshuang@kylinos.cn>
> > > 
> > > Remove unused 'rplnlh' in conntrack_data_insert(), and remove unused
> > > 'rplnlh' and 'nest' variables in conntrack_count_zone() and
> > > conntrack_flush_zone(). These variables were declared but never used
> > > since their introduction.
> > > 
> > > Also fix typo: rename misspelled conntracK_count_zone() to
> > > conntrack_count_zone().
> > > 
> > > Reviewed-by: Fernando Fernandez Mancera <fmancera@suse.de>
> > > Signed-off-by: Qingshuang Fu <fuqingshuang@kylinos.cn>
> > 
> > > ---
> > > v2:
> > >   - Drop Fixes tag as this is a cleanup, not a bug fix
> > 
> > If not a bug fix, you should target to net-next.
> 
> We will handle this though the nf-next tree.

Oh, good. That's more reasonable.

Hangbin
Re: [PATCH net v2] selftests: netfilter: conntrack_dump_flush: remove unused variables and fix typo
Posted by Qingshuang Fu 1 month, 2 weeks ago 

At 2026-08-08 14:26:33, "Hangbin Liu" <liuhangbin@gmail.com> wrote:

>On Fri, Aug 07, 2026 at 12:23:45PM +0200, Pablo Neira Ayuso wrote:
>> On Fri, Aug 07, 2026 at 05:07:13PM +0800, Hangbin Liu wrote:
>> > On Fri, Aug 07, 2026 at 03:59:28PM +0800, Qingshuang Fu wrote:
>> > > From: Qingshuang Fu <fuqingshuang@kylinos.cn>
>> > > 
>> > > Remove unused 'rplnlh' in conntrack_data_insert(), and remove unused
>> > > 'rplnlh' and 'nest' variables in conntrack_count_zone() and
>> > > conntrack_flush_zone(). These variables were declared but never used
>> > > since their introduction.
>> > > 
>> > > Also fix typo: rename misspelled conntracK_count_zone() to
>> > > conntrack_count_zone().
>> > > 
>> > > Reviewed-by: Fernando Fernandez Mancera <fmancera@suse.de>
>> > > Signed-off-by: Qingshuang Fu <fuqingshuang@kylinos.cn>
>> > 
>> > > ---
>> > > v2:
>> > >   - Drop Fixes tag as this is a cleanup, not a bug fix
>> > 
>> > If not a bug fix, you should target to net-next.
>> 
>> We will handle this though the nf-next tree.
>
>Oh, good. That's more reasonable.
>

Thanks all for the review and clarification.

Best regards,
Qingshuang Fu

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.