tcp: replace cnt & rtt with struct in pkts_acked()

[deliverable/linux.git] / net / ipv4 / tcp_illinois.c

diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index 2ab9bbb6faffb799560df98b093d4cbc1207d816..c8e6d86be11421664f8832666812887a7a6bd07b 100644 (file)
--- a/net/ipv4/tcp_illinois.c
+++ b/net/ipv4/tcp_illinois.c
@@ -82,30 +82,31 @@ static void tcp_illinois_init(struct sock *sk)
 }
 
 /* Measure RTT for each ack. */
-static void tcp_illinois_acked(struct sock *sk, u32 pkts_acked, s32 rtt)
+static void tcp_illinois_acked(struct sock *sk, const struct ack_sample *sample)
 {
        struct illinois *ca = inet_csk_ca(sk);
+       s32 rtt_us = sample->rtt_us;
 
-       ca->acked = pkts_acked;
+       ca->acked = sample->pkts_acked;
 
        /* dup ack, no rtt sample */
-       if (rtt < 0)
+       if (rtt_us < 0)
                return;
 
        /* ignore bogus values, this prevents wraparound in alpha math */
-       if (rtt > RTT_MAX)
-               rtt = RTT_MAX;
+       if (rtt_us > RTT_MAX)
+               rtt_us = RTT_MAX;
 
        /* keep track of minimum RTT seen so far */
-       if (ca->base_rtt > rtt)
-               ca->base_rtt = rtt;
+       if (ca->base_rtt > rtt_us)
+               ca->base_rtt = rtt_us;
 
        /* and max */
-       if (ca->max_rtt < rtt)
-               ca->max_rtt = rtt;
+       if (ca->max_rtt < rtt_us)
+               ca->max_rtt = rtt_us;
 
        ++ca->cnt_rtt;
-       ca->sum_rtt += rtt;
+       ca->sum_rtt += rtt_us;
 }
 
 /* Maximum queuing delay */