diff options
author | Jonathan Lemon <jonathan.lemon@gmail.com> | 2019-07-30 10:40:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-07-30 17:21:32 -0400 |
commit | b54c9d5bd6e38edac9ce3a3f95f14a1292b5268d (patch) | |
tree | b09848a92e53ce9533b4df27953ef59874080b53 /drivers/net/xen-netfront.c | |
parent | 7240b60c98d6309363a9f8d5a4ecd5b0626f2aff (diff) |
net: Use skb_frag_off accessors
Use accessor functions for skb fragment's page_offset instead
of direct references, in preparation for bvec conversion.
Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netfront.c')
-rw-r--r-- | drivers/net/xen-netfront.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 8d33970a2950..b930d5f95222 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -531,7 +531,7 @@ static int xennet_count_skb_slots(struct sk_buff *skb) | |||
531 | for (i = 0; i < frags; i++) { | 531 | for (i = 0; i < frags; i++) { |
532 | skb_frag_t *frag = skb_shinfo(skb)->frags + i; | 532 | skb_frag_t *frag = skb_shinfo(skb)->frags + i; |
533 | unsigned long size = skb_frag_size(frag); | 533 | unsigned long size = skb_frag_size(frag); |
534 | unsigned long offset = frag->page_offset; | 534 | unsigned long offset = skb_frag_off(frag); |
535 | 535 | ||
536 | /* Skip unused frames from start of page */ | 536 | /* Skip unused frames from start of page */ |
537 | offset &= ~PAGE_MASK; | 537 | offset &= ~PAGE_MASK; |
@@ -674,8 +674,8 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev | |||
674 | /* Requests for all the frags. */ | 674 | /* Requests for all the frags. */ |
675 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { | 675 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { |
676 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; | 676 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; |
677 | tx = xennet_make_txreqs(queue, tx, skb, | 677 | tx = xennet_make_txreqs(queue, tx, skb, skb_frag_page(frag), |
678 | skb_frag_page(frag), frag->page_offset, | 678 | skb_frag_off(frag), |
679 | skb_frag_size(frag)); | 679 | skb_frag_size(frag)); |
680 | } | 680 | } |
681 | 681 | ||
@@ -1040,7 +1040,7 @@ err: | |||
1040 | if (NETFRONT_SKB_CB(skb)->pull_to > RX_COPY_THRESHOLD) | 1040 | if (NETFRONT_SKB_CB(skb)->pull_to > RX_COPY_THRESHOLD) |
1041 | NETFRONT_SKB_CB(skb)->pull_to = RX_COPY_THRESHOLD; | 1041 | NETFRONT_SKB_CB(skb)->pull_to = RX_COPY_THRESHOLD; |
1042 | 1042 | ||
1043 | skb_shinfo(skb)->frags[0].page_offset = rx->offset; | 1043 | skb_frag_off_set(&skb_shinfo(skb)->frags[0], rx->offset); |
1044 | skb_frag_size_set(&skb_shinfo(skb)->frags[0], rx->status); | 1044 | skb_frag_size_set(&skb_shinfo(skb)->frags[0], rx->status); |
1045 | skb->data_len = rx->status; | 1045 | skb->data_len = rx->status; |
1046 | skb->len += rx->status; | 1046 | skb->len += rx->status; |