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/dccp.h | |
| parent | f4cd87aabb51fcc709b0dacc05b718c400c64172 (diff) | |
| parent | d2b02ed9487ed25832d19534575052e43f8e0c4f (diff) | |
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/dccp.h')
| -rw-r--r-- | net/dccp/dccp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index e33a9edb403..a0e7cd183a5 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h @@ -191,6 +191,7 @@ extern void dccp_send_sync(struct sock *sk, const u64 seq, const enum dccp_pkt_type pkt_type); extern void dccp_write_xmit(struct sock *sk, int block); +extern void dccp_write_xmit_timer(unsigned long data); extern void dccp_write_space(struct sock *sk); extern void dccp_init_xmit_timers(struct sock *sk); |