diff options
Diffstat (limited to 'net/dccp/output.c')
-rw-r--r-- | net/dccp/output.c | 16 |
1 files changed, 0 insertions, 16 deletions
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) |