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/intel/i40e/i40e_txrx.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/intel/i40e/i40e_txrx.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c index f162252f01b5..e3f29dc8b290 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c @@ -3306,7 +3306,7 @@ bool __i40e_chk_linearize(struct sk_buff *skb) * descriptor associated with the fragment. */ if (stale_size > I40E_MAX_DATA_PER_TXD) { - int align_pad = -(stale->page_offset) & + int align_pad = -(skb_frag_off(stale)) & (I40E_MAX_READ_REQ_SIZE - 1); sum -= align_pad; |