[MAC80211]: remove turbo modes

[linux-2.6] / net / dccp / input.c

diff --git a/net/dccp/input.c b/net/dccp/input.c
index bd578c87b2e7aa7bcd866949f0eff69dcd4ed58a..782cdb7292fa3aa71c62b40c1bfbf3c1f546fca6 100644 (file)
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -300,6 +300,12 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk,
                if (dccp_parse_options(sk, skb))
                        goto out_invalid_packet;
 
+               /* Obtain RTT sample from SYN exchange (used by CCID 3) */
+               if (dp->dccps_options_received.dccpor_timestamp_echo)
+                       dp->dccps_syn_rtt = dccp_sample_rtt(sk,
+                                                           ktime_get_real(),
+                                                           NULL);
+
                if (dccp_msk(sk)->dccpms_send_ack_vector &&
                    dccp_ackvec_add(dp->dccps_hc_rx_ackvec, sk,
                                    DCCP_SKB_CB(skb)->dccpd_seq,
@@ -585,22 +591,21 @@ EXPORT_SYMBOL_GPL(dccp_rcv_state_process);
  * @t_recv: receive timestamp of packet with timestamp echo
  * @t_hist: packet history timestamp or NULL
  */
-u32 dccp_sample_rtt(struct sock *sk, struct timeval *t_recv,
-                                    struct timeval *t_hist)
+u32 dccp_sample_rtt(struct sock *sk, ktime_t t_recv, ktime_t *t_hist)
 {
        struct dccp_sock *dp = dccp_sk(sk);
        struct dccp_options_received *or = &dp->dccps_options_received;
-       suseconds_t delta;
+       s64 delta;
 
        if (t_hist == NULL) {
                if (!or->dccpor_timestamp_echo) {
                        DCCP_WARN("packet without timestamp echo\n");
                        return DCCP_SANE_RTT_MAX;
                }
-               timeval_sub_usecs(t_recv, or->dccpor_timestamp_echo * 10);
-               delta = timeval_usecs(t_recv);
+               ktime_sub_us(t_recv, or->dccpor_timestamp_echo * 10);
+               delta = ktime_to_us(t_recv);
        } else
-               delta = timeval_delta(t_recv, t_hist);
+               delta = ktime_us_delta(t_recv, *t_hist);
 
        delta -= or->dccpor_elapsed_time * 10;          /* either set or 0 */
 
@@ -608,7 +613,7 @@ u32 dccp_sample_rtt(struct sock *sk, struct timeval *t_recv,
                DCCP_WARN("unusable RTT sample %ld, using min\n", (long)delta);
                return DCCP_SANE_RTT_MIN;
        }
-       if (unlikely(delta - (suseconds_t)DCCP_SANE_RTT_MAX > 0)) {
+       if (unlikely(delta - (s64)DCCP_SANE_RTT_MAX > 0)) {
                DCCP_WARN("RTT sample %ld too large, using max\n", (long)delta);
                return DCCP_SANE_RTT_MAX;
        }