Hi all,
Today's linux-next merge of the tip tree got a conflict in
net/ipv4/tcp_output.c between commit e114a710aa50 ("tcp: fix cwnd limited
checking to improve congestion control") from the tree and commit
4e857c58efeb ("arch: Mass conversion of smp_mb__*()") from the tip tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc net/ipv4/tcp_output.c index 694711a140d4,366cf06587b8..000000000000 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@@ -1946,18 -1930,10 +1946,16 @@@ static bool tcp_write_xmit(struct sock /* It is possible TX completion already happened * before we set TSQ_THROTTLED, so we must * test again the condition. - * We abuse smp_mb__after_clear_bit() because - * there is no smp_mb__after_set_bit() yet */ - smp_mb__after_clear_bit(); + smp_mb__after_atomic(); - if (atomic_read(&sk->sk_wmem_alloc) > limit) + if (atomic_read(&sk->sk_wmem_alloc) > limit) { + u32 unsent_bytes; + +compute_unsent_segs: + unsent_bytes = tp->write_seq - tp->snd_nxt; + unsent_segs = DIV_ROUND_UP(unsent_bytes, mss_now); break; + } } limit = mss_now;
pgpmpZrXCzi4s.pgp
Description: PGP signature
