aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/dccp/options.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/dccp/options.c b/net/dccp/options.c
index 14b621227323..34d536d5f1a1 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -172,21 +172,25 @@ int dccp_parse_options(struct sock *sk, struct sk_buff *skb)
172 opt_recv->dccpor_timestamp_echo = ntohl(*(__be32 *)value); 172 opt_recv->dccpor_timestamp_echo = ntohl(*(__be32 *)value);
173 173
174 dccp_pr_debug("%s rx opt: TIMESTAMP_ECHO=%u, len=%d, " 174 dccp_pr_debug("%s rx opt: TIMESTAMP_ECHO=%u, len=%d, "
175 "ackno=%llu, ", dccp_role(sk), 175 "ackno=%llu", dccp_role(sk),
176 opt_recv->dccpor_timestamp_echo, 176 opt_recv->dccpor_timestamp_echo,
177 len + 2, 177 len + 2,
178 (unsigned long long) 178 (unsigned long long)
179 DCCP_SKB_CB(skb)->dccpd_ack_seq); 179 DCCP_SKB_CB(skb)->dccpd_ack_seq);
180 180
181 181
182 if (len == 4) 182 if (len == 4) {
183 dccp_pr_debug_cat("\n");
183 break; 184 break;
185 }
184 186
185 if (len == 6) 187 if (len == 6)
186 elapsed_time = ntohs(*(__be16 *)(value + 4)); 188 elapsed_time = ntohs(*(__be16 *)(value + 4));
187 else 189 else
188 elapsed_time = ntohl(*(__be32 *)(value + 4)); 190 elapsed_time = ntohl(*(__be32 *)(value + 4));
189 191
192 dccp_pr_debug_cat(", ELAPSED_TIME=%d\n", elapsed_time);
193
190 /* Give precedence to the biggest ELAPSED_TIME */ 194 /* Give precedence to the biggest ELAPSED_TIME */
191 if (elapsed_time > opt_recv->dccpor_elapsed_time) 195 if (elapsed_time > opt_recv->dccpor_elapsed_time)
192 opt_recv->dccpor_elapsed_time = elapsed_time; 196 opt_recv->dccpor_elapsed_time = elapsed_time;