diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-08 05:48:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 05:48:30 -0400 |
| commit | 22f6dacdfcfdc792d068e9c41234808860498d04 (patch) | |
| tree | 281a7d476f256ea3e2f800177ba685b169cc0540 /net/ipv4 | |
| parent | 928f308f556f4943e50c5064b546f47bce301f02 (diff) | |
| parent | 9b05126baa146fc3f41360164141d4e1b3ea93c4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/net/tcp.h
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_input.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 56dcf97a97fb..eeb8a92aa416 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -597,16 +597,6 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb) | |||
| 597 | tcp_grow_window(sk, skb); | 597 | tcp_grow_window(sk, skb); |
| 598 | } | 598 | } |
| 599 | 599 | ||
| 600 | static u32 tcp_rto_min(struct sock *sk) | ||
| 601 | { | ||
| 602 | struct dst_entry *dst = __sk_dst_get(sk); | ||
| 603 | u32 rto_min = TCP_RTO_MIN; | ||
| 604 | |||
| 605 | if (dst && dst_metric_locked(dst, RTAX_RTO_MIN)) | ||
| 606 | rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN); | ||
| 607 | return rto_min; | ||
| 608 | } | ||
| 609 | |||
| 610 | /* Called to compute a smoothed rtt estimate. The data fed to this | 600 | /* Called to compute a smoothed rtt estimate. The data fed to this |
| 611 | * routine either comes from timestamps, or from segments that were | 601 | * routine either comes from timestamps, or from segments that were |
| 612 | * known _not_ to have been retransmitted [see Karn/Partridge | 602 | * known _not_ to have been retransmitted [see Karn/Partridge |