diff options
Diffstat (limited to 'net/dccp/ccids/ccid3.h')
-rw-r--r-- | net/dccp/ccids/ccid3.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index 3e3a9cc69b10..15776a88c090 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h | |||
@@ -77,7 +77,7 @@ struct ccid3_options_received { | |||
77 | 77 | ||
78 | /* TFRC sender states */ | 78 | /* TFRC sender states */ |
79 | enum ccid3_hc_tx_states { | 79 | enum ccid3_hc_tx_states { |
80 | TFRC_SSTATE_NO_SENT = 1, | 80 | TFRC_SSTATE_NO_SENT = 1, |
81 | TFRC_SSTATE_NO_FBACK, | 81 | TFRC_SSTATE_NO_FBACK, |
82 | TFRC_SSTATE_FBACK, | 82 | TFRC_SSTATE_FBACK, |
83 | TFRC_SSTATE_TERM, | 83 | TFRC_SSTATE_TERM, |
@@ -96,7 +96,7 @@ enum ccid3_hc_tx_states { | |||
96 | * @ccid3hctx_state - Sender state, one of %ccid3_hc_tx_states | 96 | * @ccid3hctx_state - Sender state, one of %ccid3_hc_tx_states |
97 | * @ccid3hctx_last_win_count - Last window counter sent | 97 | * @ccid3hctx_last_win_count - Last window counter sent |
98 | * @ccid3hctx_t_last_win_count - Timestamp of earliest packet | 98 | * @ccid3hctx_t_last_win_count - Timestamp of earliest packet |
99 | * with last_win_count value sent | 99 | * with last_win_count value sent |
100 | * @ccid3hctx_no_feedback_timer - Handle to no feedback timer | 100 | * @ccid3hctx_no_feedback_timer - Handle to no feedback timer |
101 | * @ccid3hctx_idle - Flag indicating that sender is idling | 101 | * @ccid3hctx_idle - Flag indicating that sender is idling |
102 | * @ccid3hctx_t_ld - Time last doubled during slow start | 102 | * @ccid3hctx_t_ld - Time last doubled during slow start |
@@ -115,7 +115,7 @@ struct ccid3_hc_tx_sock { | |||
115 | #define ccid3hctx_t_rto ccid3hctx_tfrc.tfrctx_rto | 115 | #define ccid3hctx_t_rto ccid3hctx_tfrc.tfrctx_rto |
116 | #define ccid3hctx_t_ipi ccid3hctx_tfrc.tfrctx_ipi | 116 | #define ccid3hctx_t_ipi ccid3hctx_tfrc.tfrctx_ipi |
117 | u16 ccid3hctx_s; | 117 | u16 ccid3hctx_s; |
118 | enum ccid3_hc_tx_states ccid3hctx_state:8; | 118 | enum ccid3_hc_tx_states ccid3hctx_state:8; |
119 | u8 ccid3hctx_last_win_count; | 119 | u8 ccid3hctx_last_win_count; |
120 | u8 ccid3hctx_idle; | 120 | u8 ccid3hctx_idle; |
121 | struct timeval ccid3hctx_t_last_win_count; | 121 | struct timeval ccid3hctx_t_last_win_count; |
@@ -129,7 +129,7 @@ struct ccid3_hc_tx_sock { | |||
129 | 129 | ||
130 | /* TFRC receiver states */ | 130 | /* TFRC receiver states */ |
131 | enum ccid3_hc_rx_states { | 131 | enum ccid3_hc_rx_states { |
132 | TFRC_RSTATE_NO_DATA = 1, | 132 | TFRC_RSTATE_NO_DATA = 1, |
133 | TFRC_RSTATE_DATA, | 133 | TFRC_RSTATE_DATA, |
134 | TFRC_RSTATE_TERM = 127, | 134 | TFRC_RSTATE_TERM = 127, |
135 | }; | 135 | }; |
@@ -157,18 +157,18 @@ struct ccid3_hc_rx_sock { | |||
157 | #define ccid3hcrx_x_recv ccid3hcrx_tfrc.tfrcrx_x_recv | 157 | #define ccid3hcrx_x_recv ccid3hcrx_tfrc.tfrcrx_x_recv |
158 | #define ccid3hcrx_rtt ccid3hcrx_tfrc.tfrcrx_rtt | 158 | #define ccid3hcrx_rtt ccid3hcrx_tfrc.tfrcrx_rtt |
159 | #define ccid3hcrx_p ccid3hcrx_tfrc.tfrcrx_p | 159 | #define ccid3hcrx_p ccid3hcrx_tfrc.tfrcrx_p |
160 | u64 ccid3hcrx_seqno_nonloss:48, | 160 | u64 ccid3hcrx_seqno_nonloss:48, |
161 | ccid3hcrx_ccval_nonloss:4, | 161 | ccid3hcrx_ccval_nonloss:4, |
162 | ccid3hcrx_ccval_last_counter:4; | 162 | ccid3hcrx_ccval_last_counter:4; |
163 | enum ccid3_hc_rx_states ccid3hcrx_state:8; | 163 | enum ccid3_hc_rx_states ccid3hcrx_state:8; |
164 | u32 ccid3hcrx_bytes_recv; | 164 | u32 ccid3hcrx_bytes_recv; |
165 | struct timeval ccid3hcrx_tstamp_last_feedback; | 165 | struct timeval ccid3hcrx_tstamp_last_feedback; |
166 | struct timeval ccid3hcrx_tstamp_last_ack; | 166 | struct timeval ccid3hcrx_tstamp_last_ack; |
167 | struct list_head ccid3hcrx_hist; | 167 | struct list_head ccid3hcrx_hist; |
168 | struct list_head ccid3hcrx_li_hist; | 168 | struct list_head ccid3hcrx_li_hist; |
169 | u16 ccid3hcrx_s; | 169 | u16 ccid3hcrx_s; |
170 | u32 ccid3hcrx_pinv; | 170 | u32 ccid3hcrx_pinv; |
171 | u32 ccid3hcrx_elapsed_time; | 171 | u32 ccid3hcrx_elapsed_time; |
172 | }; | 172 | }; |
173 | 173 | ||
174 | static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk) | 174 | static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk) |