diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/net/tun.c | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
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 680d78e38f13..5a6203072ce7 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -1068,8 +1068,6 @@ static int tun_chr_close(struct inode *inode, struct file *file) | |||
| 1068 | 1068 | ||
| 1069 | DBG(KERN_INFO "%s: tun_chr_close\n", tun->dev->name); | 1069 | DBG(KERN_INFO "%s: tun_chr_close\n", tun->dev->name); |
| 1070 | 1070 | ||
| 1071 | tun_chr_fasync(-1, file, 0); | ||
| 1072 | |||
| 1073 | rtnl_lock(); | 1071 | rtnl_lock(); |
| 1074 | 1072 | ||
| 1075 | /* Detach from net device */ | 1073 | /* Detach from net device */ |