From: Jerry Chu <hkchu@xxxxxxxxxx>
Date: Thu, 30 Sep 2010 20:27:05 -0700
> In tcp_write_timeout():
>
> if (retransmits_timed_out(sk, retry_until,
> (1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV) ? 0 :
> icsk->icsk_user_timeout, syn_set)) {
>
> should be simplified to
>
> if (retransmits_timed_out(sk, retry_until,
> syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
I've merged net-2.6 into net-next-2.6 and integrated this simplification
while doing so.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
