From f451b88fd7d93ebee387eb516f8e0c991d14ec2a Mon Sep 17 00:00:00 2001 From: Paritosh Dixit Date: Mon, 25 Mar 2024 23:54:16 +0000 Subject: [PATCH] net: nvethernet: Fix build for Linux v6.9 In Linux v6.9-rc1, the typedef of skb_frag_t is updated to a new struct skb_frag. Struct skb_frag does not include bv_offset and bv_page members. Hence, use functions skb_frag_off and skb_frag_page to get offset and page respectively. Use of functions skb_frag_off and skb_frag_page is backward compatible with older kernel versions that we use. Bug 4471899 Signed-off-by: Paritosh Dixit Change-Id: I5d14c750c5b4cd28a2abeda95d7c11bf975ef1b8 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3104114 GVS: Gerrit_Virtual_Submit Reviewed-by: Revanth Kumar Uppala Reviewed-by: Brad Griffis Reviewed-by: Jon Hunter Reviewed-by: svcacv --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 8a944a82..a8cfafcf 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -3305,10 +3305,10 @@ static int ether_tx_swcx_alloc(struct ether_priv_data *pdata, } size = min(len, max_data_len_per_txd); - page_idx = (frag->bv_offset + offset) >> PAGE_SHIFT; - page_offset = (frag->bv_offset + offset) & ~PAGE_MASK; + page_idx = (skb_frag_off(frag) + offset) >> PAGE_SHIFT; + page_offset = (skb_frag_off(frag) + offset) & ~PAGE_MASK; tx_swcx->buf_phy_addr = dma_map_page(dev, - (frag->bv_page + page_idx), + (skb_frag_page(frag) + page_idx), page_offset, size, DMA_TO_DEVICE); if (unlikely(dma_mapping_error(dev,