diff options
author | David S. Miller <davem@davemloft.net> | 2019-07-30 14:21:32 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-07-30 14:21:32 -0700 |
commit | 2d73a6c38d441f4178728e1565c8d3e9434747f2 (patch) | |
tree | 3c25ea02d713d9c12166140be09b5908c3471170 /drivers/net/ethernet/sfc/tx.c | |
parent | Merge branch 'sctp-clean-up-sctp_connect-function' (diff) | |
parent | linux: Remove bvec page_offset, use bv_offset (diff) | |
download | linux-dev-2d73a6c38d441f4178728e1565c8d3e9434747f2.tar.xz linux-dev-2d73a6c38d441f4178728e1565c8d3e9434747f2.zip |
Merge branch 'Finish-conversion-of-skb_frag_t-to-bio_vec'
Jonathan Lemon says:
====================
Finish conversion of skb_frag_t to bio_vec
The recent conversion of skb_frag_t to bio_vec did not include
skb_frag's page_offset. Add accessor functions for this field,
utilize them, and remove the union, restoring the original structure.
v2:
- rename accessors
- follow kdoc conventions
====================
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/tx.c')
-rw-r--r-- | drivers/net/ethernet/sfc/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c index 31ec56091a5d..65e81ec1b314 100644 --- a/drivers/net/ethernet/sfc/tx.c +++ b/drivers/net/ethernet/sfc/tx.c @@ -274,7 +274,7 @@ static void efx_skb_copy_bits_to_pio(struct efx_nic *efx, struct sk_buff *skb, vaddr = kmap_atomic(skb_frag_page(f)); - efx_memcpy_toio_aligned_cb(efx, piobuf, vaddr + f->page_offset, + efx_memcpy_toio_aligned_cb(efx, piobuf, vaddr + skb_frag_off(f), skb_frag_size(f), copy_buf); kunmap_atomic(vaddr); } |