git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[sfrench/cifs-2.6.git]
/
net
/
ipv4
/
tcp_hybla.c
diff --git
a/net/ipv4/tcp_hybla.c
b/net/ipv4/tcp_hybla.c
index 7406e0c5fb8e45d85a18bc956accd781221944d0..59e691d26f64e805f282392a3b978804bef719e7 100644
(file)
--- a/
net/ipv4/tcp_hybla.c
+++ b/
net/ipv4/tcp_hybla.c
@@
-170,7
+170,7
@@
static struct tcp_congestion_ops tcp_hybla = {
static int __init hybla_register(void)
{
- BUG_ON(sizeof(struct hybla) > ICSK_CA_PRIV_SIZE);
+ BU
ILD_BU
G_ON(sizeof(struct hybla) > ICSK_CA_PRIV_SIZE);
return tcp_register_congestion_control(&tcp_hybla);
}