diff options
-rw-r--r-- | net/dccp/ipv4.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index be5ce57b8046..f94286e46c42 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -1051,7 +1051,10 @@ int dccp_v4_init_sock(struct sock *sk) | |||
1051 | * setsockopt(CCIDs-I-want/accept). -acme | 1051 | * setsockopt(CCIDs-I-want/accept). -acme |
1052 | */ | 1052 | */ |
1053 | if (likely(!dccp_ctl_socket_init)) { | 1053 | if (likely(!dccp_ctl_socket_init)) { |
1054 | int rc; | 1054 | int rc = dccp_feat_init(sk); |
1055 | |||
1056 | if (rc) | ||
1057 | return rc; | ||
1055 | 1058 | ||
1056 | if (dp->dccps_options.dccpo_send_ack_vector) { | 1059 | if (dp->dccps_options.dccpo_send_ack_vector) { |
1057 | dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL); | 1060 | dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL); |
@@ -1075,10 +1078,6 @@ int dccp_v4_init_sock(struct sock *sk) | |||
1075 | dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL; | 1078 | dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL; |
1076 | return -ENOMEM; | 1079 | return -ENOMEM; |
1077 | } | 1080 | } |
1078 | |||
1079 | rc = dccp_feat_init(sk); | ||
1080 | if (rc) | ||
1081 | return rc; | ||
1082 | } else { | 1081 | } else { |
1083 | /* control socket doesn't need feat nego */ | 1082 | /* control socket doesn't need feat nego */ |
1084 | INIT_LIST_HEAD(&dp->dccps_options.dccpo_pending); | 1083 | INIT_LIST_HEAD(&dp->dccps_options.dccpo_pending); |