Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+13 -11
+1 -1
drivers/net/wan/dlci.c
··· 194 194 195 195 if (skb) { 196 196 struct netdev_queue *txq = skb_get_tx_queue(dev, skb); 197 - netdev_start_xmit(skb, dlp->slave, txq); 197 + netdev_start_xmit(skb, dlp->slave, txq, false); 198 198 } 199 199 return NETDEV_TX_OK; 200 200 }
+5 -4
include/linux/netdevice.h
··· 3431 3431 #endif 3432 3432 3433 3433 static inline netdev_tx_t __netdev_start_xmit(const struct net_device_ops *ops, 3434 - struct sk_buff *skb, struct net_device *dev) 3434 + struct sk_buff *skb, struct net_device *dev, 3435 + bool more) 3435 3436 { 3436 - skb->xmit_more = 0; 3437 + skb->xmit_more = more ? 1 : 0; 3437 3438 return ops->ndo_start_xmit(skb, dev); 3438 3439 } 3439 3440 3440 3441 static inline netdev_tx_t netdev_start_xmit(struct sk_buff *skb, struct net_device *dev, 3441 - struct netdev_queue *txq) 3442 + struct netdev_queue *txq, bool more) 3442 3443 { 3443 3444 const struct net_device_ops *ops = dev->netdev_ops; 3444 3445 int rc; 3445 3446 3446 - rc = __netdev_start_xmit(ops, skb, dev); 3447 + rc = __netdev_start_xmit(ops, skb, dev, more); 3447 3448 if (rc == NETDEV_TX_OK) 3448 3449 txq_trans_update(txq); 3449 3450
+1 -1
net/atm/mpc.c
··· 599 599 } 600 600 601 601 non_ip: 602 - return __netdev_start_xmit(mpc->old_ops, skb, dev); 602 + return __netdev_start_xmit(mpc->old_ops, skb, dev, false); 603 603 } 604 604 605 605 static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)
+1 -1
net/core/dev.c
··· 2610 2610 2611 2611 len = skb->len; 2612 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 2614 trace_net_dev_xmit(skb, rc, dev, len); 2615 2615 2616 2616 return rc;
+1 -1
net/core/netpoll.c
··· 91 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 96 out: 97 97 return status;
+1 -1
net/core/pktgen.c
··· 3335 3335 goto unlock; 3336 3336 } 3337 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 3340 switch (ret) { 3341 3341 case NETDEV_TX_OK:
+1 -1
net/packet/af_packet.c
··· 259 259 260 260 HARD_TX_LOCK(dev, txq, smp_processor_id()); 261 261 if (!netif_xmit_frozen_or_drv_stopped(txq)) 262 - ret = netdev_start_xmit(skb, dev, txq); 262 + ret = netdev_start_xmit(skb, dev, txq, false); 263 263 HARD_TX_UNLOCK(dev, txq); 264 264 265 265 local_bh_enable();
+2 -1
net/sched/sch_teql.c
··· 316 316 unsigned int length = qdisc_pkt_len(skb); 317 317 318 318 if (!netif_xmit_frozen_or_stopped(slave_txq) && 319 - netdev_start_xmit(skb, slave, slave_txq) == NETDEV_TX_OK) { 319 + netdev_start_xmit(skb, slave, slave_txq, false) == 320 + NETDEV_TX_OK) { 320 321 __netif_tx_unlock(slave_txq); 321 322 master->slaves = NEXT_SLAVE(q); 322 323 netif_wake_queue(dev);