projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
[powerpc.git]
/
net
/
ipv4
/
tcp_highspeed.c
diff --git
a/net/ipv4/tcp_highspeed.c
b/net/ipv4/tcp_highspeed.c
index
82b3c18
..
63cf7e5
100644
(file)
--- 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,
}
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);
{
struct tcp_sock *tp = tcp_sk(sk);
struct hstcp *ca = inet_csk_ca(sk);