summaryrefslogtreecommitdiffstats
path: root/drivers/net/xen-netfront.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-21 10:46:08 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-21 10:46:08 -0500
commitcd6a22310ec2a70092e136d0cd65bb77c1502521 (patch)
treec01fa788b27b240c7b426d7f329d92bd58c7b8f5 /drivers/net/xen-netfront.c
parent1e12a521d6917004f8b95a3b5864b92edc2694c8 (diff)
parent177c459b08a34dcf004aa9a4c1f1d8be682ff3af (diff)
Merge USB 4.20-rc8 mergepoint into usb-next
We need the USB changes in here for additional patches to be able to apply cleanly. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/xen-netfront.c')
-rw-r--r--drivers/net/xen-netfront.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index f17f602e6171..5b97cc946d70 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -905,7 +905,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
905 if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) { 905 if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) {
906 unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to; 906 unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to;
907 907
908 BUG_ON(pull_to <= skb_headlen(skb)); 908 BUG_ON(pull_to < skb_headlen(skb));
909 __pskb_pull_tail(skb, pull_to - skb_headlen(skb)); 909 __pskb_pull_tail(skb, pull_to - skb_headlen(skb));
910 } 910 }
911 if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) { 911 if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) {