| commit | b21010ed6498391c0f359f2a89c907533fe07fec | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 04 01:04:43 2007 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 04 01:04:43 2007 -0700 |
| tree | a16675e4fed6f78c34bc4f2a433911baeb43b0d4 | |
| parent | b1330031b76bf1c9dc23635e016625aa9edc069a [diff] | |
| parent | 5c127c58ae9bf196d787815b1bd6b0aec5aee816 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 1ee7212..bbad2cd 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c
@@ -560,7 +560,7 @@ 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; }