diff mbox

[2/5] ipset: avoid duplicate command flags

Message ID 20140908143038.16930.38790.stgit@jonathan.eitzenberger.org
State Accepted
Delegated to: Jozsef Kadlecsik
Headers show

Commit Message

holger@eitzenberger.org Sept. 8, 2014, 2:30 p.m. UTC
NLM_F_DUMP is #defined as (NLM_F_ROOT | NLM_F_ACK), so specifying
all of them is redundant.

Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
---
 lib/mnl.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Jozsef Kadlecsik Sept. 14, 2014, 7:09 p.m. UTC | #1
On Mon, 8 Sep 2014, Holger Eitzenberger wrote:

> NLM_F_DUMP is #defined as (NLM_F_ROOT | NLM_F_ACK), so specifying
> all of them is redundant.
> 
> Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
> ---
>  lib/mnl.c |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/mnl.c b/lib/mnl.c
> index 786c9e5..a0fa66e 100644
> --- a/lib/mnl.c
> +++ b/lib/mnl.c
> @@ -38,10 +38,8 @@ static const uint16_t cmdflags[] = {
>  	[IPSET_CMD_FLUSH-1]	= NLM_F_REQUEST|NLM_F_ACK,
>  	[IPSET_CMD_RENAME-1]	= NLM_F_REQUEST|NLM_F_ACK,
>  	[IPSET_CMD_SWAP-1]	= NLM_F_REQUEST|NLM_F_ACK,
> -	[IPSET_CMD_LIST-1]	= NLM_F_REQUEST|NLM_F_ACK|
> -					NLM_F_ROOT|NLM_F_MATCH|NLM_F_DUMP,
> -	[IPSET_CMD_SAVE-1]	= NLM_F_REQUEST|NLM_F_ACK|
> -					NLM_F_ROOT|NLM_F_MATCH|NLM_F_DUMP,
> +	[IPSET_CMD_LIST-1]	= NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP,
> +	[IPSET_CMD_SAVE-1]	= NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP,
>  	[IPSET_CMD_ADD-1]	= NLM_F_REQUEST|NLM_F_ACK|NLM_F_EXCL,
>  	[IPSET_CMD_DEL-1]	= NLM_F_REQUEST|NLM_F_ACK|NLM_F_EXCL,
>  	[IPSET_CMD_TEST-1]	= NLM_F_REQUEST|NLM_F_ACK,
> 

Patch is applied.

Best regards,
Jozsef
-
E-mail  : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/lib/mnl.c b/lib/mnl.c
index 786c9e5..a0fa66e 100644
--- a/lib/mnl.c
+++ b/lib/mnl.c
@@ -38,10 +38,8 @@  static const uint16_t cmdflags[] = {
 	[IPSET_CMD_FLUSH-1]	= NLM_F_REQUEST|NLM_F_ACK,
 	[IPSET_CMD_RENAME-1]	= NLM_F_REQUEST|NLM_F_ACK,
 	[IPSET_CMD_SWAP-1]	= NLM_F_REQUEST|NLM_F_ACK,
-	[IPSET_CMD_LIST-1]	= NLM_F_REQUEST|NLM_F_ACK|
-					NLM_F_ROOT|NLM_F_MATCH|NLM_F_DUMP,
-	[IPSET_CMD_SAVE-1]	= NLM_F_REQUEST|NLM_F_ACK|
-					NLM_F_ROOT|NLM_F_MATCH|NLM_F_DUMP,
+	[IPSET_CMD_LIST-1]	= NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP,
+	[IPSET_CMD_SAVE-1]	= NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP,
 	[IPSET_CMD_ADD-1]	= NLM_F_REQUEST|NLM_F_ACK|NLM_F_EXCL,
 	[IPSET_CMD_DEL-1]	= NLM_F_REQUEST|NLM_F_ACK|NLM_F_EXCL,
 	[IPSET_CMD_TEST-1]	= NLM_F_REQUEST|NLM_F_ACK,