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/ti/netcp_core.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/ti/netcp_core.c')
| -rw-r--r-- | drivers/net/ethernet/ti/netcp_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index 642843945031..1b2702f74455 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -1116,7 +1116,7 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp) for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; struct page *page = skb_frag_page(frag); - u32 page_offset = frag->page_offset; + u32 page_offset = skb_frag_off(frag); u32 buf_len = skb_frag_size(frag); dma_addr_t desc_dma; u32 desc_dma_32; |