diff options
| author | Neal Cardwell <ncardwell@google.com> | 2012-04-27 17:29:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-27 18:34:39 +0200 |
| commit | 651913ce9de2bbcedef608c5d6cf39c244248509 (patch) | |
| tree | c2c25a9e8f5c1e8e29c81f857fcbdcb5c4945f64 /net/ipv4/tcp_input.c | |
| parent | MAINTAINERS: update sctp maintainer address (diff) | |
| download | linux-651913ce9de2bbcedef608c5d6cf39c244248509.tar.xz linux-651913ce9de2bbcedef608c5d6cf39c244248509.zip | |
tcp: clean up use of jiffies in tcp_rcv_rtt_measure()
Clean up a reference to jiffies in tcp_rcv_rtt_measure() that should
instead reference tcp_time_stamp. Since the result of the subtraction
is passed into a function taking u32, this should not change any
behavior (and indeed the generated assembly does not change on
x86_64). However, it seems worth cleaning this up for consistency and
clarity (and perhaps to avoid bugs if this is copied and pasted
somewhere else).
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 3ff364065376..2a702e3a4ae6 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -495,7 +495,7 @@ static inline void tcp_rcv_rtt_measure(struct tcp_sock *tp) goto new_measure; if (before(tp->rcv_nxt, tp->rcv_rtt_est.seq)) return; - tcp_rcv_rtt_update(tp, jiffies - tp->rcv_rtt_est.time, 1); + tcp_rcv_rtt_update(tp, tcp_time_stamp - tp->rcv_rtt_est.time, 1); new_measure: tp->rcv_rtt_est.seq = tp->rcv_nxt + tp->rcv_wnd; |