From 678f0be5f2e5ed8fef3d330b95c67153eb675e6e Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 2 Jul 2009 23:03:55 +0000 Subject: [PATCH] --- yaml --- r: 155011 b: refs/heads/master c: d23e43658aed286b885d398ff0810f04f6aae97f h: refs/heads/master i: 155009: d4f419019821016881a811eb23c82b15a324bb9c 155007: a08d3f972cd0ba31073a5ed85b9603ca94248678 v: v3 --- [refs] | 2 +- trunk/drivers/net/tun.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 481db0c9ed1b..a2fc74d4dbb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c001c213b109c8baeeb6d012b422bf059b18368f +refs/heads/master: d23e43658aed286b885d398ff0810f04f6aae97f diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c index 11a0ba47b677..b393536012fb 100644 --- a/trunk/drivers/net/tun.c +++ b/trunk/drivers/net/tun.c @@ -1324,20 +1324,22 @@ static int tun_chr_close(struct inode *inode, struct file *file) struct tun_file *tfile = file->private_data; struct tun_struct *tun; - - rtnl_lock(); tun = __tun_get(tfile); if (tun) { - DBG(KERN_INFO "%s: tun_chr_close\n", tun->dev->name); + struct net_device *dev = tun->dev; + + DBG(KERN_INFO "%s: tun_chr_close\n", dev->name); __tun_detach(tun); /* If desireable, unregister the netdevice. */ - if (!(tun->flags & TUN_PERSIST)) - unregister_netdevice(tun->dev); - + if (!(tun->flags & TUN_PERSIST)) { + rtnl_lock(); + if (dev->reg_state == NETREG_REGISTERED) + unregister_netdevice(dev); + rtnl_unlock(); + } } - rtnl_unlock(); tun = tfile->tun; if (tun)