[DCCP]: Fix elapsed time option as per section 13.2 of spec v11

The elapsed time can be two bytes or four bytes only.

Signed-off-by: Ian McDonald <iam4@cs.waikato.ac.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dccp/options.c b/net/dccp/options.c
index d87d6be7ab1021b960a33368251c714e2309664d..85a86bd61f442b4eb5892d692d4d6309bf484a89 100644 (file)
--- a/net/dccp/options.c
+++ b/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,