projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'topic/fix/misc' and 'topic/fix/asoc' into for-linus
[cascardo/linux.git]
/
net
/
ipv4
/
tcp_yeah.c
diff --git
a/net/ipv4/tcp_yeah.c
b/net/ipv4/tcp_yeah.c
index
c107fba
..
e03b101
100644
(file)
--- a/
net/ipv4/tcp_yeah.c
+++ b/
net/ipv4/tcp_yeah.c
@@
-69,8
+69,7
@@
static void tcp_yeah_pkts_acked(struct sock *sk, u32 pkts_acked, s32 rtt_us)
tcp_vegas_pkts_acked(sk, pkts_acked, rtt_us);
}
tcp_vegas_pkts_acked(sk, pkts_acked, rtt_us);
}
-static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack,
- u32 in_flight, int flag)
+static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
{
struct tcp_sock *tp = tcp_sk(sk);
struct yeah *yeah = inet_csk_ca(sk);
{
struct tcp_sock *tp = tcp_sk(sk);
struct yeah *yeah = inet_csk_ca(sk);