summaryrefslogtreecommitdiffstats
path: root/drivers/net/xen-netfront.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/xen-netfront.c')
-rw-r--r--drivers/net/xen-netfront.c8
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;