diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/dccp/timer.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 8447742f5615..bda0af639ae4 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c | |||
@@ -142,7 +142,7 @@ static void dccp_retransmit_timer(struct sock *sk) | |||
142 | 142 | ||
143 | /* retransmit timer is used for feature negotiation throughout | 143 | /* retransmit timer is used for feature negotiation throughout |
144 | * connection. In this case, no packet is re-transmitted, but rather an | 144 | * connection. In this case, no packet is re-transmitted, but rather an |
145 | * ack is generated and pending changes are splaced into its options. | 145 | * ack is generated and pending changes are placed into its options. |
146 | */ | 146 | */ |
147 | if (sk->sk_send_head == NULL) { | 147 | if (sk->sk_send_head == NULL) { |
148 | dccp_pr_debug("feat negotiation retransmit timeout %p\n", sk); | 148 | dccp_pr_debug("feat negotiation retransmit timeout %p\n", sk); |
@@ -154,9 +154,11 @@ static void dccp_retransmit_timer(struct sock *sk) | |||
154 | /* | 154 | /* |
155 | * sk->sk_send_head has to have one skb with | 155 | * sk->sk_send_head has to have one skb with |
156 | * DCCP_SKB_CB(skb)->dccpd_type set to one of the retransmittable DCCP | 156 | * DCCP_SKB_CB(skb)->dccpd_type set to one of the retransmittable DCCP |
157 | * packet types (REQUEST, RESPONSE, the ACK in the 3way handshake | 157 | * packet types. The only packets eligible for retransmission are: |
158 | * (PARTOPEN timer), etc). | 158 | * -- Requests in client-REQUEST state (sec. 8.1.1) |
159 | */ | 159 | * -- Acks in client-PARTOPEN state (sec. 8.1.5) |
160 | * -- CloseReq in server-CLOSEREQ state (sec. 8.3) | ||
161 | * -- Close in node-CLOSING state (sec. 8.3) */ | ||
160 | BUG_TRAP(sk->sk_send_head != NULL); | 162 | BUG_TRAP(sk->sk_send_head != NULL); |
161 | 163 | ||
162 | /* | 164 | /* |