diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-05 19:06:45 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-05 19:06:45 -0700 |
commit | 6b1344724e10c166d9e3c17011ed879ddf302e94 (patch) | |
tree | bbfa98b183c1249a58ad2debdb696392d8c4a029 /drivers/net/tun.c | |
parent | 8e4a718ff38d8539938ec3421935904c27e00c39 (diff) | |
parent | 1ded3f59f35a2642852b3e2a1c0fa8a97777e9af (diff) | |
download | linux-next-6b1344724e10c166d9e3c17011ed879ddf302e94.tar.gz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r-- | drivers/net/tun.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 11a0ba47b677..b393536012fb 100644 --- a/drivers/net/tun.c +++ b/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) |