diff options
-rw-r--r-- | net/dccp/dccp.h | 1 | ||||
-rw-r--r-- | net/dccp/options.c | 32 |
2 files changed, 0 insertions, 33 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 30948784dd58..c67816647cce 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h | |||
@@ -479,7 +479,6 @@ void dccp_feat_list_purge(struct list_head *fn_list); | |||
479 | 479 | ||
480 | int dccp_insert_options(struct sock *sk, struct sk_buff *skb); | 480 | int dccp_insert_options(struct sock *sk, struct sk_buff *skb); |
481 | int dccp_insert_options_rsk(struct dccp_request_sock *, struct sk_buff *); | 481 | int dccp_insert_options_rsk(struct dccp_request_sock *, struct sk_buff *); |
482 | int dccp_insert_option_elapsed_time(struct sk_buff *skb, u32 elapsed); | ||
483 | u32 dccp_timestamp(void); | 482 | u32 dccp_timestamp(void); |
484 | void dccp_timestamping_init(void); | 483 | void dccp_timestamping_init(void); |
485 | int dccp_insert_option(struct sk_buff *skb, unsigned char option, | 484 | int dccp_insert_option(struct sk_buff *skb, unsigned char option, |
diff --git a/net/dccp/options.c b/net/dccp/options.c index a58e0b634050..9bce31886bda 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c | |||
@@ -343,38 +343,6 @@ static inline int dccp_elapsed_time_len(const u32 elapsed_time) | |||
343 | return elapsed_time == 0 ? 0 : elapsed_time <= 0xFFFF ? 2 : 4; | 343 | return elapsed_time == 0 ? 0 : elapsed_time <= 0xFFFF ? 2 : 4; |
344 | } | 344 | } |
345 | 345 | ||
346 | /* FIXME: This function is currently not used anywhere */ | ||
347 | int dccp_insert_option_elapsed_time(struct sk_buff *skb, u32 elapsed_time) | ||
348 | { | ||
349 | const int elapsed_time_len = dccp_elapsed_time_len(elapsed_time); | ||
350 | const int len = 2 + elapsed_time_len; | ||
351 | unsigned char *to; | ||
352 | |||
353 | if (elapsed_time_len == 0) | ||
354 | return 0; | ||
355 | |||
356 | if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN) | ||
357 | return -1; | ||
358 | |||
359 | DCCP_SKB_CB(skb)->dccpd_opt_len += len; | ||
360 | |||
361 | to = skb_push(skb, len); | ||
362 | *to++ = DCCPO_ELAPSED_TIME; | ||
363 | *to++ = len; | ||
364 | |||
365 | if (elapsed_time_len == 2) { | ||
366 | const __be16 var16 = htons((u16)elapsed_time); | ||
367 | memcpy(to, &var16, 2); | ||
368 | } else { | ||
369 | const __be32 var32 = htonl(elapsed_time); | ||
370 | memcpy(to, &var32, 4); | ||
371 | } | ||
372 | |||
373 | return 0; | ||
374 | } | ||
375 | |||
376 | EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time); | ||
377 | |||
378 | static int dccp_insert_option_timestamp(struct sk_buff *skb) | 346 | static int dccp_insert_option_timestamp(struct sk_buff *skb) |
379 | { | 347 | { |
380 | __be32 now = htonl(dccp_timestamp()); | 348 | __be32 now = htonl(dccp_timestamp()); |