Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b21010ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents b1330031 5c127c58

net/ipv4/tcp_input.c

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ static u32 tcp_rto_min(struct sock *sk) 
	struct dst_entry *dst = __sk_dst_get(sk);

	u32 rto_min = TCP_RTO_MIN;



	if (dst_metric_locked(dst, RTAX_RTO_MIN))

	if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))

		rto_min = dst->metrics[RTAX_RTO_MIN-1];

	return rto_min;

}