2021-11-04 01:19:40

by David Yang

Subject: [PATCH] net/mlx5: use swap() to make code cleaner

From: Yang Guang <[email protected]>

Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid
opencoding it.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Yang Guang <[email protected]>
---
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
index c1c6e74c79c4..8ce4b6112169 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
@@ -907,12 +907,9 @@ mlx5_tc_ct_shared_counter_get(struct mlx5_tc_ct_priv *ct_priv,
struct mlx5_ct_tuple rev_tuple = entry->tuple;
struct mlx5_ct_counter *shared_counter;
struct mlx5_ct_entry *rev_entry;
- __be16 tmp_port;

/* get the reversed tuple */
- tmp_port = rev_tuple.port.src;
- rev_tuple.port.src = rev_tuple.port.dst;
- rev_tuple.port.dst = tmp_port;
+ swap(rev_tuple.port.src, rev_tuple.port.dst);

if (rev_tuple.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {
__be32 tmp_addr = rev_tuple.ip.src_v4;
--
2.30.2

2021-11-04 05:27:56

by Saeed Mahameed

Subject: Re: [PATCH] net/mlx5: use swap() to make code cleaner

On Thu, 2021-11-04 at 09:17 +0800, [email protected] wrote:
> From: Yang Guang <[email protected]>
>
> Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid
> opencoding it.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Yang Guang <[email protected]>

sorry you're too late, another patch was already submitted:
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/

2021-11-16 20:56:39

by Saeed Mahameed

Subject: Re: [PATCH] net/mlx5: use swap() to make code cleaner

On Thu, 2021-11-04 at 09:17 +0800, [email protected] wrote:
> From: Yang Guang <[email protected]>
>
> Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid
> opencoding it.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Yang Guang <[email protected]>
> ---
>  drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
> b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
> index c1c6e74c79c4..8ce4b6112169 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
> @@ -907,12 +907,9 @@ mlx5_tc_ct_shared_counter_get(struct
> mlx5_tc_ct_priv *ct_priv,
>         struct mlx5_ct_tuple rev_tuple = entry->tuple;
>         struct mlx5_ct_counter *shared_counter;
>         struct mlx5_ct_entry *rev_entry;
> -       __be16 tmp_port;
>  
>         /* get the reversed tuple */
> -       tmp_port = rev_tuple.port.src;
> -       rev_tuple.port.src = rev_tuple.port.dst;
> -       rev_tuple.port.dst = tmp_port;
> +       swap(rev_tuple.port.src, rev_tuple.port.dst);
>  
>         if (rev_tuple.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {
>                 __be32 tmp_addr = rev_tuple.ip.src_v4;

An identical patch was already submitted the day before.
Thanks for the effort !