diff options
author | David S. Miller <davem@davemloft.net> | 2014-08-30 00:55:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-01 20:39:55 -0400 |
commit | fa2dbdc253c2aee2a760c64de454cb62469ec11d (patch) | |
tree | ddae689033890a3fd32e01c4d022349f6cbab673 /net/core | |
parent | 7f2e870f2a48a0524a3b03b04fa019311d16a7f7 (diff) |
net: Pass a "more" indication down into netdev_start_xmit() code paths.
For now it will always be false.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 2 | ||||
-rw-r--r-- | net/core/netpoll.c | 2 | ||||
-rw-r--r-- | net/core/pktgen.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ab7bb809711e..f0ed5a611a97 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -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); | 2613 | rc = netdev_start_xmit(skb, dev, txq, false); |
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; |
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 05bc57edaa81..e6645b4f330a 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -91,7 +91,7 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev, | |||
91 | skb->vlan_tci = 0; | 91 | skb->vlan_tci = 0; |
92 | } | 92 | } |
93 | 93 | ||
94 | status = netdev_start_xmit(skb, dev, txq); | 94 | status = netdev_start_xmit(skb, dev, txq, false); |
95 | 95 | ||
96 | out: | 96 | out: |
97 | return status; | 97 | return status; |
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 34bd2ff9f121..5b36a9428c59 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -3335,7 +3335,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev) | |||
3335 | goto unlock; | 3335 | goto unlock; |
3336 | } | 3336 | } |
3337 | atomic_inc(&(pkt_dev->skb->users)); | 3337 | atomic_inc(&(pkt_dev->skb->users)); |
3338 | ret = netdev_start_xmit(pkt_dev->skb, odev, txq); | 3338 | ret = netdev_start_xmit(pkt_dev->skb, odev, txq, false); |
3339 | 3339 | ||
3340 | switch (ret) { | 3340 | switch (ret) { |
3341 | case NETDEV_TX_OK: | 3341 | case NETDEV_TX_OK: |