aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/options.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-08-24 00:51:36 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 19:04:53 -0400
commitd4b81ff70547b40c9b0742b163e8354560003cc0 (patch)
treedde55db47394af881411a33e06843ff8ab3fd3d8 /net/dccp/options.c
parent012e13eac7579fcc7618df4ca1d5af3cdc03748c (diff)
[DCCP]: Export dccp_insert_option_timestamp to CCIDs
And don't insert a TIMESTAMP option in all packets, leave the decision to the CCIDs. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/options.c')
-rw-r--r--net/dccp/options.c8
1 files changed, 4 insertions, 4 deletions
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
351EXPORT_SYMBOL(dccp_insert_option_elapsed_time); 351EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time);
352 352
353static void dccp_insert_option_ack_vector(struct sock *sk, struct sk_buff *skb) 353static 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
429static inline void dccp_insert_option_timestamp(struct sock *sk, 429void 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
443EXPORT_SYMBOL_GPL(dccp_insert_option_timestamp);
444
444static void dccp_insert_option_timestamp_echo(struct sock *sk, 445static 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 }