aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/tcp.h
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2006-11-27 22:12:38 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:30:54 -0500
commit3a137d2065571864be0301b9ebd72ddb01060997 (patch)
tree43fba0c36b40245ff7b528cc6fec9137a87835e7 /include/linux/tcp.h
parent2ff52f282cf287d60e9eda1f3b5ec83e00a86130 (diff)
[TCP]: Renove the __ prefix on the struct tcp_sock members
As this struct is not userland visible at all. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'include/linux/tcp.h')
-rw-r--r--include/linux/tcp.h156
1 files changed, 78 insertions, 78 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index b42ff0efc2df..3cc70d1a3504 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -185,17 +185,17 @@ struct tcp_sack_block_wire {
185}; 185};
186 186
187struct tcp_sack_block { 187struct tcp_sack_block {
188 __u32 start_seq; 188 u32 start_seq;
189 __u32 end_seq; 189 u32 end_seq;
190}; 190};
191 191
192struct tcp_options_received { 192struct tcp_options_received {
193/* PAWS/RTTM data */ 193/* PAWS/RTTM data */
194 long ts_recent_stamp;/* Time we stored ts_recent (for aging) */ 194 long ts_recent_stamp;/* Time we stored ts_recent (for aging) */
195 __u32 ts_recent; /* Time stamp to echo next */ 195 u32 ts_recent; /* Time stamp to echo next */
196 __u32 rcv_tsval; /* Time stamp value */ 196 u32 rcv_tsval; /* Time stamp value */
197 __u32 rcv_tsecr; /* Time stamp echo reply */ 197 u32 rcv_tsecr; /* Time stamp echo reply */
198 __u16 saw_tstamp : 1, /* Saw TIMESTAMP on last packet */ 198 u16 saw_tstamp : 1, /* Saw TIMESTAMP on last packet */
199 tstamp_ok : 1, /* TIMESTAMP seen on SYN packet */ 199 tstamp_ok : 1, /* TIMESTAMP seen on SYN packet */
200 dsack : 1, /* D-SACK is scheduled */ 200 dsack : 1, /* D-SACK is scheduled */
201 wscale_ok : 1, /* Wscale seen on SYN packet */ 201 wscale_ok : 1, /* Wscale seen on SYN packet */
@@ -203,10 +203,10 @@ struct tcp_options_received {
203 snd_wscale : 4, /* Window scaling received from sender */ 203 snd_wscale : 4, /* Window scaling received from sender */
204 rcv_wscale : 4; /* Window scaling to send to receiver */ 204 rcv_wscale : 4; /* Window scaling to send to receiver */
205/* SACKs data */ 205/* SACKs data */
206 __u8 eff_sacks; /* Size of SACK array to send with next packet */ 206 u8 eff_sacks; /* Size of SACK array to send with next packet */
207 __u8 num_sacks; /* Number of SACK blocks */ 207 u8 num_sacks; /* Number of SACK blocks */
208 __u16 user_mss; /* mss requested by user in ioctl */ 208 u16 user_mss; /* mss requested by user in ioctl */
209 __u16 mss_clamp; /* Maximal mss, negotiated at connection setup */ 209 u16 mss_clamp; /* Maximal mss, negotiated at connection setup */
210}; 210};
211 211
212struct tcp_request_sock { 212struct tcp_request_sock {
@@ -215,8 +215,8 @@ struct tcp_request_sock {
215 /* Only used by TCP MD5 Signature so far. */ 215 /* Only used by TCP MD5 Signature so far. */
216 struct tcp_request_sock_ops *af_specific; 216 struct tcp_request_sock_ops *af_specific;
217#endif 217#endif
218 __u32 rcv_isn; 218 u32 rcv_isn;
219 __u32 snt_isn; 219 u32 snt_isn;
220}; 220};
221 221
222static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req) 222static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
@@ -241,13 +241,13 @@ struct tcp_sock {
241 * read the code and the spec side by side (and laugh ...) 241 * read the code and the spec side by side (and laugh ...)
242 * See RFC793 and RFC1122. The RFC writes these in capitals. 242 * See RFC793 and RFC1122. The RFC writes these in capitals.
243 */ 243 */
244 __u32 rcv_nxt; /* What we want to receive next */ 244 u32 rcv_nxt; /* What we want to receive next */
245 __u32 snd_nxt; /* Next sequence we send */ 245 u32 snd_nxt; /* Next sequence we send */
246 246
247 __u32 snd_una; /* First byte we want an ack for */ 247 u32 snd_una; /* First byte we want an ack for */
248 __u32 snd_sml; /* Last byte of the most recently transmitted small packet */ 248 u32 snd_sml; /* Last byte of the most recently transmitted small packet */
249 __u32 rcv_tstamp; /* timestamp of last received ACK (for keepalives) */ 249 u32 rcv_tstamp; /* timestamp of last received ACK (for keepalives) */
250 __u32 lsndtime; /* timestamp of last sent data packet (for restart window) */ 250 u32 lsndtime; /* timestamp of last sent data packet (for restart window) */
251 251
252 /* Data for direct copy to user */ 252 /* Data for direct copy to user */
253 struct { 253 struct {
@@ -265,30 +265,30 @@ struct tcp_sock {
265#endif 265#endif
266 } ucopy; 266 } ucopy;
267 267
268 __u32 snd_wl1; /* Sequence for window update */ 268 u32 snd_wl1; /* Sequence for window update */
269 __u32 snd_wnd; /* The window we expect to receive */ 269 u32 snd_wnd; /* The window we expect to receive */
270 __u32 max_window; /* Maximal window ever seen from peer */ 270 u32 max_window; /* Maximal window ever seen from peer */
271 __u32 mss_cache; /* Cached effective mss, not including SACKS */ 271 u32 mss_cache; /* Cached effective mss, not including SACKS */
272 272
273 __u32 window_clamp; /* Maximal window to advertise */ 273 u32 window_clamp; /* Maximal window to advertise */
274 __u32 rcv_ssthresh; /* Current window clamp */ 274 u32 rcv_ssthresh; /* Current window clamp */
275 275
276 __u32 frto_highmark; /* snd_nxt when RTO occurred */ 276 u32 frto_highmark; /* snd_nxt when RTO occurred */
277 __u8 reordering; /* Packet reordering metric. */ 277 u8 reordering; /* Packet reordering metric. */
278 __u8 frto_counter; /* Number of new acks after RTO */ 278 u8 frto_counter; /* Number of new acks after RTO */
279 __u8 nonagle; /* Disable Nagle algorithm? */ 279 u8 nonagle; /* Disable Nagle algorithm? */
280 __u8 keepalive_probes; /* num of allowed keep alive probes */ 280 u8 keepalive_probes; /* num of allowed keep alive probes */
281 281
282/* RTT measurement */ 282/* RTT measurement */
283 __u32 srtt; /* smoothed round trip time << 3 */ 283 u32 srtt; /* smoothed round trip time << 3 */
284 __u32 mdev; /* medium deviation */ 284 u32 mdev; /* medium deviation */
285 __u32 mdev_max; /* maximal mdev for the last rtt period */ 285 u32 mdev_max; /* maximal mdev for the last rtt period */
286 __u32 rttvar; /* smoothed mdev_max */ 286 u32 rttvar; /* smoothed mdev_max */
287 __u32 rtt_seq; /* sequence number to update rttvar */ 287 u32 rtt_seq; /* sequence number to update rttvar */
288 288
289 __u32 packets_out; /* Packets which are "in flight" */ 289 u32 packets_out; /* Packets which are "in flight" */
290 __u32 left_out; /* Packets which leaved network */ 290 u32 left_out; /* Packets which leaved network */
291 __u32 retrans_out; /* Retransmitted packets out */ 291 u32 retrans_out; /* Retransmitted packets out */
292/* 292/*
293 * Options received (usually on last packet, some only on SYN packets). 293 * Options received (usually on last packet, some only on SYN packets).
294 */ 294 */
@@ -297,20 +297,20 @@ struct tcp_sock {
297/* 297/*
298 * Slow start and congestion control (see also Nagle, and Karn & Partridge) 298 * Slow start and congestion control (see also Nagle, and Karn & Partridge)
299 */ 299 */
300 __u32 snd_ssthresh; /* Slow start size threshold */ 300 u32 snd_ssthresh; /* Slow start size threshold */
301 __u32 snd_cwnd; /* Sending congestion window */ 301 u32 snd_cwnd; /* Sending congestion window */
302 __u16 snd_cwnd_cnt; /* Linear increase counter */ 302 u16 snd_cwnd_cnt; /* Linear increase counter */
303 __u16 snd_cwnd_clamp; /* Do not allow snd_cwnd to grow above this */ 303 u16 snd_cwnd_clamp; /* Do not allow snd_cwnd to grow above this */
304 __u32 snd_cwnd_used; 304 u32 snd_cwnd_used;
305 __u32 snd_cwnd_stamp; 305 u32 snd_cwnd_stamp;
306 306
307 struct sk_buff_head out_of_order_queue; /* Out of order segments go here */ 307 struct sk_buff_head out_of_order_queue; /* Out of order segments go here */
308 308
309 __u32 rcv_wnd; /* Current receiver window */ 309 u32 rcv_wnd; /* Current receiver window */
310 __u32 rcv_wup; /* rcv_nxt on last window update sent */ 310 u32 rcv_wup; /* rcv_nxt on last window update sent */
311 __u32 write_seq; /* Tail(+1) of data held in tcp send buffer */ 311 u32 write_seq; /* Tail(+1) of data held in tcp send buffer */
312 __u32 pushed_seq; /* Last pushed seq, required to talk to windows */ 312 u32 pushed_seq; /* Last pushed seq, required to talk to windows */
313 __u32 copied_seq; /* Head of yet unread data */ 313 u32 copied_seq; /* Head of yet unread data */
314 314
315/* SACKs data */ 315/* SACKs data */
316 struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */ 316 struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */
@@ -331,26 +331,26 @@ struct tcp_sock {
331 int retransmit_cnt_hint; 331 int retransmit_cnt_hint;
332 int forward_cnt_hint; 332 int forward_cnt_hint;
333 333
334 __u16 advmss; /* Advertised MSS */ 334 u16 advmss; /* Advertised MSS */
335 __u16 prior_ssthresh; /* ssthresh saved at recovery start */ 335 u16 prior_ssthresh; /* ssthresh saved at recovery start */
336 __u32 lost_out; /* Lost packets */ 336 u32 lost_out; /* Lost packets */
337 __u32 sacked_out; /* SACK'd packets */ 337 u32 sacked_out; /* SACK'd packets */
338 __u32 fackets_out; /* FACK'd packets */ 338 u32 fackets_out; /* FACK'd packets */
339 __u32 high_seq; /* snd_nxt at onset of congestion */ 339 u32 high_seq; /* snd_nxt at onset of congestion */
340 340
341 __u32 retrans_stamp; /* Timestamp of the last retransmit, 341 u32 retrans_stamp; /* Timestamp of the last retransmit,
342 * also used in SYN-SENT to remember stamp of 342 * also used in SYN-SENT to remember stamp of
343 * the first SYN. */ 343 * the first SYN. */
344 __u32 undo_marker; /* tracking retrans started here. */ 344 u32 undo_marker; /* tracking retrans started here. */
345 int undo_retrans; /* number of undoable retransmissions. */ 345 int undo_retrans; /* number of undoable retransmissions. */
346 __u32 urg_seq; /* Seq of received urgent pointer */ 346 u32 urg_seq; /* Seq of received urgent pointer */
347 __u16 urg_data; /* Saved octet of OOB data and control flags */ 347 u16 urg_data; /* Saved octet of OOB data and control flags */
348 __u8 urg_mode; /* In urgent mode */ 348 u8 urg_mode; /* In urgent mode */
349 __u8 ecn_flags; /* ECN status bits. */ 349 u8 ecn_flags; /* ECN status bits. */
350 __u32 snd_up; /* Urgent pointer */ 350 u32 snd_up; /* Urgent pointer */
351 351
352 __u32 total_retrans; /* Total retransmits for entire connection */ 352 u32 total_retrans; /* Total retransmits for entire connection */
353 __u32 bytes_acked; /* Appropriate Byte Counting - RFC3465 */ 353 u32 bytes_acked; /* Appropriate Byte Counting - RFC3465 */
354 354
355 unsigned int keepalive_time; /* time before keep alive takes place */ 355 unsigned int keepalive_time; /* time before keep alive takes place */
356 unsigned int keepalive_intvl; /* time interval between keep alive probes */ 356 unsigned int keepalive_intvl; /* time interval between keep alive probes */
@@ -358,26 +358,26 @@ struct tcp_sock {
358 358
359 unsigned long last_synq_overflow; 359 unsigned long last_synq_overflow;
360 360
361 __u32 tso_deferred; 361 u32 tso_deferred;
362 362
363/* Receiver side RTT estimation */ 363/* Receiver side RTT estimation */
364 struct { 364 struct {
365 __u32 rtt; 365 u32 rtt;
366 __u32 seq; 366 u32 seq;
367 __u32 time; 367 u32 time;
368 } rcv_rtt_est; 368 } rcv_rtt_est;
369 369
370/* Receiver queue space */ 370/* Receiver queue space */
371 struct { 371 struct {
372 int space; 372 int space;
373 __u32 seq; 373 u32 seq;
374 __u32 time; 374 u32 time;
375 } rcvq_space; 375 } rcvq_space;
376 376
377/* TCP-specific MTU probe information. */ 377/* TCP-specific MTU probe information. */
378 struct { 378 struct {
379 __u32 probe_seq_start; 379 u32 probe_seq_start;
380 __u32 probe_seq_end; 380 u32 probe_seq_end;
381 } mtu_probe; 381 } mtu_probe;
382 382
383#ifdef CONFIG_TCP_MD5SIG 383#ifdef CONFIG_TCP_MD5SIG
@@ -396,14 +396,14 @@ static inline struct tcp_sock *tcp_sk(const struct sock *sk)
396 396
397struct tcp_timewait_sock { 397struct tcp_timewait_sock {
398 struct inet_timewait_sock tw_sk; 398 struct inet_timewait_sock tw_sk;
399 __u32 tw_rcv_nxt; 399 u32 tw_rcv_nxt;
400 __u32 tw_snd_nxt; 400 u32 tw_snd_nxt;
401 __u32 tw_rcv_wnd; 401 u32 tw_rcv_wnd;
402 __u32 tw_ts_recent; 402 u32 tw_ts_recent;
403 long tw_ts_recent_stamp; 403 long tw_ts_recent_stamp;
404#ifdef CONFIG_TCP_MD5SIG 404#ifdef CONFIG_TCP_MD5SIG
405 __u16 tw_md5_keylen; 405 u16 tw_md5_keylen;
406 __u8 tw_md5_key[TCP_MD5SIG_MAXKEYLEN]; 406 u8 tw_md5_key[TCP_MD5SIG_MAXKEYLEN];
407#endif 407#endif
408}; 408};
409 409