Commit b37fa92e authored Nov 14, 2019 by Lorenzo Bianconi Committed by David S. Miller Nov 14, 2019

net: mvneta: fix build skb for bm capable devices



Fix build_skb for bm capable devices when they fall-back using swbm path
(e.g. when bm properties are configured in device tree but
CONFIG_MVNETA_BM_ENABLE is not set). In this case rx_offset_correction is
overwritten so we need to use it building skb instead of
MVNETA_SKB_HEADROOM directly

Fixes: 8dc9a088 ("net: mvneta: rely on build_skb in mvneta_rx_swbm poll routine")
Fixes: 0db51da7 ("net: mvneta: add basic XDP support")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Reported-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f97d139a

drivers/net/ethernet/marvell/mvneta.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2154,7 +2154,7 @@ mvneta_swbm_rx_frame(struct mvneta_port *pp,
		prefetch(data);

		xdp->data_hard_start = data;
		xdp->data = data + MVNETA_SKB_HEADROOM + MVNETA_MH_SIZE;
		xdp->data = data + pp->rx_offset_correction + MVNETA_MH_SIZE;
		xdp->data_end = xdp->data + data_len;
		xdp_set_data_meta_invalid(xdp);

		@@ -2219,7 +2219,7 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp,
		/* refill descriptor with new buffer later */
		skb_add_rx_frag(rxq->skb,
		skb_shinfo(rxq->skb)->nr_frags,
		page, MVNETA_SKB_HEADROOM, data_len,
		page, pp->rx_offset_correction, data_len,
		PAGE_SIZE);
		}
		page_pool_release_page(rxq->page_pool, page);

Admin message