1 files changed, 23 insertions, 64 deletions

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index b2804e2d1b8c..f4d9c8f60ede 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -42,16 +42,6 @@ struct inet_timewait_death_row dccp_death_row = {
 
 EXPORT_SYMBOL_GPL(dccp_death_row);
 
-void dccp_minisock_init(struct dccp_minisock *dmsk)
-{
-        dmsk->dccpms_sequence_window = sysctl_dccp_feat_sequence_window;
-        dmsk->dccpms_rx_ccid         = sysctl_dccp_feat_rx_ccid;
-        dmsk->dccpms_tx_ccid         = sysctl_dccp_feat_tx_ccid;
-        dmsk->dccpms_ack_ratio       = sysctl_dccp_feat_ack_ratio;
-        dmsk->dccpms_send_ack_vector = sysctl_dccp_feat_send_ack_vector;
-        dmsk->dccpms_send_ndp_count  = sysctl_dccp_feat_send_ndp_count;
-}
-
 void dccp_time_wait(struct sock *sk, int state, int timeo)
 {
         struct inet_timewait_sock *tw = NULL;
@@ -112,10 +102,9 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
         struct sock *newsk = inet_csk_clone(sk, req, GFP_ATOMIC);
 
         if (newsk != NULL) {
-                const struct dccp_request_sock *dreq = dccp_rsk(req);
+                struct dccp_request_sock *dreq = dccp_rsk(req);
                 struct inet_connection_sock *newicsk = inet_csk(newsk);
                 struct dccp_sock *newdp = dccp_sk(newsk);
-                struct dccp_minisock *newdmsk = dccp_msk(newsk);
 
                 newdp->dccps_role           = DCCP_ROLE_SERVER;
                 newdp->dccps_hc_rx_ackvec   = NULL;
@@ -125,65 +114,32 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
                 newdp->dccps_timestamp_time = dreq->dreq_timestamp_time;
                 newicsk->icsk_rto           = DCCP_TIMEOUT_INIT;
 
-                if (dccp_feat_clone(sk, newsk))
-                        goto out_free;
-
-                if (newdmsk->dccpms_send_ack_vector) {
-                        newdp->dccps_hc_rx_ackvec =
-                                                dccp_ackvec_alloc(GFP_ATOMIC);
-                        if (unlikely(newdp->dccps_hc_rx_ackvec == NULL))
-                                goto out_free;
-                }
-
-                newdp->dccps_hc_rx_ccid =
-                            ccid_hc_rx_new(newdmsk->dccpms_rx_ccid,
-                                           newsk, GFP_ATOMIC);
-                newdp->dccps_hc_tx_ccid =
-                            ccid_hc_tx_new(newdmsk->dccpms_tx_ccid,
-                                           newsk, GFP_ATOMIC);
-                if (unlikely(newdp->dccps_hc_rx_ccid == NULL ||
-                             newdp->dccps_hc_tx_ccid == NULL)) {
-                        dccp_ackvec_free(newdp->dccps_hc_rx_ackvec);
-                        ccid_hc_rx_delete(newdp->dccps_hc_rx_ccid, newsk);
-                        ccid_hc_tx_delete(newdp->dccps_hc_tx_ccid, newsk);
-out_free:
-                        /* It is still raw copy of parent, so invalidate
-                         * destructor and make plain sk_free() */
-                        newsk->sk_destruct = NULL;
-                        sk_free(newsk);
-                        return NULL;
-                }
-
+                INIT_LIST_HEAD(&newdp->dccps_featneg);
                 /*
                  * Step 3: Process LISTEN state
                  *
                  *    Choose S.ISS (initial seqno) or set from Init Cookies
                  *    Initialize S.GAR := S.ISS
-                 *    Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookies
+                 *    Set S.ISR, S.GSR from packet (or Init Cookies)
+                 *
+                 *    Setting AWL/AWH and SWL/SWH happens as part of the feature
+                 *    activation below, as these windows all depend on the local
+                 *    and remote Sequence Window feature values (7.5.2).
                  */
-
-                /* See dccp_v4_conn_request */
-                newdmsk->dccpms_sequence_window = req->rcv_wnd;
-
-                newdp->dccps_gar = newdp->dccps_iss = dreq->dreq_iss;
-                dccp_update_gss(newsk, dreq->dreq_iss);
-
-                newdp->dccps_isr = dreq->dreq_isr;
-                dccp_update_gsr(newsk, dreq->dreq_isr);
+                newdp->dccps_gss = newdp->dccps_iss = dreq->dreq_iss;
+                newdp->dccps_gar = newdp->dccps_iss;
+                newdp->dccps_gsr = newdp->dccps_isr = dreq->dreq_isr;
 
                 /*
-                 * SWL and AWL are initially adjusted so that they are not less than
-                 * the initial Sequence Numbers received and sent, respectively:
-                 *      SWL := max(GSR + 1 - floor(W/4), ISR),
-                 *      AWL := max(GSS - W' + 1, ISS).
-                 * These adjustments MUST be applied only at the beginning of the
-                 * connection.
+                 * Activate features: initialise CCIDs, sequence windows etc.
                  */
-                dccp_set_seqno(&newdp->dccps_swl,
-                               max48(newdp->dccps_swl, newdp->dccps_isr));
-                dccp_set_seqno(&newdp->dccps_awl,
-                               max48(newdp->dccps_awl, newdp->dccps_iss));
-
+                if (dccp_feat_activate_values(newsk, &dreq->dreq_featneg)) {
+                        /* It is still raw copy of parent, so invalidate
+                         * destructor and make plain sk_free() */
+                        newsk->sk_destruct = NULL;
+                        sk_free(newsk);
+                        return NULL;
+                }
                 dccp_init_xmit_timers(newsk);
 
                 DCCP_INC_STATS_BH(DCCP_MIB_PASSIVEOPENS);
@@ -304,14 +260,17 @@ void dccp_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
 
 EXPORT_SYMBOL_GPL(dccp_reqsk_send_ack);
 
-void dccp_reqsk_init(struct request_sock *req, struct sk_buff *skb)
+int dccp_reqsk_init(struct request_sock *req,
+                    struct dccp_sock const *dp, struct sk_buff const *skb)
 {
         struct dccp_request_sock *dreq = dccp_rsk(req);
 
         inet_rsk(req)->rmt_port   = dccp_hdr(skb)->dccph_sport;
         inet_rsk(req)->acked      = 0;
-        req->rcv_wnd              = sysctl_dccp_feat_sequence_window;
         dreq->dreq_timestamp_echo = 0;
+
+        /* inherit feature negotiation options from listening socket */
+        return dccp_feat_clone_list(&dp->dccps_featneg, &dreq->dreq_featneg);
 }
 
 EXPORT_SYMBOL_GPL(dccp_reqsk_init);