aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-08-30 00:57:30 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-01 20:39:55 -0400
commit95f6b3dda2a4a052f7dabe9998e4ffac491b7bc2 (patch)
tree91002d97f86a2030f051f361697c482338070965
parentfa2dbdc253c2aee2a760c64de454cb62469ec11d (diff)
net: Have xmit_list() signal more==true when appropriate.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index f0ed5a611a97..6d82194e414b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2600,7 +2600,7 @@ netdev_features_t netif_skb_features(struct sk_buff *skb)
2600EXPORT_SYMBOL(netif_skb_features); 2600EXPORT_SYMBOL(netif_skb_features);
2601 2601
2602static int xmit_one(struct sk_buff *skb, struct net_device *dev, 2602static int xmit_one(struct sk_buff *skb, struct net_device *dev,
2603 struct netdev_queue *txq) 2603 struct netdev_queue *txq, bool more)
2604{ 2604{
2605 unsigned int len; 2605 unsigned int len;
2606 int rc; 2606 int rc;
@@ -2610,7 +2610,7 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev,
2610 2610
2611 len = skb->len; 2611 len = skb->len;
2612 trace_net_dev_start_xmit(skb, dev); 2612 trace_net_dev_start_xmit(skb, dev);
2613 rc = netdev_start_xmit(skb, dev, txq, false); 2613 rc = netdev_start_xmit(skb, dev, txq, more);
2614 trace_net_dev_xmit(skb, rc, dev, len); 2614 trace_net_dev_xmit(skb, rc, dev, len);
2615 2615
2616 return rc; 2616 return rc;
@@ -2626,7 +2626,7 @@ static struct sk_buff *xmit_list(struct sk_buff *first, struct net_device *dev,
2626 struct sk_buff *next = skb->next; 2626 struct sk_buff *next = skb->next;
2627 2627
2628 skb->next = NULL; 2628 skb->next = NULL;
2629 rc = xmit_one(skb, dev, txq); 2629 rc = xmit_one(skb, dev, txq, next != NULL);
2630 if (unlikely(!dev_xmit_complete(rc))) { 2630 if (unlikely(!dev_xmit_complete(rc))) {
2631 skb->next = next; 2631 skb->next = next;
2632 goto out; 2632 goto out;
@@ -2705,7 +2705,7 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
2705 } 2705 }
2706 } 2706 }
2707 2707
2708 return xmit_one(skb, dev, txq); 2708 return xmit_one(skb, dev, txq, false);
2709 } 2709 }
2710 2710
2711gso: 2711gso: