dccp: Clamping RTT values

This extracts the clamping part of dccp_sample_rtt() and makes it available
to other parts of the code (as e.g. used in the next patch).

Note: The function dccp_sample_rtt() now reduces to subtracting the elapsed
time. This could be eliminated but would require shorter prefixes and thus
is not done by this patch - maybe an idea for later.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>

1 files changed, 1 insertions, 10 deletions

diff --git a/net/dccp/input.c b/net/dccp/input.c
index b1e38bf94456..df0e6714aa11 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -707,16 +707,7 @@ u32 dccp_sample_rtt(struct sock *sk, long delta)
         /* dccpor_elapsed_time is either zeroed out or set and > 0 */
         delta -= dccp_sk(sk)->dccps_options_received.dccpor_elapsed_time * 10;
 
-        if (unlikely(delta <= 0)) {
-                DCCP_WARN("unusable RTT sample %ld, using min\n", delta);
-                return DCCP_SANE_RTT_MIN;
-        }
-        if (unlikely(delta > DCCP_SANE_RTT_MAX)) {
-                DCCP_WARN("RTT sample %ld too large, using max\n", delta);
-                return DCCP_SANE_RTT_MAX;
-        }
-
-        return delta;
+        return dccp_sane_rtt(delta);
 }
 
 EXPORT_SYMBOL_GPL(dccp_sample_rtt);