diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-10 05:18:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-10 05:18:24 +0200 |
| commit | e5a8a896f5180f2950695d2d0b79db348d200ca4 (patch) | |
| tree | 04adc57ae51a6d30a89ffae970770b81ee81fc23 /drivers/net/tun.c | |
| parent | netpoll: Introduce netpoll_carrier_timeout kernel option (diff) | |
| parent | cxgb3: Fix crash caused by stashing wrong netdev_queue (diff) | |
| download | linux-e5a8a896f5180f2950695d2d0b79db348d200ca4.tar.xz linux-e5a8a896f5180f2950695d2d0b79db348d200ca4.zip | |
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 92ffd11a7195..dfc1054e4cbd 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -486,12 +486,14 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait) { struct tun_file *tfile = file->private_data; struct tun_struct *tun = __tun_get(tfile); - struct sock *sk = tun->sk; + struct sock *sk; unsigned int mask = 0; if (!tun) return POLLERR; + sk = tun->sk; + DBG(KERN_INFO "%s: tun_chr_poll\n", tun->dev->name); poll_wait(file, &tun->socket.wait, wait); |