GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
For now it will always be false.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2014-08-29 21:55:22 -07:00
parent 7f2e870f2a
commit fa2dbdc253
8 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wan/dlci.c
View file

@ -194,7 +194,7 @@ static netdev_tx_t dlci_transmit(struct sk_buff *skb, struct net_device *dev)
if (skb) { if (skb) {
struct netdev_queue *txq = skb_get_tx_queue(dev, 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; return NETDEV_TX_OK;
} }

9
include/linux/netdevice.h
View file

@ -3431,19 +3431,20 @@ int __init dev_proc_init(void);
#endif #endif
static inline netdev_tx_t __netdev_start_xmit(const struct net_device_ops *ops, 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); return ops->ndo_start_xmit(skb, dev);
} }
static inline netdev_tx_t netdev_start_xmit(struct sk_buff *skb, struct net_device *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; const struct net_device_ops *ops = dev->netdev_ops;
int rc; int rc;
rc = __netdev_start_xmit(ops, skb, dev); rc = __netdev_start_xmit(ops, skb, dev, more);
if (rc == NETDEV_TX_OK) if (rc == NETDEV_TX_OK)
txq_trans_update(txq); txq_trans_update(txq);

2
net/atm/mpc.c
View file

@ -599,7 +599,7 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
} }
non_ip: 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) static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)

2
net/core/dev.c
View file

@ -2610,7 +2610,7 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev,
len = skb->len; len = skb->len;
trace_net_dev_start_xmit(skb, dev); 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); trace_net_dev_xmit(skb, rc, dev, len);
return rc; return rc;

2
net/core/netpoll.c
View file

@ -91,7 +91,7 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,
skb->vlan_tci = 0; skb->vlan_tci = 0;
} }
status = netdev_start_xmit(skb, dev, txq); status = netdev_start_xmit(skb, dev, txq, false);
out: out:
return status; return status;

2
net/core/pktgen.c
View file

@ -3335,7 +3335,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
goto unlock; goto unlock;
} }
atomic_inc(&(pkt_dev->skb->users)); atomic_inc(&(pkt_dev->skb->users));
ret = netdev_start_xmit(pkt_dev->skb, odev, txq); ret = netdev_start_xmit(pkt_dev->skb, odev, txq, false);
switch (ret) { switch (ret) {
case NETDEV_TX_OK: case NETDEV_TX_OK:

2
net/packet/af_packet.c
View file

@ -259,7 +259,7 @@ static int packet_direct_xmit(struct sk_buff *skb)
HARD_TX_LOCK(dev, txq, smp_processor_id()); HARD_TX_LOCK(dev, txq, smp_processor_id());
if (!netif_xmit_frozen_or_drv_stopped(txq)) if (!netif_xmit_frozen_or_drv_stopped(txq))
ret = netdev_start_xmit(skb, dev, txq); ret = netdev_start_xmit(skb, dev, txq, false);
HARD_TX_UNLOCK(dev, txq); HARD_TX_UNLOCK(dev, txq);
local_bh_enable(); local_bh_enable();

3
net/sched/sch_teql.c
View file

@ -316,7 +316,8 @@ restart:
unsigned int length = qdisc_pkt_len(skb); unsigned int length = qdisc_pkt_len(skb);
if (!netif_xmit_frozen_or_stopped(slave_txq) && if (!netif_xmit_frozen_or_stopped(slave_txq) &&
netdev_start_xmit(skb, slave, slave_txq) == NETDEV_TX_OK) { netdev_start_xmit(skb, slave, slave_txq, false) ==
NETDEV_TX_OK) {
__netif_tx_unlock(slave_txq); __netif_tx_unlock(slave_txq);
master->slaves = NEXT_SLAVE(q); master->slaves = NEXT_SLAVE(q);
netif_wake_queue(dev); netif_wake_queue(dev);