diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 17:26:26 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 17:26:26 -0800 |
commit | 42f9cabebe5915351bdba2f6f7f80e47c68e6ac8 (patch) | |
tree | ae7487319d876ce736430a97a178af557fe2a189 /net/ipv4/tcp_highspeed.c | |
parent | 976164497d6d8050403c96894ad418de44ec748f (diff) | |
parent | 9e147a1cfce5ec6308b024abe425d5b4e1884a03 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/tcp_highspeed.c')
-rw-r--r-- | net/ipv4/tcp_highspeed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_highspeed.c b/net/ipv4/tcp_highspeed.c index 82b3c189bd7..63cf7e54084 100644 --- a/net/ipv4/tcp_highspeed.c +++ b/net/ipv4/tcp_highspeed.c @@ -111,7 +111,7 @@ static void hstcp_init(struct sock *sk) } static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt, - u32 in_flight, u32 pkts_acked) + u32 in_flight, int data_acked) { struct tcp_sock *tp = tcp_sk(sk); struct hstcp *ca = inet_csk_ca(sk); |