diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 22:04:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 22:04:27 -0800 |
| commit | f47273e5c8f679220091335e0bed79e46237cfda (patch) | |
| tree | 6a6e3d37210e723524deae2991e399e2c15d4d79 /net/dccp/timer.c | |
| parent | f4cd87aabb51fcc709b0dacc05b718c400c64172 (diff) | |
| parent | d2b02ed9487ed25832d19534575052e43f8e0c4f (diff) | |
| download | kernel_goldelico_gta04-f47273e5c8f679220091335e0bed79e46237cfda.zip kernel_goldelico_gta04-f47273e5c8f679220091335e0bed79e46237cfda.tar.gz kernel_goldelico_gta04-f47273e5c8f679220091335e0bed79e46237cfda.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV6] fix ipv6_getsockopt_sticky copy_to_user leak
[IPV6]: Fix for ipv6_setsockopt NULL dereference
[DCCP]: Initialise write_xmit_timer also on passive sockets
[IPV4]: Fix rtm_to_ifaddr() error handling.
Diffstat (limited to 'net/dccp/timer.c')
| -rw-r--r-- | net/dccp/timer.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 41ea0f6..b038a0a 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c @@ -261,8 +261,33 @@ out: sock_put(sk); } +/* Transmit-delay timer: used by the CCIDs to delay actual send time */ +void dccp_write_xmit_timer(unsigned long data) +{ + struct sock *sk = (struct sock *)data; + struct dccp_sock *dp = dccp_sk(sk); + + bh_lock_sock(sk); + if (sock_owned_by_user(sk)) + sk_reset_timer(sk, &dp->dccps_xmit_timer, jiffies+1); + else + dccp_write_xmit(sk, 0); + bh_unlock_sock(sk); + sock_put(sk); +} + +static void dccp_init_write_xmit_timer(struct sock *sk) +{ + struct dccp_sock *dp = dccp_sk(sk); + + init_timer(&dp->dccps_xmit_timer); + dp->dccps_xmit_timer.data = (unsigned long)sk; + dp->dccps_xmit_timer.function = dccp_write_xmit_timer; +} + void dccp_init_xmit_timers(struct sock *sk) { + dccp_init_write_xmit_timer(sk); inet_csk_init_xmit_timers(sk, &dccp_write_timer, &dccp_delack_timer, &dccp_keepalive_timer); } |