Skip to content

Commit

Permalink
[DCCP]: Move the ack vector code to net/dccp/ackvec.[ch]
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnaldo Carvalho de Melo authored and davem330 committed Sep 18, 2005
1 parent 21f130a commit ae31c33
Show file tree
Hide file tree
Showing 10 changed files with 612 additions and 631 deletions.
14 changes: 5 additions & 9 deletions include/linux/dccp.h
Expand Up @@ -353,14 +353,8 @@ static inline struct dccp_request_sock *dccp_rsk(const struct request_sock *req)

extern struct inet_timewait_death_row dccp_death_row;

/* Read about the ECN nonce to see why it is 253 */
#define DCCP_MAX_ACK_VECTOR_LEN 253

struct dccp_options_received {
u32 dccpor_ndp:24,
dccpor_ack_vector_len:8;
u32 dccpor_ack_vector_idx:10;
/* 22 bits hole, try to pack */
u32 dccpor_ndp; /* only 24 bits */
u32 dccpor_timestamp;
u32 dccpor_timestamp_echo;
u32 dccpor_elapsed_time;
Expand Down Expand Up @@ -394,6 +388,8 @@ static inline int dccp_list_has_service(const struct dccp_service_list *sl,
return 0;
}

struct dccp_ackvec;

/**
* struct dccp_sock - DCCP socket state
*
Expand All @@ -414,7 +410,7 @@ static inline int dccp_list_has_service(const struct dccp_service_list *sl,
* @dccps_packet_size - Set thru setsockopt
* @dccps_role - Role of this sock, one of %dccp_role
* @dccps_ndp_count - number of Non Data Packets since last data packet
* @dccps_hc_rx_ackpkts - receiver half connection acked packets
* @dccps_hc_rx_ackvec - rx half connection ack vector
*/
struct dccp_sock {
/* inet_connection_sock has to be the first member of dccp_sock */
Expand All @@ -439,7 +435,7 @@ struct dccp_sock {
__u32 dccps_pmtu_cookie;
__u32 dccps_mss_cache;
struct dccp_options dccps_options;
struct dccp_ackpkts *dccps_hc_rx_ackpkts;
struct dccp_ackvec *dccps_hc_rx_ackvec;
void *dccps_hc_rx_ccid_private;
void *dccps_hc_tx_ccid_private;
struct ccid *dccps_hc_rx_ccid;
Expand Down
2 changes: 2 additions & 0 deletions net/dccp/Makefile
Expand Up @@ -3,6 +3,8 @@ obj-$(CONFIG_IP_DCCP) += dccp.o
dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
timer.o

dccp-$(CONFIG_IP_DCCP_ACKVEC) += ackvec.o

obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o

dccp_diag-y := diag.o
Expand Down

0 comments on commit ae31c33

Please sign in to comment.