git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
net
/
ipv4
/
tcp_westwood.c
diff --git
a/net/ipv4/tcp_westwood.c
b/net/ipv4/tcp_westwood.c
index
e61e09d
..
20151d6
100644
(file)
--- a/
net/ipv4/tcp_westwood.c
+++ b/
net/ipv4/tcp_westwood.c
@@
-100,11
+100,12
@@
static void westwood_filter(struct westwood *w, u32 delta)
* Called after processing group of packets.
* but all westwood needs is the last sample of srtt.
*/
* Called after processing group of packets.
* but all westwood needs is the last sample of srtt.
*/
-static void tcp_westwood_pkts_acked(struct sock *sk, u32 cnt,
ktime_t las
t)
+static void tcp_westwood_pkts_acked(struct sock *sk, u32 cnt,
s32 rt
t)
{
struct westwood *w = inet_csk_ca(sk);
{
struct westwood *w = inet_csk_ca(sk);
- if (cnt > 0)
- w->rtt = tcp_sk(sk)->srtt >> 3;
+
+ if (rtt > 0)
+ w->rtt = usecs_to_jiffies(rtt);
}
/*
}
/*