diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-10 01:04:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-10 01:04:27 -0500 |
commit | f47273e5c8f679220091335e0bed79e46237cfda (patch) | |
tree | 6a6e3d37210e723524deae2991e399e2c15d4d79 /net/dccp | |
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')
-rw-r--r-- | net/dccp/dccp.h | 1 | ||||
-rw-r--r-- | net/dccp/output.c | 16 | ||||
-rw-r--r-- | net/dccp/timer.c | 25 |
3 files changed, 26 insertions, 16 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); |
diff --git a/net/dccp/output.c b/net/dccp/output.c index 3282f2f2291b..aa21cc4de37f 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -213,19 +213,6 @@ do_interrupted: | |||
213 | goto out; | 213 | goto out; |
214 | } | 214 | } |
215 | 215 | ||
216 | static void dccp_write_xmit_timer(unsigned long data) { | ||
217 | struct sock *sk = (struct sock *)data; | ||
218 | struct dccp_sock *dp = dccp_sk(sk); | ||
219 | |||
220 | bh_lock_sock(sk); | ||
221 | if (sock_owned_by_user(sk)) | ||
222 | sk_reset_timer(sk, &dp->dccps_xmit_timer, jiffies+1); | ||
223 | else | ||
224 | dccp_write_xmit(sk, 0); | ||
225 | bh_unlock_sock(sk); | ||
226 | sock_put(sk); | ||
227 | } | ||
228 | |||
229 | void dccp_write_xmit(struct sock *sk, int block) | 216 | void dccp_write_xmit(struct sock *sk, int block) |
230 | { | 217 | { |
231 | struct dccp_sock *dp = dccp_sk(sk); | 218 | struct dccp_sock *dp = dccp_sk(sk); |
@@ -434,9 +421,6 @@ static inline void dccp_connect_init(struct sock *sk) | |||
434 | dp->dccps_gar = dp->dccps_iss; | 421 | dp->dccps_gar = dp->dccps_iss; |
435 | 422 | ||
436 | icsk->icsk_retransmits = 0; | 423 | icsk->icsk_retransmits = 0; |
437 | init_timer(&dp->dccps_xmit_timer); | ||
438 | dp->dccps_xmit_timer.data = (unsigned long)sk; | ||
439 | dp->dccps_xmit_timer.function = dccp_write_xmit_timer; | ||
440 | } | 424 | } |
441 | 425 | ||
442 | int dccp_connect(struct sock *sk) | 426 | int dccp_connect(struct sock *sk) |
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 41ea0f6594c4..b038a0a3ad40 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c | |||
@@ -261,8 +261,33 @@ out: | |||
261 | sock_put(sk); | 261 | sock_put(sk); |
262 | } | 262 | } |
263 | 263 | ||
264 | /* Transmit-delay timer: used by the CCIDs to delay actual send time */ | ||
265 | void dccp_write_xmit_timer(unsigned long data) | ||
266 | { | ||
267 | struct sock *sk = (struct sock *)data; | ||
268 | struct dccp_sock *dp = dccp_sk(sk); | ||
269 | |||
270 | bh_lock_sock(sk); | ||
271 | if (sock_owned_by_user(sk)) | ||
272 | sk_reset_timer(sk, &dp->dccps_xmit_timer, jiffies+1); | ||
273 | else | ||
274 | dccp_write_xmit(sk, 0); | ||
275 | bh_unlock_sock(sk); | ||
276 | sock_put(sk); | ||
277 | } | ||
278 | |||
279 | static void dccp_init_write_xmit_timer(struct sock *sk) | ||
280 | { | ||
281 | struct dccp_sock *dp = dccp_sk(sk); | ||
282 | |||
283 | init_timer(&dp->dccps_xmit_timer); | ||
284 | dp->dccps_xmit_timer.data = (unsigned long)sk; | ||
285 | dp->dccps_xmit_timer.function = dccp_write_xmit_timer; | ||
286 | } | ||
287 | |||
264 | void dccp_init_xmit_timers(struct sock *sk) | 288 | void dccp_init_xmit_timers(struct sock *sk) |
265 | { | 289 | { |
290 | dccp_init_write_xmit_timer(sk); | ||
266 | inet_csk_init_xmit_timers(sk, &dccp_write_timer, &dccp_delack_timer, | 291 | inet_csk_init_xmit_timers(sk, &dccp_write_timer, &dccp_delack_timer, |
267 | &dccp_keepalive_timer); | 292 | &dccp_keepalive_timer); |
268 | } | 293 | } |