git.openwrt.org Git - openwrt/staging/ynezz.git/blob

   1 From 1af9f383a9448da530de9f681e8fccf12435aac8 Mon Sep 17 00:00:00 2001
   2 From: Li Yang <leoyang.li@nxp.com>
   3 Date: Tue, 27 Aug 2019 19:03:59 -0500
   4 Subject: [PATCH] sdk_dpaa: net: Rename skb_frag_t size to bv_len
   5
   6 Update for upstream data structure change similar to
   7
   8 commit b8b576a16f79efbdde49348147f491b176537d88
   9 Author: Matthew Wilcox (Oracle) <willy@infradead.org>
  10 Date:   Mon Jul 22 20:08:30 2019 -0700
  11
  12     net: Rename skb_frag_t size to bv_len
  13
  14 Signed-off-by: Li Yang <leoyang.li@nxp.com>
  15 ---
  16  drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 4 ++--
  17  1 file changed, 2 insertions(+), 2 deletions(-)
  18
  19 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c
  20 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c
  21 @@ -960,7 +960,7 @@ int __hot skb_to_sg_fd(struct dpa_priv_s
  22                 frag = &skb_shinfo(skb)->frags[i - 1];
  23                 qm_sg_entry_set_bpid(&sgt[i], 0xff);
  24                 qm_sg_entry_set_offset(&sgt[i], 0);
  25 -               qm_sg_entry_set_len(&sgt[i], frag->size);
  26 +               qm_sg_entry_set_len(&sgt[i], frag->bv_len);
  27                 qm_sg_entry_set_ext(&sgt[i], 0);
  28
  29                 if (i == nr_frags)
  30 @@ -969,7 +969,7 @@ int __hot skb_to_sg_fd(struct dpa_priv_s
  31                         qm_sg_entry_set_final(&sgt[i], 0);
  32
  33                 DPA_BUG_ON(!skb_frag_page(frag));
  34 -               addr = skb_frag_dma_map(dpa_bp->dev, frag, 0, frag->size,
  35 +               addr = skb_frag_dma_map(dpa_bp->dev, frag, 0, frag->bv_len,
  36                                         dma_dir);
  37                 if (unlikely(dma_mapping_error(dpa_bp->dev, addr))) {
  38                         dev_err(dpa_bp->dev, "DMA mapping failed");