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

Commit af668b3c authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller
Browse files

tun: fix carrier on/off status 



Commit c8d68e6b removed carrier off call
from tun_detach since it's now called on queue disable and not only on
tun close.  This confuses userspace which used this flag to detect a
free tun. To fix, put this back but under if (clean).

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Tested-by: default avatarToralf Förster <toralf.foerster@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 604dfd6e

drivers/net/tun.c

+8 −5
Original line number Diff line number Diff line
@@ -439,10 +439,13 @@ static void __tun_detach(struct tun_file *tfile, bool clean) 
	}



	if (clean) {

		if (tun && tun->numqueues == 0 && tun->numdisabled == 0 &&

		    !(tun->flags & TUN_PERSIST))

			if (tun->dev->reg_state == NETREG_REGISTERED)

		if (tun && tun->numqueues == 0 && tun->numdisabled == 0) {

			netif_carrier_off(tun->dev);



			if (!(tun->flags & TUN_PERSIST) &&

			    tun->dev->reg_state == NETREG_REGISTERED)

				unregister_netdevice(tun->dev);

		}



		BUG_ON(!test_bit(SOCK_EXTERNALLY_ALLOCATED,

				 &tfile->socket.flags));
@@ -1658,9 +1661,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) 
		    device_create_file(&tun->dev->dev, &dev_attr_owner) ||

		    device_create_file(&tun->dev->dev, &dev_attr_group))

			pr_err("Failed to create tun sysfs files\n");

	}



	netif_carrier_on(tun->dev);

	}



	tun_debug(KERN_INFO, tun, "tun_set_iff\n");