diff options
author | 2017-02-02 16:54:00 -0500 | |
---|---|---|
committer | 2017-02-02 16:54:00 -0500 | |
commit | e2160156bf2a7d5018e99a9993fbcdda0abac09b (patch) | |
tree | 1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /net/ipv4/tcp_output.c | |
parent | net: phy: broadcom: rehook BCM54612E specific init (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-e2160156bf2a7d5018e99a9993fbcdda0abac09b.tar.gz linux-e2160156bf2a7d5018e99a9993fbcdda0abac09b.tar.bz2 linux-e2160156bf2a7d5018e99a9993fbcdda0abac09b.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 7b2d8762f15f..6d5bab8a3ea6 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2515,9 +2515,11 @@ u32 __tcp_select_window(struct sock *sk) int full_space = min_t(int, tp->window_clamp, allowed_space); int window; - if (mss > full_space) + if (unlikely(mss > full_space)) { mss = full_space; - + if (mss <= 0) + return 0; + } if (free_space < (full_space >> 1)) { icsk->icsk_ack.quick = 0; |