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

b21010ed · Linus Torvalds · b1330031 · 5c127c58 · b21010ed
Commit b21010ed authored Sep 04, 2007 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

net/ipv4/tcp_input.c net/ipv4/tcp_input.c +1 -1

No files found.
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -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;
 }