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
gre: Fix MTU calculation for bound GRE tunnels
[pandora-kernel.git]
/
net
/
ipv4
/
tcp_illinois.c
diff --git
a/net/ipv4/tcp_illinois.c
b/net/ipv4/tcp_illinois.c
index
cc5de6f
..
1eba160
100644
(file)
--- a/
net/ipv4/tcp_illinois.c
+++ b/
net/ipv4/tcp_illinois.c
@@
-83,18
+83,16
@@
static void tcp_illinois_init(struct sock *sk)
}
/* Measure RTT for each ack. */
}
/* Measure RTT for each ack. */
-static void tcp_illinois_acked(struct sock *sk, u32 pkts_acked,
ktime_t las
t)
+static void tcp_illinois_acked(struct sock *sk, u32 pkts_acked,
s32 rt
t)
{
struct illinois *ca = inet_csk_ca(sk);
{
struct illinois *ca = inet_csk_ca(sk);
- u32 rtt;
ca->acked = pkts_acked;
ca->acked = pkts_acked;
- if (ktime_equal(last, net_invalid_timestamp()))
+ /* dup ack, no rtt sample */
+ if (rtt < 0)
return;
return;
- rtt = ktime_to_us(net_timedelta(last));
-
/* ignore bogus values, this prevents wraparound in alpha math */
if (rtt > RTT_MAX)
rtt = RTT_MAX;
/* ignore bogus values, this prevents wraparound in alpha math */
if (rtt > RTT_MAX)
rtt = RTT_MAX;
@@
-258,8
+256,7
@@
static void tcp_illinois_state(struct sock *sk, u8 new_state)
/*
* Increase window in response to successful acknowledgment.
*/
/*
* Increase window in response to successful acknowledgment.
*/
-static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack,
- u32 in_flight, int flag)
+static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
{
struct tcp_sock *tp = tcp_sk(sk);
struct illinois *ca = inet_csk_ca(sk);
{
struct tcp_sock *tp = tcp_sk(sk);
struct illinois *ca = inet_csk_ca(sk);
@@
-300,7
+297,7
@@
static u32 tcp_illinois_ssthresh(struct sock *sk)
struct illinois *ca = inet_csk_ca(sk);
/* Multiplicative decrease */
struct illinois *ca = inet_csk_ca(sk);
/* Multiplicative decrease */
- return max(
(tp->snd_cwnd * ca->beta) >> BETA_SHIFT
, 2U);
+ return max(
tp->snd_cwnd - ((tp->snd_cwnd * ca->beta) >> BETA_SHIFT)
, 2U);
}
}