diff options
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 1bc87a05c734..51966b3f9719 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2301,7 +2301,7 @@ static inline int tcp_dupack_heuristics(struct tcp_sock *tp) | |||
2301 | 2301 | ||
2302 | static inline int tcp_skb_timedout(struct sock *sk, struct sk_buff *skb) | 2302 | static inline int tcp_skb_timedout(struct sock *sk, struct sk_buff *skb) |
2303 | { | 2303 | { |
2304 | return (tcp_time_stamp - TCP_SKB_CB(skb)->when > inet_csk(sk)->icsk_rto); | 2304 | return tcp_time_stamp - TCP_SKB_CB(skb)->when > inet_csk(sk)->icsk_rto; |
2305 | } | 2305 | } |
2306 | 2306 | ||
2307 | static inline int tcp_head_timedout(struct sock *sk) | 2307 | static inline int tcp_head_timedout(struct sock *sk) |
@@ -3398,8 +3398,8 @@ static void tcp_ack_probe(struct sock *sk) | |||
3398 | 3398 | ||
3399 | static inline int tcp_ack_is_dubious(const struct sock *sk, const int flag) | 3399 | static inline int tcp_ack_is_dubious(const struct sock *sk, const int flag) |
3400 | { | 3400 | { |
3401 | return (!(flag & FLAG_NOT_DUP) || (flag & FLAG_CA_ALERT) || | 3401 | return !(flag & FLAG_NOT_DUP) || (flag & FLAG_CA_ALERT) || |
3402 | inet_csk(sk)->icsk_ca_state != TCP_CA_Open); | 3402 | inet_csk(sk)->icsk_ca_state != TCP_CA_Open; |
3403 | } | 3403 | } |
3404 | 3404 | ||
3405 | static inline int tcp_may_raise_cwnd(const struct sock *sk, const int flag) | 3405 | static inline int tcp_may_raise_cwnd(const struct sock *sk, const int flag) |
@@ -3416,9 +3416,9 @@ static inline int tcp_may_update_window(const struct tcp_sock *tp, | |||
3416 | const u32 ack, const u32 ack_seq, | 3416 | const u32 ack, const u32 ack_seq, |
3417 | const u32 nwin) | 3417 | const u32 nwin) |
3418 | { | 3418 | { |
3419 | return (after(ack, tp->snd_una) || | 3419 | return after(ack, tp->snd_una) || |
3420 | after(ack_seq, tp->snd_wl1) || | 3420 | after(ack_seq, tp->snd_wl1) || |
3421 | (ack_seq == tp->snd_wl1 && nwin > tp->snd_wnd)); | 3421 | (ack_seq == tp->snd_wl1 && nwin > tp->snd_wnd); |
3422 | } | 3422 | } |
3423 | 3423 | ||
3424 | /* Update our send window. | 3424 | /* Update our send window. |