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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
net
/
ipv4
/
tcp_hybla.c
diff --git
a/net/ipv4/tcp_hybla.c
b/net/ipv4/tcp_hybla.c
index
44618b6
..
bfcbd14
100644
(file)
--- a/
net/ipv4/tcp_hybla.c
+++ b/
net/ipv4/tcp_hybla.c
@@
-101,8
+101,10
@@
static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
if (!tcp_is_cwnd_limited(sk, in_flight))
return;
- if (!ca->hybla_en)
- return tcp_reno_cong_avoid(sk, ack, in_flight);
+ if (!ca->hybla_en) {
+ tcp_reno_cong_avoid(sk, ack, in_flight);
+ return;
+ }
if (ca->rho == 0)
hybla_recalc_param(sk);