Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dccp: remove obsolete code

This function is defined but not used.
Remove it now, can be resurrected if ever needed.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

stephen hemminger and committed by
David S. Miller
fd34d627 cdf3e274

-33
-1
net/dccp/dccp.h
··· 479 479 480 480 int dccp_insert_options(struct sock *sk, struct sk_buff *skb); 481 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 482 u32 dccp_timestamp(void); 484 483 void dccp_timestamping_init(void); 485 484 int dccp_insert_option(struct sk_buff *skb, unsigned char option,
-32
net/dccp/options.c
··· 343 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 346 static int dccp_insert_option_timestamp(struct sk_buff *skb) 379 347 { 380 348 __be32 now = htonl(dccp_timestamp());