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

Commit 8b7ebba9 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Greg Kroah-Hartman
Browse files

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: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ef16d2d

drivers/net/tun.c

+5 −0
Original line number Diff line number Diff line
@@ -821,6 +821,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;

	u32 numqueues = 0;
@@ -887,6 +888,10 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* Enqueue packet */

	skb_queue_tail(&tfile->socket.sk->sk_receive_queue, skb);



	/* 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);