Update from upstream with manual merge of Yasunori Goto's

changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c

Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 11 insertions, 8 deletions

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 18461bc04cbe..1393461898bb 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -19,6 +19,7 @@
 #include <net/xfrm.h>
 #include <net/inet_timewait_sock.h>
 
+#include "ackvec.h"
 #include "ccid.h"
 #include "dccp.h"
 
@@ -93,22 +94,24 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
                 struct inet_connection_sock *newicsk = inet_csk(sk);
                 struct dccp_sock *newdp = dccp_sk(newsk);
 
-                newdp->dccps_hc_rx_ackpkts = NULL;
-                newdp->dccps_role = DCCP_ROLE_SERVER;
-                newicsk->icsk_rto = DCCP_TIMEOUT_INIT;
+                newdp->dccps_role          = DCCP_ROLE_SERVER;
+                newdp->dccps_hc_rx_ackvec  = NULL;
+                newdp->dccps_service_list  = NULL;
+                newdp->dccps_service       = dreq->dreq_service;
+                newicsk->icsk_rto          = DCCP_TIMEOUT_INIT;
                 do_gettimeofday(&newdp->dccps_epoch);
 
                 if (newdp->dccps_options.dccpo_send_ack_vector) {
-                        newdp->dccps_hc_rx_ackpkts =
-                                dccp_ackpkts_alloc(DCCP_MAX_ACK_VECTOR_LEN,
-                                                   GFP_ATOMIC);
+                        newdp->dccps_hc_rx_ackvec =
+                                dccp_ackvec_alloc(DCCP_MAX_ACKVEC_LEN,
+                                                  GFP_ATOMIC);
                         /*
                          * XXX: We're using the same CCIDs set on the parent,
                          * i.e. sk_clone copied the master sock and left the
                          * CCID pointers for this child, that is why we do the
                          * __ccid_get calls.
                          */
-                        if (unlikely(newdp->dccps_hc_rx_ackpkts == NULL))
+                        if (unlikely(newdp->dccps_hc_rx_ackvec == NULL))
                                 goto out_free;
                 }
 
@@ -116,7 +119,7 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
                                              newsk) != 0 ||
                              ccid_hc_tx_init(newdp->dccps_hc_tx_ccid,
                                              newsk) != 0)) {
-                        dccp_ackpkts_free(newdp->dccps_hc_rx_ackpkts);
+                        dccp_ackvec_free(newdp->dccps_hc_rx_ackvec);
                         ccid_hc_rx_exit(newdp->dccps_hc_rx_ccid, newsk);
                         ccid_hc_tx_exit(newdp->dccps_hc_tx_ccid, newsk);
 out_free: