diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /drivers/net/tun.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 6daea0c91862..33b6d1b122fb 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -1070,8 +1070,6 @@ static int tun_chr_close(struct inode *inode, struct file *file) | |||
| 1070 | 1070 | ||
| 1071 | DBG(KERN_INFO "%s: tun_chr_close\n", tun->dev->name); | 1071 | DBG(KERN_INFO "%s: tun_chr_close\n", tun->dev->name); |
| 1072 | 1072 | ||
| 1073 | tun_chr_fasync(-1, file, 0); | ||
| 1074 | |||
| 1075 | rtnl_lock(); | 1073 | rtnl_lock(); |
| 1076 | 1074 | ||
| 1077 | /* Detach from net device */ | 1075 | /* Detach from net device */ |