aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ccids/ccid3.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/ccids/ccid3.h')
-rw-r--r--net/dccp/ccids/ccid3.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h
index 0c4fadd85f94..72e110a1100f 100644
--- a/net/dccp/ccids/ccid3.h
+++ b/net/dccp/ccids/ccid3.h
@@ -114,16 +114,18 @@ static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk)
114 return hctx; 114 return hctx;
115} 115}
116 116
117/* TFRC receiver states */ 117
118enum ccid3_hc_rx_states { 118enum ccid3_fback_type {
119 TFRC_RSTATE_NO_DATA = 1, 119 CCID3_FBACK_NONE = 0,
120 TFRC_RSTATE_DATA, 120 CCID3_FBACK_INITIAL,
121 CCID3_FBACK_PERIODIC,
122 CCID3_FBACK_PARAM_CHANGE
121}; 123};
122 124
123/** struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket 125/** struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket
124 * 126 *
125 * @last_counter - Tracks window counter (RFC 4342, 8.1) 127 * @last_counter - Tracks window counter (RFC 4342, 8.1)
126 * @state - Receiver state, one of %ccid3_hc_rx_states 128 * @feedback - The type of the feedback last sent
127 * @x_recv - Receiver estimate of send rate (RFC 3448, sec. 4.3) 129 * @x_recv - Receiver estimate of send rate (RFC 3448, sec. 4.3)
128 * @rtt - Receiver estimate of RTT 130 * @rtt - Receiver estimate of RTT
129 * @tstamp_last_feedback - Time at which last feedback was sent 131 * @tstamp_last_feedback - Time at which last feedback was sent
@@ -133,7 +135,7 @@ enum ccid3_hc_rx_states {
133 */ 135 */
134struct ccid3_hc_rx_sock { 136struct ccid3_hc_rx_sock {
135 u8 last_counter:4; 137 u8 last_counter:4;
136 enum ccid3_hc_rx_states state:8; 138 enum ccid3_fback_type feedback:4;
137 u32 x_recv; 139 u32 x_recv;
138 u32 rtt; 140 u32 rtt;
139 ktime_t tstamp_last_feedback; 141 ktime_t tstamp_last_feedback;