diff mbox series

hw/net/net_rx_pkt: Remove deadcode

Message ID 20240918225128.455043-1-dave@treblig.org (mailing list archive)
State New, archived
Headers show
Series hw/net/net_rx_pkt: Remove deadcode | expand

Commit Message

Dr. David Alan Gilbert Sept. 18, 2024, 10:51 p.m. UTC 
From: "Dr. David Alan Gilbert" <dave@treblig.org>

net_rx_pkt_get_l3_hdr_offset and net_rx_pkt_get_iovec_len haven't
been used since they were added.

Remove them.

Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
---
 hw/net/net_rx_pkt.c | 13 -------------
 hw/net/net_rx_pkt.h |  9 ---------
 2 files changed, 22 deletions(-)

Comments

Thomas Huth Oct. 2, 2024, 10:30 a.m. UTC | #1 
On 19/09/2024 00.51, dave@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <dave@treblig.org>
> 
> net_rx_pkt_get_l3_hdr_offset and net_rx_pkt_get_iovec_len haven't
> been used since they were added.
> 
> Remove them.
> 
> Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
> ---
>   hw/net/net_rx_pkt.c | 13 -------------
>   hw/net/net_rx_pkt.h |  9 ---------
>   2 files changed, 22 deletions(-)
> 
> diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c
> index 32e5f3f9cf..cec1d0523d 100644
> --- a/hw/net/net_rx_pkt.c
> +++ b/hw/net/net_rx_pkt.c
> @@ -209,12 +209,6 @@ void net_rx_pkt_get_protocols(struct NetRxPkt *pkt,
>       *l4hdr_proto = pkt->l4hdr_info.proto;
>   }
>   
> -size_t net_rx_pkt_get_l3_hdr_offset(struct NetRxPkt *pkt)
> -{
> -    assert(pkt);
> -    return pkt->l3hdr_off;
> -}
> -
>   size_t net_rx_pkt_get_l4_hdr_offset(struct NetRxPkt *pkt)
>   {
>       assert(pkt);
> @@ -427,13 +421,6 @@ struct iovec *net_rx_pkt_get_iovec(struct NetRxPkt *pkt)
>       return pkt->vec;
>   }
>   
> -uint16_t net_rx_pkt_get_iovec_len(struct NetRxPkt *pkt)
> -{
> -    assert(pkt);
> -
> -    return pkt->vec_len;
> -}
> -
>   void net_rx_pkt_set_vhdr(struct NetRxPkt *pkt,
>                               struct virtio_net_hdr *vhdr)
>   {
> diff --git a/hw/net/net_rx_pkt.h b/hw/net/net_rx_pkt.h
> index 55ec67a1a7..e8df9cfd52 100644
> --- a/hw/net/net_rx_pkt.h
> +++ b/hw/net/net_rx_pkt.h
> @@ -267,15 +267,6 @@ net_rx_pkt_attach_data(struct NetRxPkt *pkt, const void *data,
>    */
>   struct iovec *net_rx_pkt_get_iovec(struct NetRxPkt *pkt);
>   
> -/**
> -* returns io vector length that holds the attached data
> -*
> -* @pkt:            packet
> -* @ret:            IOVec length
> -*
> -*/
> -uint16_t net_rx_pkt_get_iovec_len(struct NetRxPkt *pkt);
> -
>   /**
>    * prints rx packet data if debug is enabled
>    *

Reviewed-by: Thomas Huth <thuth@redhat.com>
Akihiko Odaki Oct. 3, 2024, 4:53 a.m. UTC | #2 
On 2024/09/19 7:51, dave@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <dave@treblig.org>
> 
> net_rx_pkt_get_l3_hdr_offset and net_rx_pkt_get_iovec_len haven't
> been used since they were added.

You forgot to remove net_rx_pkt_get_l3_hdr_offset() from: 
hw/net/net_rx_pkt.h
It looks good otherwise.

Regards,
Akihiko Odaki

> 
> Remove them.
> 
> Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
> ---
>   hw/net/net_rx_pkt.c | 13 -------------
>   hw/net/net_rx_pkt.h |  9 ---------
>   2 files changed, 22 deletions(-)
> 
> diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c
> index 32e5f3f9cf..cec1d0523d 100644
> --- a/hw/net/net_rx_pkt.c
> +++ b/hw/net/net_rx_pkt.c
> @@ -209,12 +209,6 @@ void net_rx_pkt_get_protocols(struct NetRxPkt *pkt,
>       *l4hdr_proto = pkt->l4hdr_info.proto;
>   }
>   
> -size_t net_rx_pkt_get_l3_hdr_offset(struct NetRxPkt *pkt)
> -{
> -    assert(pkt);
> -    return pkt->l3hdr_off;
> -}
> -
>   size_t net_rx_pkt_get_l4_hdr_offset(struct NetRxPkt *pkt)
>   {
>       assert(pkt);
> @@ -427,13 +421,6 @@ struct iovec *net_rx_pkt_get_iovec(struct NetRxPkt *pkt)
>       return pkt->vec;
>   }
>   
> -uint16_t net_rx_pkt_get_iovec_len(struct NetRxPkt *pkt)
> -{
> -    assert(pkt);
> -
> -    return pkt->vec_len;
> -}
> -
>   void net_rx_pkt_set_vhdr(struct NetRxPkt *pkt,
>                               struct virtio_net_hdr *vhdr)
>   {
> diff --git a/hw/net/net_rx_pkt.h b/hw/net/net_rx_pkt.h
> index 55ec67a1a7..e8df9cfd52 100644
> --- a/hw/net/net_rx_pkt.h
> +++ b/hw/net/net_rx_pkt.h
> @@ -267,15 +267,6 @@ net_rx_pkt_attach_data(struct NetRxPkt *pkt, const void *data,
>    */
>   struct iovec *net_rx_pkt_get_iovec(struct NetRxPkt *pkt);
>   
> -/**
> -* returns io vector length that holds the attached data
> -*
> -* @pkt:            packet
> -* @ret:            IOVec length
> -*
> -*/
> -uint16_t net_rx_pkt_get_iovec_len(struct NetRxPkt *pkt);
> -
>   /**
>    * prints rx packet data if debug is enabled
>    *
Michael Tokarev Oct. 3, 2024, 8:27 a.m. UTC | #3 
19.09.2024 01:51, dave@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <dave@treblig.org>
> 
> net_rx_pkt_get_l3_hdr_offset and net_rx_pkt_get_iovec_len haven't
> been used since they were added.
> 
> Remove them.

Applied to the trivial-patches tree, removing net_rx_pkt_get_l3_hdr_offset()
prototype from hw/net/net_rx_pkt.h in the process)

Thanks,

/mjt
Dr. David Alan Gilbert Oct. 3, 2024, 10:54 a.m. UTC | #4 
* Michael Tokarev (mjt@tls.msk.ru) wrote:
> 19.09.2024 01:51, dave@treblig.org wrote:
> > From: "Dr. David Alan Gilbert" <dave@treblig.org>
> > 
> > net_rx_pkt_get_l3_hdr_offset and net_rx_pkt_get_iovec_len haven't
> > been used since they were added.
> > 
> > Remove them.
> 
> Applied to the trivial-patches tree, removing net_rx_pkt_get_l3_hdr_offset()
> prototype from hw/net/net_rx_pkt.h in the process)

Thanks, and to Akhiko for pointing out that header left over.

Dave

> Thanks,
> 
> /mjt
Jason Wang Oct. 9, 2024, 8:32 a.m. UTC | #5 
On Thu, Sep 19, 2024 at 6:51 AM <dave@treblig.org> wrote:
>
> From: "Dr. David Alan Gilbert" <dave@treblig.org>
>
> net_rx_pkt_get_l3_hdr_offset and net_rx_pkt_get_iovec_len haven't
> been used since they were added.
>
> Remove them.
>
> Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
> ---

Queued.

Thanks
Michael Tokarev Oct. 9, 2024, 9:05 a.m. UTC | #6 
09.10.2024 11:32, Jason Wang wrote:

> Queued.

Jason, please do a git pull first ;)

/mjt
diff mbox series

Patch

diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c
index 32e5f3f9cf..cec1d0523d 100644
--- a/hw/net/net_rx_pkt.c
+++ b/hw/net/net_rx_pkt.c
@@ -209,12 +209,6 @@  void net_rx_pkt_get_protocols(struct NetRxPkt *pkt,
     *l4hdr_proto = pkt->l4hdr_info.proto;
 }
 
-size_t net_rx_pkt_get_l3_hdr_offset(struct NetRxPkt *pkt)
-{
-    assert(pkt);
-    return pkt->l3hdr_off;
-}
-
 size_t net_rx_pkt_get_l4_hdr_offset(struct NetRxPkt *pkt)
 {
     assert(pkt);
@@ -427,13 +421,6 @@  struct iovec *net_rx_pkt_get_iovec(struct NetRxPkt *pkt)
     return pkt->vec;
 }
 
-uint16_t net_rx_pkt_get_iovec_len(struct NetRxPkt *pkt)
-{
-    assert(pkt);
-
-    return pkt->vec_len;
-}
-
 void net_rx_pkt_set_vhdr(struct NetRxPkt *pkt,
                             struct virtio_net_hdr *vhdr)
 {
diff --git a/hw/net/net_rx_pkt.h b/hw/net/net_rx_pkt.h
index 55ec67a1a7..e8df9cfd52 100644
--- a/hw/net/net_rx_pkt.h
+++ b/hw/net/net_rx_pkt.h
@@ -267,15 +267,6 @@  net_rx_pkt_attach_data(struct NetRxPkt *pkt, const void *data,
  */
 struct iovec *net_rx_pkt_get_iovec(struct NetRxPkt *pkt);
 
-/**
-* returns io vector length that holds the attached data
-*
-* @pkt:            packet
-* @ret:            IOVec length
-*
-*/
-uint16_t net_rx_pkt_get_iovec_len(struct NetRxPkt *pkt);
-
 /**
  * prints rx packet data if debug is enabled
  *