diff options
| author | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
| commit | 1cd6b7be92016538ea1f2a8e1f955e9b974d93ea (patch) | |
| tree | 77ca10be1da7aaf19cde95de0cb9c4bfcde636a0 /net/ipv4/tcp_output.c | |
| parent | a39427007e7ccd83dbb7cd81b18156cebeab4d1e (diff) | |
| parent | 14bf61ffe6ac54afcd1e888a4407fe16054483db (diff) | |
Merge branch 'for_linus' into for_next
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 7f18262e232..65caf8b95e1 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2019,7 +2019,7 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle, if (unlikely(!tcp_snd_wnd_test(tp, skb, mss_now))) break; - if (tso_segs == 1) { + if (tso_segs == 1 || !max_segs) { if (unlikely(!tcp_nagle_test(tp, skb, mss_now, (tcp_skb_is_last(sk, skb) ? nonagle : TCP_NAGLE_PUSH)))) @@ -2032,7 +2032,7 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle, } limit = mss_now; - if (tso_segs > 1 && !tcp_urg_mode(tp)) + if (tso_segs > 1 && max_segs && !tcp_urg_mode(tp)) limit = tcp_mss_split_point(sk, skb, mss_now, min_t(unsigned int, cwnd_quota, |