diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 07:44:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 07:44:07 -0700 |
| commit | 2a4f739dfc59edd52eaa37d63af1bd830ea42318 (patch) | |
| tree | 962bb3b4bfc6de0b8d5f8cfd90b1bb6c5eadc338 /net/ipv4/tcp_htcp.c | |
| parent | 0bb78c3715ec9ee528d92177bc94ffcc94bed5a8 (diff) | |
| parent | 1842c4bef61f985fbec6df7150041b85d8b52b1a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[BRIDGE]: correct print message typo
[TCP] H-TCP: fix integer overflow
[TCP] cubic: scaling error
Diffstat (limited to 'net/ipv4/tcp_htcp.c')
| -rw-r--r-- | net/ipv4/tcp_htcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c index 682e7d5b6f2f..283be3cb4667 100644 --- a/net/ipv4/tcp_htcp.c +++ b/net/ipv4/tcp_htcp.c @@ -23,7 +23,7 @@ module_param(use_bandwidth_switch, int, 0644); MODULE_PARM_DESC(use_bandwidth_switch, "turn on/off bandwidth switcher"); struct htcp { - u16 alpha; /* Fixed point arith, << 7 */ + u32 alpha; /* Fixed point arith, << 7 */ u8 beta; /* Fixed point arith, << 7 */ u8 modeswitch; /* Delay modeswitch until we had at least one congestion event */ u32 last_cong; /* Time since last congestion event end */ |