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

mariux64 · Sep 4, 2007 · b21010e · b21010e
2 parents b133003 + 5c127c5
commit b21010e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
 }