diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 04:04:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 04:04:43 -0400 |
| commit | b21010ed6498391c0f359f2a89c907533fe07fec (patch) | |
| tree | a16675e4fed6f78c34bc4f2a433911baeb43b0d4 | |
| parent | b1330031b76bf1c9dc23635e016625aa9edc069a (diff) | |
| parent | 5c127c58ae9bf196d787815b1bd6b0aec5aee816 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 1ee72127462b..bbad2cdb74b7 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -560,7 +560,7 @@ static u32 tcp_rto_min(struct sock *sk) | |||
| 560 | struct dst_entry *dst = __sk_dst_get(sk); | 560 | struct dst_entry *dst = __sk_dst_get(sk); |
| 561 | u32 rto_min = TCP_RTO_MIN; | 561 | u32 rto_min = TCP_RTO_MIN; |
| 562 | 562 | ||
| 563 | if (dst_metric_locked(dst, RTAX_RTO_MIN)) | 563 | if (dst && dst_metric_locked(dst, RTAX_RTO_MIN)) |
| 564 | rto_min = dst->metrics[RTAX_RTO_MIN-1]; | 564 | rto_min = dst->metrics[RTAX_RTO_MIN-1]; |
| 565 | return rto_min; | 565 | return rto_min; |
| 566 | } | 566 | } |