aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-09-18 03:17:51 -0400
committerDavid S. Miller <davem@davemloft.net>2005-09-18 03:17:51 -0400
commitae31c3399d17b1f7bc1742724f70476b5417744f (patch)
treec34099afb228936672e6e589f0af7d81f1f62443 /include
parent21f130a2370ba837cdfc5204ebe52e7c664fec3d (diff)
[DCCP]: Move the ack vector code to net/dccp/ackvec.[ch]
Isolating it, that will be used when we introduce a CCID2 (TCP-Like) implementation. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/dccp.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 0e72708677e4..8c8e029095a5 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -353,14 +353,8 @@ static inline struct dccp_request_sock *dccp_rsk(const struct request_sock *req)
353 353
354extern struct inet_timewait_death_row dccp_death_row; 354extern struct inet_timewait_death_row dccp_death_row;
355 355
356/* Read about the ECN nonce to see why it is 253 */
357#define DCCP_MAX_ACK_VECTOR_LEN 253
358
359struct dccp_options_received { 356struct dccp_options_received {
360 u32 dccpor_ndp:24, 357 u32 dccpor_ndp; /* only 24 bits */
361 dccpor_ack_vector_len:8;
362 u32 dccpor_ack_vector_idx:10;
363 /* 22 bits hole, try to pack */
364 u32 dccpor_timestamp; 358 u32 dccpor_timestamp;
365 u32 dccpor_timestamp_echo; 359 u32 dccpor_timestamp_echo;
366 u32 dccpor_elapsed_time; 360 u32 dccpor_elapsed_time;
@@ -394,6 +388,8 @@ static inline int dccp_list_has_service(const struct dccp_service_list *sl,
394 return 0; 388 return 0;
395} 389}
396 390
391struct dccp_ackvec;
392
397/** 393/**
398 * struct dccp_sock - DCCP socket state 394 * struct dccp_sock - DCCP socket state
399 * 395 *
@@ -414,7 +410,7 @@ static inline int dccp_list_has_service(const struct dccp_service_list *sl,
414 * @dccps_packet_size - Set thru setsockopt 410 * @dccps_packet_size - Set thru setsockopt
415 * @dccps_role - Role of this sock, one of %dccp_role 411 * @dccps_role - Role of this sock, one of %dccp_role
416 * @dccps_ndp_count - number of Non Data Packets since last data packet 412 * @dccps_ndp_count - number of Non Data Packets since last data packet
417 * @dccps_hc_rx_ackpkts - receiver half connection acked packets 413 * @dccps_hc_rx_ackvec - rx half connection ack vector
418 */ 414 */
419struct dccp_sock { 415struct dccp_sock {
420 /* inet_connection_sock has to be the first member of dccp_sock */ 416 /* inet_connection_sock has to be the first member of dccp_sock */
@@ -439,7 +435,7 @@ struct dccp_sock {
439 __u32 dccps_pmtu_cookie; 435 __u32 dccps_pmtu_cookie;
440 __u32 dccps_mss_cache; 436 __u32 dccps_mss_cache;
441 struct dccp_options dccps_options; 437 struct dccp_options dccps_options;
442 struct dccp_ackpkts *dccps_hc_rx_ackpkts; 438 struct dccp_ackvec *dccps_hc_rx_ackvec;
443 void *dccps_hc_rx_ccid_private; 439 void *dccps_hc_rx_ccid_private;
444 void *dccps_hc_tx_ccid_private; 440 void *dccps_hc_tx_ccid_private;
445 struct ccid *dccps_hc_rx_ccid; 441 struct ccid *dccps_hc_rx_ccid;