diff options
Diffstat (limited to 'net/dccp/ccids/ccid3.h')
-rw-r--r-- | net/dccp/ccids/ccid3.h | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index e5a244143846..032635776653 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h | |||
@@ -75,44 +75,44 @@ enum ccid3_hc_tx_states { | |||
75 | 75 | ||
76 | /** | 76 | /** |
77 | * struct ccid3_hc_tx_sock - CCID3 sender half-connection socket | 77 | * struct ccid3_hc_tx_sock - CCID3 sender half-connection socket |
78 | * @ccid3hctx_x - Current sending rate in 64 * bytes per second | 78 | * @tx_x: Current sending rate in 64 * bytes per second |
79 | * @ccid3hctx_x_recv - Receive rate in 64 * bytes per second | 79 | * @tx_x_recv: Receive rate in 64 * bytes per second |
80 | * @ccid3hctx_x_calc - Calculated rate in bytes per second | 80 | * @tx_x_calc: Calculated rate in bytes per second |
81 | * @ccid3hctx_rtt - Estimate of current round trip time in usecs | 81 | * @tx_rtt: Estimate of current round trip time in usecs |
82 | * @ccid3hctx_p - Current loss event rate (0-1) scaled by 1000000 | 82 | * @tx_p: Current loss event rate (0-1) scaled by 1000000 |
83 | * @ccid3hctx_s - Packet size in bytes | 83 | * @tx_s: Packet size in bytes |
84 | * @ccid3hctx_t_rto - Nofeedback Timer setting in usecs | 84 | * @tx_t_rto: Nofeedback Timer setting in usecs |
85 | * @ccid3hctx_t_ipi - Interpacket (send) interval (RFC 3448, 4.6) in usecs | 85 | * @tx_t_ipi: Interpacket (send) interval (RFC 3448, 4.6) in usecs |
86 | * @ccid3hctx_state - Sender state, one of %ccid3_hc_tx_states | 86 | * @tx_state: Sender state, one of %ccid3_hc_tx_states |
87 | * @ccid3hctx_last_win_count - Last window counter sent | 87 | * @tx_last_win_count: Last window counter sent |
88 | * @ccid3hctx_t_last_win_count - Timestamp of earliest packet | 88 | * @tx_t_last_win_count: Timestamp of earliest packet |
89 | * with last_win_count value sent | 89 | * with last_win_count value sent |
90 | * @ccid3hctx_no_feedback_timer - Handle to no feedback timer | 90 | * @tx_no_feedback_timer: Handle to no feedback timer |
91 | * @ccid3hctx_t_ld - Time last doubled during slow start | 91 | * @tx_t_ld: Time last doubled during slow start |
92 | * @ccid3hctx_t_nom - Nominal send time of next packet | 92 | * @tx_t_nom: Nominal send time of next packet |
93 | * @ccid3hctx_delta - Send timer delta (RFC 3448, 4.6) in usecs | 93 | * @tx_delta: Send timer delta (RFC 3448, 4.6) in usecs |
94 | * @ccid3hctx_hist - Packet history | 94 | * @tx_hist: Packet history |
95 | * @ccid3hctx_options_received - Parsed set of retrieved options | 95 | * @tx_options_received: Parsed set of retrieved options |
96 | */ | 96 | */ |
97 | struct ccid3_hc_tx_sock { | 97 | struct ccid3_hc_tx_sock { |
98 | struct tfrc_tx_info ccid3hctx_tfrc; | 98 | struct tfrc_tx_info tx_tfrc; |
99 | #define ccid3hctx_x ccid3hctx_tfrc.tfrctx_x | 99 | #define tx_x tx_tfrc.tfrctx_x |
100 | #define ccid3hctx_x_recv ccid3hctx_tfrc.tfrctx_x_recv | 100 | #define tx_x_recv tx_tfrc.tfrctx_x_recv |
101 | #define ccid3hctx_x_calc ccid3hctx_tfrc.tfrctx_x_calc | 101 | #define tx_x_calc tx_tfrc.tfrctx_x_calc |
102 | #define ccid3hctx_rtt ccid3hctx_tfrc.tfrctx_rtt | 102 | #define tx_rtt tx_tfrc.tfrctx_rtt |
103 | #define ccid3hctx_p ccid3hctx_tfrc.tfrctx_p | 103 | #define tx_p tx_tfrc.tfrctx_p |
104 | #define ccid3hctx_t_rto ccid3hctx_tfrc.tfrctx_rto | 104 | #define tx_t_rto tx_tfrc.tfrctx_rto |
105 | #define ccid3hctx_t_ipi ccid3hctx_tfrc.tfrctx_ipi | 105 | #define tx_t_ipi tx_tfrc.tfrctx_ipi |
106 | u16 ccid3hctx_s; | 106 | u16 tx_s; |
107 | enum ccid3_hc_tx_states ccid3hctx_state:8; | 107 | enum ccid3_hc_tx_states tx_state:8; |
108 | u8 ccid3hctx_last_win_count; | 108 | u8 tx_last_win_count; |
109 | ktime_t ccid3hctx_t_last_win_count; | 109 | ktime_t tx_t_last_win_count; |
110 | struct timer_list ccid3hctx_no_feedback_timer; | 110 | struct timer_list tx_no_feedback_timer; |
111 | ktime_t ccid3hctx_t_ld; | 111 | ktime_t tx_t_ld; |
112 | ktime_t ccid3hctx_t_nom; | 112 | ktime_t tx_t_nom; |
113 | u32 ccid3hctx_delta; | 113 | u32 tx_delta; |
114 | struct tfrc_tx_hist_entry *ccid3hctx_hist; | 114 | struct tfrc_tx_hist_entry *tx_hist; |
115 | struct ccid3_options_received ccid3hctx_options_received; | 115 | struct ccid3_options_received tx_options_received; |
116 | }; | 116 | }; |
117 | 117 | ||
118 | static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk) | 118 | static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk) |
@@ -131,32 +131,32 @@ enum ccid3_hc_rx_states { | |||
131 | 131 | ||
132 | /** | 132 | /** |
133 | * struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket | 133 | * struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket |
134 | * @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448 4.3) | 134 | * @rx_x_recv: Receiver estimate of send rate (RFC 3448 4.3) |
135 | * @ccid3hcrx_rtt - Receiver estimate of rtt (non-standard) | 135 | * @rx_rtt: Receiver estimate of rtt (non-standard) |
136 | * @ccid3hcrx_p - Current loss event rate (RFC 3448 5.4) | 136 | * @rx_p: Current loss event rate (RFC 3448 5.4) |
137 | * @ccid3hcrx_last_counter - Tracks window counter (RFC 4342, 8.1) | 137 | * @rx_last_counter: Tracks window counter (RFC 4342, 8.1) |
138 | * @ccid3hcrx_state - Receiver state, one of %ccid3_hc_rx_states | 138 | * @rx_state: Receiver state, one of %ccid3_hc_rx_states |
139 | * @ccid3hcrx_bytes_recv - Total sum of DCCP payload bytes | 139 | * @rx_bytes_recv: Total sum of DCCP payload bytes |
140 | * @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448, sec. 4.3) | 140 | * @rx_x_recv: Receiver estimate of send rate (RFC 3448, sec. 4.3) |
141 | * @ccid3hcrx_rtt - Receiver estimate of RTT | 141 | * @rx_rtt: Receiver estimate of RTT |
142 | * @ccid3hcrx_tstamp_last_feedback - Time at which last feedback was sent | 142 | * @rx_tstamp_last_feedback: Time at which last feedback was sent |
143 | * @ccid3hcrx_tstamp_last_ack - Time at which last feedback was sent | 143 | * @rx_tstamp_last_ack: Time at which last feedback was sent |
144 | * @ccid3hcrx_hist - Packet history (loss detection + RTT sampling) | 144 | * @rx_hist: Packet history (loss detection + RTT sampling) |
145 | * @ccid3hcrx_li_hist - Loss Interval database | 145 | * @rx_li_hist: Loss Interval database |
146 | * @ccid3hcrx_s - Received packet size in bytes | 146 | * @rx_s: Received packet size in bytes |
147 | * @ccid3hcrx_pinv - Inverse of Loss Event Rate (RFC 4342, sec. 8.5) | 147 | * @rx_pinv: Inverse of Loss Event Rate (RFC 4342, sec. 8.5) |
148 | */ | 148 | */ |
149 | struct ccid3_hc_rx_sock { | 149 | struct ccid3_hc_rx_sock { |
150 | u8 ccid3hcrx_last_counter:4; | 150 | u8 rx_last_counter:4; |
151 | enum ccid3_hc_rx_states ccid3hcrx_state:8; | 151 | enum ccid3_hc_rx_states rx_state:8; |
152 | u32 ccid3hcrx_bytes_recv; | 152 | u32 rx_bytes_recv; |
153 | u32 ccid3hcrx_x_recv; | 153 | u32 rx_x_recv; |
154 | u32 ccid3hcrx_rtt; | 154 | u32 rx_rtt; |
155 | ktime_t ccid3hcrx_tstamp_last_feedback; | 155 | ktime_t rx_tstamp_last_feedback; |
156 | struct tfrc_rx_hist ccid3hcrx_hist; | 156 | struct tfrc_rx_hist rx_hist; |
157 | struct tfrc_loss_hist ccid3hcrx_li_hist; | 157 | struct tfrc_loss_hist rx_li_hist; |
158 | u16 ccid3hcrx_s; | 158 | u16 rx_s; |
159 | #define ccid3hcrx_pinv ccid3hcrx_li_hist.i_mean | 159 | #define rx_pinv rx_li_hist.i_mean |
160 | }; | 160 | }; |
161 | 161 | ||
162 | static inline struct ccid3_hc_rx_sock *ccid3_hc_rx_sk(const struct sock *sk) | 162 | static inline struct ccid3_hc_rx_sock *ccid3_hc_rx_sk(const struct sock *sk) |