WorkStruct: make allyesconfig

[safe/jmp/linux-2.6] / net / dccp / minisocks.c

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 5324fca..36db5be 100644 (file)
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -10,7 +10,6 @@
  *     2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/dccp.h>
 #include <linux/skbuff.h>
 #include <linux/timer.h>
@@ -32,8 +31,7 @@ struct inet_timewait_death_row dccp_death_row = {
        .tw_timer       = TIMER_INITIALIZER(inet_twdr_hangman, 0,
                                            (unsigned long)&dccp_death_row),
        .twkill_work    = __WORK_INITIALIZER(dccp_death_row.twkill_work,
-                                            inet_twdr_twkill_work,
-                                            &dccp_death_row),
+                                            inet_twdr_twkill_work),
 /* Short-time timewait calendar */
 
        .twcal_hand     = -1,
@@ -107,6 +105,7 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
                const struct dccp_request_sock *dreq = dccp_rsk(req);
                struct inet_connection_sock *newicsk = inet_csk(sk);
                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;
@@ -118,7 +117,7 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
                if (dccp_feat_clone(sk, newsk))
                        goto out_free;
 
-               if (newdp->dccps_options.dccpo_send_ack_vector) {
+               if (newdmsk->dccpms_send_ack_vector) {
                        newdp->dccps_hc_rx_ackvec =
                                                dccp_ackvec_alloc(GFP_ATOMIC);
                        if (unlikely(newdp->dccps_hc_rx_ackvec == NULL))
@@ -126,10 +125,10 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
                }
 
                newdp->dccps_hc_rx_ccid =
-                           ccid_hc_rx_new(newdp->dccps_options.dccpo_rx_ccid,
+                           ccid_hc_rx_new(newdmsk->dccpms_rx_ccid,
                                           newsk, GFP_ATOMIC);
                newdp->dccps_hc_tx_ccid =
-                           ccid_hc_tx_new(newdp->dccps_options.dccpo_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)) {
@@ -153,7 +152,7 @@ out_free:
                 */
 
                /* See dccp_v4_conn_request */
-               newdp->dccps_options.dccpo_sequence_window = req->rcv_wnd;
+               newdmsk->dccpms_sequence_window = req->rcv_wnd;
 
                newdp->dccps_gar = newdp->dccps_isr = dreq->dreq_isr;
                dccp_update_gsr(newsk, dreq->dreq_isr);