igc_construct_skb() sets RX hardware timestamps, but igc_build_skb() does not. This has not been observable so far since igc currently does not enable the build_skb RX path.
Set RX hardware timestamps in igc_build_skb() as well so that both skb construction paths provide the same behavior. Reviewed-by: Aleksandr Loktionov <[email protected]> Signed-off-by: Kohei Enju <[email protected]> --- drivers/net/ethernet/intel/igc/igc_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index cad5a26cc84d..79192b02e6be 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -1964,8 +1964,9 @@ static void igc_add_rx_frag(struct igc_ring *rx_ring, static struct sk_buff *igc_build_skb(struct igc_ring *rx_ring, struct igc_rx_buffer *rx_buffer, - struct xdp_buff *xdp) + struct igc_xdp_buff *ctx) { + struct xdp_buff *xdp = &ctx->xdp; unsigned int size = xdp->data_end - xdp->data; unsigned int truesize = igc_get_rx_frame_truesize(rx_ring, size); unsigned int metasize = xdp->data - xdp->data_meta; @@ -1979,6 +1980,11 @@ static struct sk_buff *igc_build_skb(struct igc_ring *rx_ring, if (unlikely(!skb)) return NULL; + if (ctx->rx_ts) { + skb_shinfo(skb)->tx_flags |= SKBTX_HW_TSTAMP_NETDEV; + skb_hwtstamps(skb)->netdev_data = ctx->rx_ts; + } + /* update pointers within the skb to store the data */ skb_reserve(skb, xdp->data - xdp->data_hard_start); __skb_put(skb, size); @@ -2681,7 +2687,7 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget) } else if (skb) igc_add_rx_frag(rx_ring, rx_buffer, skb, size); else if (ring_uses_build_skb(rx_ring)) - skb = igc_build_skb(rx_ring, rx_buffer, &ctx.xdp); + skb = igc_build_skb(rx_ring, rx_buffer, &ctx); else skb = igc_construct_skb(rx_ring, rx_buffer, &ctx); -- 2.51.0
