diff options
Diffstat (limited to 'net/dccp/timer.c')
-rw-r--r-- | net/dccp/timer.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index e8f519e7f481..e5348f369c60 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * net/dccp/timer.c | 2 | * net/dccp/timer.c |
3 | * | 3 | * |
4 | * An implementation of the DCCP protocol | 4 | * An implementation of the DCCP protocol |
5 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 5 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> |
6 | * | 6 | * |
@@ -102,13 +102,13 @@ static void dccp_retransmit_timer(struct sock *sk) | |||
102 | * sk->sk_send_head has to have one skb with | 102 | * sk->sk_send_head has to have one skb with |
103 | * DCCP_SKB_CB(skb)->dccpd_type set to one of the retransmittable DCCP | 103 | * DCCP_SKB_CB(skb)->dccpd_type set to one of the retransmittable DCCP |
104 | * packet types. The only packets eligible for retransmission are: | 104 | * packet types. The only packets eligible for retransmission are: |
105 | * -- Requests in client-REQUEST state (sec. 8.1.1) | 105 | * -- Requests in client-REQUEST state (sec. 8.1.1) |
106 | * -- Acks in client-PARTOPEN state (sec. 8.1.5) | 106 | * -- Acks in client-PARTOPEN state (sec. 8.1.5) |
107 | * -- CloseReq in server-CLOSEREQ state (sec. 8.3) | 107 | * -- CloseReq in server-CLOSEREQ state (sec. 8.3) |
108 | * -- Close in node-CLOSING state (sec. 8.3) */ | 108 | * -- Close in node-CLOSING state (sec. 8.3) */ |
109 | BUG_TRAP(sk->sk_send_head != NULL); | 109 | BUG_TRAP(sk->sk_send_head != NULL); |
110 | 110 | ||
111 | /* | 111 | /* |
112 | * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was | 112 | * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was |
113 | * sent, no need to retransmit, this sock is dead. | 113 | * sent, no need to retransmit, this sock is dead. |
114 | */ | 114 | */ |
@@ -200,7 +200,7 @@ static void dccp_keepalive_timer(unsigned long data) | |||
200 | /* Only process if socket is not in use. */ | 200 | /* Only process if socket is not in use. */ |
201 | bh_lock_sock(sk); | 201 | bh_lock_sock(sk); |
202 | if (sock_owned_by_user(sk)) { | 202 | if (sock_owned_by_user(sk)) { |
203 | /* Try again later. */ | 203 | /* Try again later. */ |
204 | inet_csk_reset_keepalive_timer(sk, HZ / 20); | 204 | inet_csk_reset_keepalive_timer(sk, HZ / 20); |
205 | goto out; | 205 | goto out; |
206 | } | 206 | } |