diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 21:35:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 21:35:17 -0500 |
| commit | 4259cb25d436a79bf6b07d8075423573567c211d (patch) | |
| tree | 05ae68a795315f4244036358df4c8e0f1034867d /include/linux/tfrc.h | |
| parent | cd39301a68f9604854f3543117b01dc73cbe193f (diff) | |
| parent | a49f99ffca57a2eada23b1ac908a405c17859e35 (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: (32 commits)
[NETPOLL]: Fix local_bh_enable() warning.
[IPVS]: Make ip_vs_sync.c <= 80col wide.
[IPVS]: Use msleep_interruptable() instead of ssleep() aka msleep()
[HAMRADIO]: Fix baycom_epp.c compile failure.
[DCCP]: Whitespace cleanups
[DCCP] ccid3: Fixup some type conversions related to rtts
[DCCP] ccid3: BUG-FIX - conversion errors
[DCCP] ccid3: Reorder packet history source file
[DCCP] ccid3: Reorder packet history header file
[DCCP] ccid3: Make debug output consistent
[DCCP] ccid3: Perform history operations only after packet has been sent
[DCCP] ccid3: TX history - remove unused field
[DCCP] ccid3: Shift window counter computation
[DCCP] ccid3: Sanity-check RTT samples
[DCCP] ccid3: Initialise RTT values
[DCCP] ccid: Deprecate ccid_hc_tx_insert_options
[DCCP]: Warn when discarding packet due to internal errors
[DCCP]: Only deliver to the CCID rx side in charge
[DCCP]: Simplify TFRC calculation
[DCCP]: Debug timeval operations
...
Diffstat (limited to 'include/linux/tfrc.h')
| -rw-r--r-- | include/linux/tfrc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/tfrc.h b/include/linux/tfrc.h index 31a9b25276fe..8a8462b4a4dd 100644 --- a/include/linux/tfrc.h +++ b/include/linux/tfrc.h | |||
| @@ -37,10 +37,14 @@ struct tfrc_rx_info { | |||
| 37 | * @tfrctx_p: current loss event rate (5.4) | 37 | * @tfrctx_p: current loss event rate (5.4) |
| 38 | * @tfrctx_rto: estimate of RTO, equals 4*RTT (4.3) | 38 | * @tfrctx_rto: estimate of RTO, equals 4*RTT (4.3) |
| 39 | * @tfrctx_ipi: inter-packet interval (4.6) | 39 | * @tfrctx_ipi: inter-packet interval (4.6) |
| 40 | * | ||
| 41 | * Note: X and X_recv are both maintained in units of 64 * bytes/second. This | ||
| 42 | * enables a finer resolution of sending rates and avoids problems with | ||
| 43 | * integer arithmetic; u32 is not sufficient as scaling consumes 6 bits. | ||
| 40 | */ | 44 | */ |
| 41 | struct tfrc_tx_info { | 45 | struct tfrc_tx_info { |
| 42 | __u32 tfrctx_x; | 46 | __u64 tfrctx_x; |
| 43 | __u32 tfrctx_x_recv; | 47 | __u64 tfrctx_x_recv; |
| 44 | __u32 tfrctx_x_calc; | 48 | __u32 tfrctx_x_calc; |
| 45 | __u32 tfrctx_rtt; | 49 | __u32 tfrctx_rtt; |
| 46 | __u32 tfrctx_p; | 50 | __u32 tfrctx_p; |