diff options
Diffstat (limited to 'net/dccp/ccids/ccid3.h')
-rw-r--r-- | net/dccp/ccids/ccid3.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index e9f6ff4f0552..49ca32bd7e79 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h | |||
@@ -139,6 +139,8 @@ enum ccid3_hc_rx_states { | |||
139 | * @ccid3hcrx_last_counter - Tracks window counter (RFC 4342, 8.1) | 139 | * @ccid3hcrx_last_counter - Tracks window counter (RFC 4342, 8.1) |
140 | * @ccid3hcrx_state - Receiver state, one of %ccid3_hc_rx_states | 140 | * @ccid3hcrx_state - Receiver state, one of %ccid3_hc_rx_states |
141 | * @ccid3hcrx_bytes_recv - Total sum of DCCP payload bytes | 141 | * @ccid3hcrx_bytes_recv - Total sum of DCCP payload bytes |
142 | * @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448, sec. 4.3) | ||
143 | * @ccid3hcrx_rtt - Receiver estimate of RTT | ||
142 | * @ccid3hcrx_tstamp_last_feedback - Time at which last feedback was sent | 144 | * @ccid3hcrx_tstamp_last_feedback - Time at which last feedback was sent |
143 | * @ccid3hcrx_tstamp_last_ack - Time at which last feedback was sent | 145 | * @ccid3hcrx_tstamp_last_ack - Time at which last feedback was sent |
144 | * @ccid3hcrx_hist - Packet history (loss detection + RTT sampling) | 146 | * @ccid3hcrx_hist - Packet history (loss detection + RTT sampling) |
@@ -147,13 +149,11 @@ enum ccid3_hc_rx_states { | |||
147 | * @ccid3hcrx_pinv - Inverse of Loss Event Rate (RFC 4342, sec. 8.5) | 149 | * @ccid3hcrx_pinv - Inverse of Loss Event Rate (RFC 4342, sec. 8.5) |
148 | */ | 150 | */ |
149 | struct ccid3_hc_rx_sock { | 151 | struct ccid3_hc_rx_sock { |
150 | struct tfrc_rx_info ccid3hcrx_tfrc; | ||
151 | #define ccid3hcrx_x_recv ccid3hcrx_tfrc.tfrcrx_x_recv | ||
152 | #define ccid3hcrx_rtt ccid3hcrx_tfrc.tfrcrx_rtt | ||
153 | #define ccid3hcrx_p ccid3hcrx_tfrc.tfrcrx_p | ||
154 | u8 ccid3hcrx_last_counter:4; | 152 | u8 ccid3hcrx_last_counter:4; |
155 | enum ccid3_hc_rx_states ccid3hcrx_state:8; | 153 | enum ccid3_hc_rx_states ccid3hcrx_state:8; |
156 | u32 ccid3hcrx_bytes_recv; | 154 | u32 ccid3hcrx_bytes_recv; |
155 | u32 ccid3hcrx_x_recv; | ||
156 | u32 ccid3hcrx_rtt; | ||
157 | ktime_t ccid3hcrx_tstamp_last_feedback; | 157 | ktime_t ccid3hcrx_tstamp_last_feedback; |
158 | struct tfrc_rx_hist ccid3hcrx_hist; | 158 | struct tfrc_rx_hist ccid3hcrx_hist; |
159 | struct tfrc_loss_hist ccid3hcrx_li_hist; | 159 | struct tfrc_loss_hist ccid3hcrx_li_hist; |