diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-11 17:52:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-11 17:52:00 -0700 |
| commit | 6a92ef08a1351e4977d6acde2196fa94e9c3a660 (patch) | |
| tree | 3f237980c08af76beae04a6844ad254543ca4b9f /drivers/net/xen-netfront.c | |
| parent | 9a95d9c6429bb58905fdfc95da2e1b7cc3fb55b7 (diff) | |
| parent | ec0c96714e7ddeda4eccaa077f5646a0fd6e371f (diff) | |
| download | linux-stable-6a92ef08a1351e4977d6acde2196fa94e9c3a660.tar.gz linux-stable-6a92ef08a1351e4977d6acde2196fa94e9c3a660.tar.bz2 linux-stable-6a92ef08a1351e4977d6acde2196fa94e9c3a660.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/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 799cba4624a5..2ff874b6ec89 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -895,7 +895,6 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue, struct sk_buff *skb, struct sk_buff_head *list) { - struct skb_shared_info *shinfo = skb_shinfo(skb); RING_IDX cons = queue->rx.rsp_cons; struct sk_buff *nskb; @@ -904,15 +903,16 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue, RING_GET_RESPONSE(&queue->rx, ++cons); skb_frag_t *nfrag = &skb_shinfo(nskb)->frags[0]; - if (shinfo->nr_frags == MAX_SKB_FRAGS) { + if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) { unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to; BUG_ON(pull_to <= skb_headlen(skb)); __pskb_pull_tail(skb, pull_to - skb_headlen(skb)); } - BUG_ON(shinfo->nr_frags >= MAX_SKB_FRAGS); + BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS); - skb_add_rx_frag(skb, shinfo->nr_frags, skb_frag_page(nfrag), + skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, + skb_frag_page(nfrag), rx->offset, rx->status, PAGE_SIZE); skb_shinfo(nskb)->nr_frags = 0; |