diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2021-11-12 08:56:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-26 11:36:23 +0100 |
| commit | a57c5cbfb5c4dff95797a189b4d093b6343bc6d2 (patch) | |
| tree | bb4f8f56b90842d037a5084c12927f3d20261a25 /drivers/net/tun.c | |
| parent | 4c56f86ced54b7cf1727f6cf538776040e742a8a (diff) | |
| download | linux-stable-a57c5cbfb5c4dff95797a189b4d093b6343bc6d2.tar.gz linux-stable-a57c5cbfb5c4dff95797a189b4d093b6343bc6d2.tar.bz2 linux-stable-a57c5cbfb5c4dff95797a189b4d093b6343bc6d2.zip | |
tun: fix bonding active backup with arp monitoring
commit a31d27fbed5d518734cb60956303eb15089a7634 upstream.
As stated in the bonding doc, trans_start must be set manually for drivers
using NETIF_F_LLTX:
Drivers that use NETIF_F_LLTX flag must also update
netdev_queue->trans_start. If they do not, then the ARP monitor will
immediately fail any slaves using that driver, and those slaves will stay
down.
Link: https://www.kernel.org/doc/html/v5.15/networking/bonding.html#arp-monitor-operation
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 8ee2c519c9bf..d5bb972cbc9a 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1085,6 +1085,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) { struct tun_struct *tun = netdev_priv(dev); int txq = skb->queue_mapping; + struct netdev_queue *queue; struct tun_file *tfile; int len = skb->len; @@ -1131,6 +1132,10 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) if (ptr_ring_produce(&tfile->tx_ring, skb)) goto drop; + /* NETIF_F_LLTX requires to do our own update of trans_start */ + queue = netdev_get_tx_queue(dev, txq); + queue->trans_start = jiffies; + /* Notify and wake up reader process */ if (tfile->flags & TUN_FASYNC) kill_fasync(&tfile->fasync, SIGIO, POLL_IN); |