diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2007-03-09 16:47:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-03-09 16:47:58 -0500 |
commit | aabb601b0f08b909b650f1a7bfa1e8d9b5a8d999 (patch) | |
tree | c3060d0005f6b035b43fe4e5855a1d514b43e589 /net/dccp/dccp.h | |
parent | c4e38f41e34ad853651d66227aae23e48457dce0 (diff) |
[DCCP]: Initialise write_xmit_timer also on passive sockets
The TX CCID needs the write_xmit_timer for delaying packet sends. Previously
this timer was only activated on active (connecting) sockets.
This patch initialises the write_xmit_timer in sync with the other timers, i.e.
the timer will be ready on any socket. This is used by applications with a
listening socket which start to stream after receiving an initiation by the
client. The write_xmit_timer is stopped when the application closes, as before.
Was tested to work and to remove the timer bug reported on dccp@vger.
Also moved timer initialisation into timer.c (static).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 e33a9edb4036..a0e7cd183a5d 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, | |||
191 | const enum dccp_pkt_type pkt_type); | 191 | const enum dccp_pkt_type pkt_type); |
192 | 192 | ||
193 | extern void dccp_write_xmit(struct sock *sk, int block); | 193 | extern void dccp_write_xmit(struct sock *sk, int block); |
194 | extern void dccp_write_xmit_timer(unsigned long data); | ||
194 | extern void dccp_write_space(struct sock *sk); | 195 | extern void dccp_write_space(struct sock *sk); |
195 | 196 | ||
196 | extern void dccp_init_xmit_timers(struct sock *sk); | 197 | extern void dccp_init_xmit_timers(struct sock *sk); |