diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 22:24:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 22:24:40 -0500 |
| commit | 83ac58ba0a26228c0b16baa2c4b821de9c4ad5ca (patch) | |
| tree | 6c8354a6314c39c5fa3f923e4095c16a5fed3d08 /net/dccp/ccids/ccid3.h | |
| parent | b4ad86bf52469b26148c677cb59d8bc81f129cc2 (diff) | |
| parent | 2bbf29acd8f7adcf161de7e5d891b4095687a59f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/dccp/ccids/ccid3.h')
| -rw-r--r-- | net/dccp/ccids/ccid3.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index 27cb20ae1da8..07596d704ef9 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h | |||
| @@ -51,8 +51,6 @@ | |||
| 51 | /* Parameter t_mbi from [RFC 3448, 4.3]: backoff interval in seconds */ | 51 | /* Parameter t_mbi from [RFC 3448, 4.3]: backoff interval in seconds */ |
| 52 | #define TFRC_T_MBI 64 | 52 | #define TFRC_T_MBI 64 |
| 53 | 53 | ||
| 54 | #define TFRC_SMALLEST_P 40 | ||
| 55 | |||
| 56 | enum ccid3_options { | 54 | enum ccid3_options { |
| 57 | TFRC_OPT_LOSS_EVENT_RATE = 192, | 55 | TFRC_OPT_LOSS_EVENT_RATE = 192, |
| 58 | TFRC_OPT_LOSS_INTERVALS = 193, | 56 | TFRC_OPT_LOSS_INTERVALS = 193, |