[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 d87d6be..85a86bd 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -293,10 +293,7 @@
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,