diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2009-09-12 03:47:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-14 20:02:54 -0400 |
commit | aa1b1ff0991b469eca6fde4456190df6ed59ff40 (patch) | |
tree | d2fc84d3e83dd121fd4a48c8560b212123688eb4 /net/dccp/ccids/ccid3.h | |
parent | d136f1bd366fdb7e747ca7e0218171e7a00a98a5 (diff) |
net-next-2.6 [PATCH 1/1] dccp: ccids whitespace-cleanup / CodingStyle
No code change, cosmetical changes only:
* whitespace cleanup via scripts/cleanfile,
* remove self-references to filename at top of files,
* fix coding style (extraneous brackets),
* fix documentation style (kernel-doc-nano-HOWTO).
Thanks are due to Ivo Augusto Calado who raised these issues by
submitting good-quality patches.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ccids/ccid3.h')
-rw-r--r-- | net/dccp/ccids/ccid3.h | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index 49ca32bd7e79..e5a244143846 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * net/dccp/ccids/ccid3.h | ||
3 | * | ||
4 | * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. | 2 | * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. |
5 | * Copyright (c) 2007 The University of Aberdeen, Scotland, UK | 3 | * Copyright (c) 2007 The University of Aberdeen, Scotland, UK |
6 | * | 4 | * |
@@ -75,8 +73,8 @@ enum ccid3_hc_tx_states { | |||
75 | TFRC_SSTATE_TERM, | 73 | TFRC_SSTATE_TERM, |
76 | }; | 74 | }; |
77 | 75 | ||
78 | /** struct ccid3_hc_tx_sock - CCID3 sender half-connection socket | 76 | /** |
79 | * | 77 | * struct ccid3_hc_tx_sock - CCID3 sender half-connection socket |
80 | * @ccid3hctx_x - Current sending rate in 64 * bytes per second | 78 | * @ccid3hctx_x - Current sending rate in 64 * bytes per second |
81 | * @ccid3hctx_x_recv - Receive rate in 64 * bytes per second | 79 | * @ccid3hctx_x_recv - Receive rate in 64 * bytes per second |
82 | * @ccid3hctx_x_calc - Calculated rate in bytes per second | 80 | * @ccid3hctx_x_calc - Calculated rate in bytes per second |
@@ -119,9 +117,9 @@ struct ccid3_hc_tx_sock { | |||
119 | 117 | ||
120 | 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) |
121 | { | 119 | { |
122 | struct ccid3_hc_tx_sock *hctx = ccid_priv(dccp_sk(sk)->dccps_hc_tx_ccid); | 120 | struct ccid3_hc_tx_sock *hctx = ccid_priv(dccp_sk(sk)->dccps_hc_tx_ccid); |
123 | BUG_ON(hctx == NULL); | 121 | BUG_ON(hctx == NULL); |
124 | return hctx; | 122 | return hctx; |
125 | } | 123 | } |
126 | 124 | ||
127 | /* TFRC receiver states */ | 125 | /* TFRC receiver states */ |
@@ -131,22 +129,22 @@ enum ccid3_hc_rx_states { | |||
131 | TFRC_RSTATE_TERM = 127, | 129 | TFRC_RSTATE_TERM = 127, |
132 | }; | 130 | }; |
133 | 131 | ||
134 | /** struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket | 132 | /** |
135 | * | 133 | * struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket |
136 | * @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448 4.3) | 134 | * @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448 4.3) |
137 | * @ccid3hcrx_rtt - Receiver estimate of rtt (non-standard) | 135 | * @ccid3hcrx_rtt - Receiver estimate of rtt (non-standard) |
138 | * @ccid3hcrx_p - Current loss event rate (RFC 3448 5.4) | 136 | * @ccid3hcrx_p - Current loss event rate (RFC 3448 5.4) |
139 | * @ccid3hcrx_last_counter - Tracks window counter (RFC 4342, 8.1) | 137 | * @ccid3hcrx_last_counter - Tracks window counter (RFC 4342, 8.1) |
140 | * @ccid3hcrx_state - Receiver state, one of %ccid3_hc_rx_states | 138 | * @ccid3hcrx_state - Receiver state, one of %ccid3_hc_rx_states |
141 | * @ccid3hcrx_bytes_recv - Total sum of DCCP payload bytes | 139 | * @ccid3hcrx_bytes_recv - Total sum of DCCP payload bytes |
142 | * @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448, sec. 4.3) | 140 | * @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448, sec. 4.3) |
143 | * @ccid3hcrx_rtt - Receiver estimate of RTT | 141 | * @ccid3hcrx_rtt - Receiver estimate of RTT |
144 | * @ccid3hcrx_tstamp_last_feedback - Time at which last feedback was sent | 142 | * @ccid3hcrx_tstamp_last_feedback - Time at which last feedback was sent |
145 | * @ccid3hcrx_tstamp_last_ack - Time at which last feedback was sent | 143 | * @ccid3hcrx_tstamp_last_ack - Time at which last feedback was sent |
146 | * @ccid3hcrx_hist - Packet history (loss detection + RTT sampling) | 144 | * @ccid3hcrx_hist - Packet history (loss detection + RTT sampling) |
147 | * @ccid3hcrx_li_hist - Loss Interval database | 145 | * @ccid3hcrx_li_hist - Loss Interval database |
148 | * @ccid3hcrx_s - Received packet size in bytes | 146 | * @ccid3hcrx_s - Received packet size in bytes |
149 | * @ccid3hcrx_pinv - Inverse of Loss Event Rate (RFC 4342, sec. 8.5) | 147 | * @ccid3hcrx_pinv - Inverse of Loss Event Rate (RFC 4342, sec. 8.5) |
150 | */ | 148 | */ |
151 | struct ccid3_hc_rx_sock { | 149 | struct ccid3_hc_rx_sock { |
152 | u8 ccid3hcrx_last_counter:4; | 150 | u8 ccid3hcrx_last_counter:4; |
@@ -163,9 +161,9 @@ struct ccid3_hc_rx_sock { | |||
163 | 161 | ||
164 | 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) |
165 | { | 163 | { |
166 | struct ccid3_hc_rx_sock *hcrx = ccid_priv(dccp_sk(sk)->dccps_hc_rx_ccid); | 164 | struct ccid3_hc_rx_sock *hcrx = ccid_priv(dccp_sk(sk)->dccps_hc_rx_ccid); |
167 | BUG_ON(hcrx == NULL); | 165 | BUG_ON(hcrx == NULL); |
168 | return hcrx; | 166 | return hcrx; |
169 | } | 167 | } |
170 | 168 | ||
171 | #endif /* _DCCP_CCID3_H_ */ | 169 | #endif /* _DCCP_CCID3_H_ */ |