|
@@ -68,7 +68,7 @@ static void tcp_westwood_init(struct sock *sk)
|
|
w->cumul_ack = 0;
|
|
w->cumul_ack = 0;
|
|
w->reset_rtt_min = 1;
|
|
w->reset_rtt_min = 1;
|
|
w->rtt_min = w->rtt = TCP_WESTWOOD_INIT_RTT;
|
|
w->rtt_min = w->rtt = TCP_WESTWOOD_INIT_RTT;
|
|
- w->rtt_win_sx = tcp_time_stamp;
|
|
|
|
|
|
+ w->rtt_win_sx = tcp_jiffies32;
|
|
w->snd_una = tcp_sk(sk)->snd_una;
|
|
w->snd_una = tcp_sk(sk)->snd_una;
|
|
w->first_ack = 1;
|
|
w->first_ack = 1;
|
|
}
|
|
}
|
|
@@ -116,7 +116,7 @@ static void tcp_westwood_pkts_acked(struct sock *sk,
|
|
static void westwood_update_window(struct sock *sk)
|
|
static void westwood_update_window(struct sock *sk)
|
|
{
|
|
{
|
|
struct westwood *w = inet_csk_ca(sk);
|
|
struct westwood *w = inet_csk_ca(sk);
|
|
- s32 delta = tcp_time_stamp - w->rtt_win_sx;
|
|
|
|
|
|
+ s32 delta = tcp_jiffies32 - w->rtt_win_sx;
|
|
|
|
|
|
/* Initialize w->snd_una with the first acked sequence number in order
|
|
/* Initialize w->snd_una with the first acked sequence number in order
|
|
* to fix mismatch between tp->snd_una and w->snd_una for the first
|
|
* to fix mismatch between tp->snd_una and w->snd_una for the first
|
|
@@ -140,7 +140,7 @@ static void westwood_update_window(struct sock *sk)
|
|
westwood_filter(w, delta);
|
|
westwood_filter(w, delta);
|
|
|
|
|
|
w->bk = 0;
|
|
w->bk = 0;
|
|
- w->rtt_win_sx = tcp_time_stamp;
|
|
|
|
|
|
+ w->rtt_win_sx = tcp_jiffies32;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|