diff options
-rw-r--r-- | net/dccp/dccp.h | 2 | ||||
-rw-r--r-- | net/dccp/options.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 53994f10ced5..c6ba07ea1a9f 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h | |||
@@ -364,6 +364,8 @@ extern void dccp_insert_options(struct sock *sk, struct sk_buff *skb); | |||
364 | extern void dccp_insert_option_elapsed_time(struct sock *sk, | 364 | extern void dccp_insert_option_elapsed_time(struct sock *sk, |
365 | struct sk_buff *skb, | 365 | struct sk_buff *skb, |
366 | u32 elapsed_time); | 366 | u32 elapsed_time); |
367 | extern void dccp_insert_option_timestamp(struct sock *sk, | ||
368 | struct sk_buff *skb); | ||
367 | extern void dccp_insert_option(struct sock *sk, struct sk_buff *skb, | 369 | extern void dccp_insert_option(struct sock *sk, struct sk_buff *skb, |
368 | unsigned char option, | 370 | unsigned char option, |
369 | const void *value, unsigned char len); | 371 | const void *value, unsigned char len); |
diff --git a/net/dccp/options.c b/net/dccp/options.c index 7ecffdf85756..eabcc8f1c625 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c | |||
@@ -348,7 +348,7 @@ void dccp_insert_option_elapsed_time(struct sock *sk, | |||
348 | (unsigned long long) DCCP_SKB_CB(skb)->dccpd_seq); | 348 | (unsigned long long) DCCP_SKB_CB(skb)->dccpd_seq); |
349 | } | 349 | } |
350 | 350 | ||
351 | EXPORT_SYMBOL(dccp_insert_option_elapsed_time); | 351 | EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time); |
352 | 352 | ||
353 | static void dccp_insert_option_ack_vector(struct sock *sk, struct sk_buff *skb) | 353 | static void dccp_insert_option_ack_vector(struct sock *sk, struct sk_buff *skb) |
354 | { | 354 | { |
@@ -426,8 +426,7 @@ static void dccp_insert_option_ack_vector(struct sock *sk, struct sk_buff *skb) | |||
426 | (unsigned long long) ap->dccpap_ack_ackno); | 426 | (unsigned long long) ap->dccpap_ack_ackno); |
427 | } | 427 | } |
428 | 428 | ||
429 | static inline void dccp_insert_option_timestamp(struct sock *sk, | 429 | void dccp_insert_option_timestamp(struct sock *sk, struct sk_buff *skb) |
430 | struct sk_buff *skb) | ||
431 | { | 430 | { |
432 | struct timeval tv; | 431 | struct timeval tv; |
433 | u32 now; | 432 | u32 now; |
@@ -441,6 +440,8 @@ static inline void dccp_insert_option_timestamp(struct sock *sk, | |||
441 | dccp_insert_option(sk, skb, DCCPO_TIMESTAMP, &now, sizeof(now)); | 440 | dccp_insert_option(sk, skb, DCCPO_TIMESTAMP, &now, sizeof(now)); |
442 | } | 441 | } |
443 | 442 | ||
443 | EXPORT_SYMBOL_GPL(dccp_insert_option_timestamp); | ||
444 | |||
444 | static void dccp_insert_option_timestamp_echo(struct sock *sk, | 445 | static void dccp_insert_option_timestamp_echo(struct sock *sk, |
445 | struct sk_buff *skb) | 446 | struct sk_buff *skb) |
446 | { | 447 | { |
@@ -504,7 +505,6 @@ void dccp_insert_options(struct sock *sk, struct sk_buff *skb) | |||
504 | DCCP_MAX_SEQNO + 1)) | 505 | DCCP_MAX_SEQNO + 1)) |
505 | dccp_insert_option_ack_vector(sk, skb); | 506 | dccp_insert_option_ack_vector(sk, skb); |
506 | 507 | ||
507 | dccp_insert_option_timestamp(sk, skb); | ||
508 | if (dp->dccps_timestamp_echo != 0) | 508 | if (dp->dccps_timestamp_echo != 0) |
509 | dccp_insert_option_timestamp_echo(sk, skb); | 509 | dccp_insert_option_timestamp_echo(sk, skb); |
510 | } | 510 | } |