mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
|
From b37fa92e20ef28aada852cbf03b368d29a20478c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
||
|
|
Date: Thu, 14 Nov 2019 01:25:55 +0200
|
||
|
|
Subject: [PATCH] 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: 8dc9a0888f4c ("net: mvneta: rely on build_skb in mvneta_rx_swbm poll routine")
|
||
|
|
Fixes: 0db51da7a8e9 ("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>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/marvell/mvneta.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
||
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
||
|
|
@@ -2165,7 +2165,7 @@ mvneta_swbm_rx_frame(struct mvneta_port
|
||
|
|
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);
|
||
|
|
|
||
|
|
@@ -2230,7 +2230,7 @@ mvneta_swbm_add_rx_fragment(struct mvnet
|
||
|
|
/* 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);
|