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/jme.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/jme.c')
| -rw-r--r-- | drivers/net/ethernet/jme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index 9c3ab00643bd..6d52cf5ce20e 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -2040,8 +2040,8 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) ctxbi = txbi + ((idx + i + 2) & (mask)); ret = jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi, - skb_frag_page(frag), - frag->page_offset, skb_frag_size(frag), hidma); + skb_frag_page(frag), skb_frag_off(frag), + skb_frag_size(frag), hidma); if (ret) { jme_drop_tx_map(jme, idx, i); goto out; |