diff options
author | James Morris <jmorris@namei.org> | 2007-03-04 19:12:44 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:23:32 -0400 |
commit | 9d729f72dca9406025bcfa9c1f660d71d9ef0ff5 (patch) | |
tree | 69a3ca50c6e266853676a545a113f13f254ae535 /net/ipv4/tcp_input.c | |
parent | 39df232f1a9ba48d41c68ee7d4046756e709cf91 (diff) |
[NET]: Convert xtime.tv_sec to get_seconds()
Where appropriate, convert references to xtime.tv_sec to the
get_seconds() helper function.
Signed-off-by: James Morris <jmorris@namei.org>
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d894bbcc1d24..d0a3630f41a7 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2933,7 +2933,7 @@ static int tcp_fast_parse_options(struct sk_buff *skb, struct tcphdr *th, | |||
2933 | static inline void tcp_store_ts_recent(struct tcp_sock *tp) | 2933 | static inline void tcp_store_ts_recent(struct tcp_sock *tp) |
2934 | { | 2934 | { |
2935 | tp->rx_opt.ts_recent = tp->rx_opt.rcv_tsval; | 2935 | tp->rx_opt.ts_recent = tp->rx_opt.rcv_tsval; |
2936 | tp->rx_opt.ts_recent_stamp = xtime.tv_sec; | 2936 | tp->rx_opt.ts_recent_stamp = get_seconds(); |
2937 | } | 2937 | } |
2938 | 2938 | ||
2939 | static inline void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq) | 2939 | static inline void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq) |
@@ -2947,7 +2947,7 @@ static inline void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq) | |||
2947 | */ | 2947 | */ |
2948 | 2948 | ||
2949 | if((s32)(tp->rx_opt.rcv_tsval - tp->rx_opt.ts_recent) >= 0 || | 2949 | if((s32)(tp->rx_opt.rcv_tsval - tp->rx_opt.ts_recent) >= 0 || |
2950 | xtime.tv_sec >= tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS) | 2950 | get_seconds() >= tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS) |
2951 | tcp_store_ts_recent(tp); | 2951 | tcp_store_ts_recent(tp); |
2952 | } | 2952 | } |
2953 | } | 2953 | } |
@@ -2999,7 +2999,7 @@ static inline int tcp_paws_discard(const struct sock *sk, const struct sk_buff * | |||
2999 | { | 2999 | { |
3000 | const struct tcp_sock *tp = tcp_sk(sk); | 3000 | const struct tcp_sock *tp = tcp_sk(sk); |
3001 | return ((s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) > TCP_PAWS_WINDOW && | 3001 | return ((s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) > TCP_PAWS_WINDOW && |
3002 | xtime.tv_sec < tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS && | 3002 | get_seconds() < tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS && |
3003 | !tcp_disordered_ack(sk, skb)); | 3003 | !tcp_disordered_ack(sk, skb)); |
3004 | } | 3004 | } |
3005 | 3005 | ||