From 7536fe77cda2319ba33dd4b69c7057297d6d5533 Mon Sep 17 00:00:00 2001 From: Ian McDonald Date: Thu, 18 Aug 2005 20:45:29 -0300 Subject: [PATCH] --- yaml --- r: 6381 b: refs/heads/master c: b1c9fe7b818acbd36dc908c5c1ad4cab34c67b39 h: refs/heads/master i: 6379: b23cb1adc7b0bc7717d9e7c65a027135933f33ae v: v3 --- [refs] | 2 +- trunk/net/dccp/options.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 589ec1a5fd3d..0f62d497c652 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d179cd12928443f3ec29cfbc3567439644bd0afc +refs/heads/master: b1c9fe7b818acbd36dc908c5c1ad4cab34c67b39 diff --git a/trunk/net/dccp/options.c b/trunk/net/dccp/options.c index d87d6be7ab10..85a86bd61f44 100644 --- a/trunk/net/dccp/options.c +++ b/trunk/net/dccp/options.c @@ -293,10 +293,7 @@ static void dccp_insert_option_ndp(struct sock *sk, struct sk_buff *skb) static inline int dccp_elapsed_time_len(const u32 elapsed_time) { - return elapsed_time == 0 ? 0 : - elapsed_time <= 0xFF ? 1 : - elapsed_time <= 0xFFFF ? 2 : - elapsed_time <= 0xFFFFFF ? 3 : 4; + return elapsed_time == 0 ? 0 : elapsed_time <= 0xFFFF ? 2 : 4; } void dccp_insert_option_elapsed_time(struct sock *sk,