Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa2dbdc2 authored by David S. Miller's avatar David S. Miller
Browse files

net: Pass a "more" indication down into netdev_start_xmit() code paths. 



For now it will always be false.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f2e870f

drivers/net/wan/dlci.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static netdev_tx_t dlci_transmit(struct sk_buff *skb, struct net_device *dev) 


	if (skb) {

		struct netdev_queue *txq = skb_get_tx_queue(dev, skb);

		netdev_start_xmit(skb, dlp->slave, txq);

		netdev_start_xmit(skb, dlp->slave, txq, false);

	}

	return NETDEV_TX_OK;

}

include/linux/netdevice.h

+5 −4
Original line number Diff line number Diff line
@@ -3431,19 +3431,20 @@ int __init dev_proc_init(void); 
#endif



static inline netdev_tx_t __netdev_start_xmit(const struct net_device_ops *ops,

					      struct sk_buff *skb, struct net_device *dev)

					      struct sk_buff *skb, struct net_device *dev,

					      bool more)

{

	skb->xmit_more = 0;

	skb->xmit_more = more ? 1 : 0;

	return ops->ndo_start_xmit(skb, dev);

}



static inline netdev_tx_t netdev_start_xmit(struct sk_buff *skb, struct net_device *dev,

					    struct netdev_queue *txq)

					    struct netdev_queue *txq, bool more)

{

	const struct net_device_ops *ops = dev->netdev_ops;

	int rc;



	rc = __netdev_start_xmit(ops, skb, dev);

	rc = __netdev_start_xmit(ops, skb, dev, more);

	if (rc == NETDEV_TX_OK)

		txq_trans_update(txq);

net/atm/mpc.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb, 
	}



non_ip:

	return __netdev_start_xmit(mpc->old_ops, skb, dev);

	return __netdev_start_xmit(mpc->old_ops, skb, dev, false);

}



static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -2610,7 +2610,7 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev, 


	len = skb->len;

	trace_net_dev_start_xmit(skb, dev);

	rc = netdev_start_xmit(skb, dev, txq);

	rc = netdev_start_xmit(skb, dev, txq, false);

	trace_net_dev_xmit(skb, rc, dev, len);



	return rc;

net/core/netpoll.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev, 
		skb->vlan_tci = 0;

	}



	status = netdev_start_xmit(skb, dev, txq);

	status = netdev_start_xmit(skb, dev, txq, false);



out:

	return status;