Skip to content

Commit

Permalink
[DCCP]: Don't alloc ack vector for the control sock
Browse files Browse the repository at this point in the history
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 David S. Miller committed Mar 21, 2006
1 parent d5e9b2c commit 9833d6d
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions net/dccp/ipv4.c
Original file line number Diff line number Diff line change
Expand Up @@ -1041,12 +1041,6 @@ int dccp_v4_init_sock(struct sock *sk)
dccp_options_init(&dp->dccps_options);
do_gettimeofday(&dp->dccps_epoch);

if (dp->dccps_options.dccpo_send_ack_vector) {
dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL);
if (dp->dccps_hc_rx_ackvec == NULL)
return -ENOMEM;
}

/*
* FIXME: We're hardcoding the CCID, and doing this at this point makes
* the listening (master) sock get CCID control blocks, which is not
Expand All @@ -1055,6 +1049,11 @@ int dccp_v4_init_sock(struct sock *sk)
* setsockopt(CCIDs-I-want/accept). -acme
*/
if (likely(!dccp_ctl_socket_init)) {
if (dp->dccps_options.dccpo_send_ack_vector) {
dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL);
if (dp->dccps_hc_rx_ackvec == NULL)
return -ENOMEM;
}
dp->dccps_hc_rx_ccid = ccid_init(dp->dccps_options.dccpo_rx_ccid,
sk);
dp->dccps_hc_tx_ccid = ccid_init(dp->dccps_options.dccpo_tx_ccid,
Expand Down

0 comments on commit 9833d6d

Please sign in to comment.