2021-12-08 11:34:29

by Yihao Han

Subject: [PATCH] samples/bpf: fix swap.cocci warning

Fix following swap.cocci warning:
./samples/bpf/xsk_fwd.c:660:22-23:
WARNING opportunity for swap()

Signed-off-by: Yihao Han <[email protected]>
---
samples/bpf/xsk_fwd.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/samples/bpf/xsk_fwd.c b/samples/bpf/xsk_fwd.c
index 1cd97c84c337..e82582b225d3 100644
--- a/samples/bpf/xsk_fwd.c
+++ b/samples/bpf/xsk_fwd.c
@@ -653,9 +653,7 @@ static void swap_mac_addresses(void *data)
struct ether_addr *dst_addr = (struct ether_addr *)&eth->ether_dhost;
struct ether_addr tmp;

- tmp = *src_addr;
- *src_addr = *dst_addr;
- *dst_addr = tmp;
+ swap(*src_addr, *dst_addr);
}

static void *
--
2.17.1

2021-12-09 07:10:27

by Andrii Nakryiko

Subject: Re: [PATCH] samples/bpf: fix swap.cocci warning

On Wed, Dec 8, 2021 at 3:34 AM Yihao Han <[email protected]> wrote:
>
> Fix following swap.cocci warning:
> ./samples/bpf/xsk_fwd.c:660:22-23:
> WARNING opportunity for swap()
>
> Signed-off-by: Yihao Han <[email protected]>
> ---
> samples/bpf/xsk_fwd.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/samples/bpf/xsk_fwd.c b/samples/bpf/xsk_fwd.c
> index 1cd97c84c337..e82582b225d3 100644
> --- a/samples/bpf/xsk_fwd.c
> +++ b/samples/bpf/xsk_fwd.c
> @@ -653,9 +653,7 @@ static void swap_mac_addresses(void *data)
> struct ether_addr *dst_addr = (struct ether_addr *)&eth->ether_dhost;
> struct ether_addr tmp;

this variable needs to be removed as well then

>
> - tmp = *src_addr;
> - *src_addr = *dst_addr;
> - *dst_addr = tmp;
> + swap(*src_addr, *dst_addr);
> }
>
> static void *
> --
> 2.17.1
>