2 files changed, 7 insertions, 7 deletions

diff --git a/net/dccp/input.c b/net/dccp/input.c
index 4dee462f00..287099f7f0 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -256,10 +256,10 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
          *        (only one is active at a time); when moving to bidirectional
          *        service, this needs to be revised.
          */
-        if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER)
-                ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
-        else
+        if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)
                 ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
+        else    /* listening or connected server */
+                ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
 
         return __dccp_rcv_established(sk, skb, dh, len);
 discard:
@@ -495,10 +495,10 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
                         goto discard;
 
                 /* XXX see the comments in dccp_rcv_established about this */
-                if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER)
-                        ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
-                else
+                if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)
                         ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
+                else
+                        ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
         }
 
         /*
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 6656bb497c..6d235b3013 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -103,7 +103,7 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
 
         if (newsk != NULL) {
                 const struct dccp_request_sock *dreq = dccp_rsk(req);
-                struct inet_connection_sock *newicsk = inet_csk(sk);
+                struct inet_connection_sock *newicsk = inet_csk(newsk);
                 struct dccp_sock *newdp = dccp_sk(newsk);
                 struct dccp_minisock *newdmsk = dccp_msk(newsk);