diff options
| author | Eric Dumazet <edumazet@google.com> | 2020-05-07 18:32:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-08 03:11:07 +0200 |
| commit | ae46f184bc1fb15bf2de47114c29236e61ca4bbc (patch) | |
| tree | 5d1540325ac32853f85625cdb0262934f8244dbc /include/net/bonding.h | |
| parent | netpoll: accept NULL np argument in netpoll_send_skb() (diff) | |
| download | linux-ae46f184bc1fb15bf2de47114c29236e61ca4bbc.tar.xz linux-ae46f184bc1fb15bf2de47114c29236e61ca4bbc.zip | |
bonding: propagate transmit status
Currently, bonding always returns NETDEV_TX_OK to its caller.
It is worth trying to be more accurate : TCP for instance
can have different recovery strategies if it can have more
precise status, if packet was dropped by slave qdisc.
This is especially important when host is under stress.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jay Vosburgh <j.vosburgh@gmail.com>
Cc: Veaceslav Falico <vfalico@gmail.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/bonding.h')
| -rw-r--r-- | include/net/bonding.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index f211983cd52a..9b1e76515a9c 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -504,15 +504,17 @@ static inline unsigned long slave_last_rx(struct bonding *bond, } #ifdef CONFIG_NET_POLL_CONTROLLER -static inline void bond_netpoll_send_skb(const struct slave *slave, +static inline netdev_tx_t bond_netpoll_send_skb(const struct slave *slave, struct sk_buff *skb) { - netpoll_send_skb(slave->np, skb); + return netpoll_send_skb(slave->np, skb); } #else -static inline void bond_netpoll_send_skb(const struct slave *slave, +static inline netdev_tx_t bond_netpoll_send_skb(const struct slave *slave, struct sk_buff *skb) { + BUG(); + return NETDEV_TX_OK; } #endif @@ -606,7 +608,7 @@ struct bond_net { }; int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); -void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); +netdev_tx_t bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); int bond_create(struct net *net, const char *name); int bond_create_sysfs(struct bond_net *net); void bond_destroy_sysfs(struct bond_net *net); @@ -739,10 +741,11 @@ extern struct bond_parm_tbl ad_select_tbl[]; /* exported from bond_netlink.c */ extern struct rtnl_link_ops bond_link_ops; -static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb) +static inline netdev_tx_t bond_tx_drop(struct net_device *dev, struct sk_buff *skb) { atomic_long_inc(&dev->tx_dropped); dev_kfree_skb_any(skb); + return NET_XMIT_DROP; } #endif /* _NET_BONDING_H */ |