diff options
| author | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 22:03:52 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 22:03:52 -0400 |
| commit | 1aedf2ccc60fade26c46fae12e28664d0da3f199 (patch) | |
| tree | d91083e3079f1ddb942a382ac2b5a7525570ad59 /net/ipv4/tcp_cubic.c | |
| parent | dfdc58ba354adb80d67c99f7be84f95a8e02e466 (diff) | |
| parent | 1ab9dd0902df4f4ff56fbf672220549090ab28ba (diff) | |
Merge mulgrave-w:git/linux-2.6
Conflicts:
include/linux/blkdev.h
Trivial merge to incorporate tag prototypes.
Diffstat (limited to 'net/ipv4/tcp_cubic.c')
| -rw-r--r-- | net/ipv4/tcp_cubic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c index 2be27980ca78..a60ef38d75c6 100644 --- a/net/ipv4/tcp_cubic.c +++ b/net/ipv4/tcp_cubic.c | |||
| @@ -358,7 +358,7 @@ static struct tcp_congestion_ops cubictcp = { | |||
| 358 | 358 | ||
| 359 | static int __init cubictcp_register(void) | 359 | static int __init cubictcp_register(void) |
| 360 | { | 360 | { |
| 361 | BUG_ON(sizeof(struct bictcp) > ICSK_CA_PRIV_SIZE); | 361 | BUILD_BUG_ON(sizeof(struct bictcp) > ICSK_CA_PRIV_SIZE); |
| 362 | 362 | ||
| 363 | /* Precompute a bunch of the scaling factors that are used per-packet | 363 | /* Precompute a bunch of the scaling factors that are used per-packet |
| 364 | * based on SRTT of 100ms | 364 | * based on SRTT of 100ms |