Merge branch 'topic/sscape-fix' into for-linus

[linux-2.6-omap-h63xx.git] / net / dccp / minisocks.c

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index afdacbb94d75bb78a10c280cf72d4ab1d9f558d7..6821ae33dd37a02600dc80b4ba7f8f8452c6185a 100644 (file)
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -45,11 +45,6 @@ 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)
@@ -112,7 +107,7 @@ 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);
@@ -126,35 +121,6 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
                newicsk->icsk_rto           = DCCP_TIMEOUT_INIT;
 
                INIT_LIST_HEAD(&newdp->dccps_featneg);
-               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;
-               }
-
                /*
                 * Step 3: Process LISTEN state
                 *
@@ -185,6 +151,17 @@ out_free:
                dccp_set_seqno(&newdp->dccps_awl,
                               max48(newdp->dccps_awl, newdp->dccps_iss));
 
+               /*
+                * Activate features after initialising the sequence numbers,
+                * since CCID initialisation may depend on GSS, ISR, ISS etc.
+                */
+               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);