On Wed, Feb 14, 2024 at 09:56:28AM +0100, Laurent Vivier wrote:
> Use ethhdr rather than tap_hdr.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
> 
> Notes:
>     v2:
>       - update function comment
>       - move the patch earlier in the series
> 
>  tap.c | 10 +++++-----
>  tap.h |  2 +-
>  tcp.c |  8 ++++----
>  udp.c |  4 ++--
>  4 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/tap.c b/tap.c
> index 02b51100d089..9ffb0f0a88d4 100644
> --- a/tap.c
> +++ b/tap.c
> @@ -457,18 +457,18 @@ size_t tap_send_frames(const struct ctx *c, const struct iovec *iov, size_t n)
>  }
>  
>  /**
> - * tap_update_mac() - Update tap L2 header with new Ethernet addresses
> - * @taph:	Tap headers to update
> + * eth_update_mac() - Update tap L2 header with new Ethernet addresses
> + * @eh:		Ethernet headers to update
>   * @eth_d:	Ethernet destination address, NULL if unchanged
>   * @eth_s:	Ethernet source address, NULL if unchanged
>   */
> -void tap_update_mac(struct tap_hdr *taph,
> +void eth_update_mac(struct ethhdr *eh,
>  		    const unsigned char *eth_d, const unsigned char *eth_s)
>  {
>  	if (eth_d)
> -		memcpy(taph->eh.h_dest, eth_d, sizeof(taph->eh.h_dest));
> +		memcpy(eh->h_dest, eth_d, sizeof(eh->h_dest));
>  	if (eth_s)
> -		memcpy(taph->eh.h_source, eth_s, sizeof(taph->eh.h_source));
> +		memcpy(eh->h_source, eth_s, sizeof(eh->h_source));
>  }
>  
>  PACKET_POOL_DECL(pool_l4, UIO_MAXIOV, pkt_buf);
> diff --git a/tap.h b/tap.h
> index 466d91466c3d..437b9aa2b43f 100644
> --- a/tap.h
> +++ b/tap.h
> @@ -74,7 +74,7 @@ void tap_icmp6_send(const struct ctx *c,
>  		    const void *in, size_t len);
>  int tap_send(const struct ctx *c, const void *data, size_t len);
>  size_t tap_send_frames(const struct ctx *c, const struct iovec *iov, size_t n);
> -void tap_update_mac(struct tap_hdr *taph,
> +void eth_update_mac(struct ethhdr *eh,
>  		    const unsigned char *eth_d, const unsigned char *eth_s);
>  void tap_listen_handler(struct ctx *c, uint32_t events);
>  void tap_handler_pasta(struct ctx *c, uint32_t events,
> diff --git a/tcp.c b/tcp.c
> index 6a0020f708c0..1c80299111f3 100644
> --- a/tcp.c
> +++ b/tcp.c
> @@ -974,10 +974,10 @@ void tcp_update_l2_buf(const unsigned char *eth_d, const unsigned char *eth_s)
>  		struct tcp4_l2_buf_t *b4 = &tcp4_l2_buf[i];
>  		struct tcp6_l2_buf_t *b6 = &tcp6_l2_buf[i];
>  
> -		tap_update_mac(&b4->taph, eth_d, eth_s);
> -		tap_update_mac(&b6->taph, eth_d, eth_s);
> -		tap_update_mac(&b4f->taph, eth_d, eth_s);
> -		tap_update_mac(&b6f->taph, eth_d, eth_s);
> +		eth_update_mac(&b4->taph.eh, eth_d, eth_s);
> +		eth_update_mac(&b6->taph.eh, eth_d, eth_s);
> +		eth_update_mac(&b4f->taph.eh, eth_d, eth_s);
> +		eth_update_mac(&b6f->taph.eh, eth_d, eth_s);
>  	}
>  }
>  
> diff --git a/udp.c b/udp.c
> index bf24288d5751..97c1292f6b59 100644
> --- a/udp.c
> +++ b/udp.c
> @@ -283,8 +283,8 @@ void udp_update_l2_buf(const unsigned char *eth_d, const unsigned char *eth_s)
>  		struct udp4_l2_buf_t *b4 = &udp4_l2_buf[i];
>  		struct udp6_l2_buf_t *b6 = &udp6_l2_buf[i];
>  
> -		tap_update_mac(&b4->taph, eth_d, eth_s);
> -		tap_update_mac(&b6->taph, eth_d, eth_s);
> +		eth_update_mac(&b4->taph.eh, eth_d, eth_s);
> +		eth_update_mac(&b6->taph.eh, eth_d, eth_s);
>  	}
>  }
>  

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson