diff options
-rw-r--r-- | net/dccp/ccids/ccid2.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index 02d126d9a711..48eeb4494e8d 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c | |||
@@ -228,18 +228,10 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) | |||
228 | struct dccp_sock *dp = dccp_sk(sk); | 228 | struct dccp_sock *dp = dccp_sk(sk); |
229 | struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk); | 229 | struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk); |
230 | struct ccid2_seq *next; | 230 | struct ccid2_seq *next; |
231 | u64 seq; | ||
232 | 231 | ||
233 | hctx->ccid2hctx_pipe++; | 232 | hctx->ccid2hctx_pipe++; |
234 | 233 | ||
235 | /* There is an issue. What if another packet is sent between | 234 | hctx->ccid2hctx_seqh->ccid2s_seq = dp->dccps_gss; |
236 | * packet_send() and packet_sent(). Then the sequence number would be | ||
237 | * wrong. | ||
238 | * -sorbo. | ||
239 | */ | ||
240 | seq = dp->dccps_gss; | ||
241 | |||
242 | hctx->ccid2hctx_seqh->ccid2s_seq = seq; | ||
243 | hctx->ccid2hctx_seqh->ccid2s_acked = 0; | 235 | hctx->ccid2hctx_seqh->ccid2s_acked = 0; |
244 | hctx->ccid2hctx_seqh->ccid2s_sent = jiffies; | 236 | hctx->ccid2hctx_seqh->ccid2s_sent = jiffies; |
245 | 237 | ||
@@ -313,7 +305,6 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) | |||
313 | ccid2_start_rto_timer(sk); | 305 | ccid2_start_rto_timer(sk); |
314 | 306 | ||
315 | #ifdef CONFIG_IP_DCCP_CCID2_DEBUG | 307 | #ifdef CONFIG_IP_DCCP_CCID2_DEBUG |
316 | ccid2_pr_debug("Sent: seq=%llu\n", (unsigned long long)seq); | ||
317 | do { | 308 | do { |
318 | struct ccid2_seq *seqp = hctx->ccid2hctx_seqt; | 309 | struct ccid2_seq *seqp = hctx->ccid2hctx_seqt; |
319 | 310 | ||