2 files changed, 20 insertions, 7 deletions

diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 820bc25e14dc..936704d1b77e 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -540,11 +540,11 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
                                    jiffies + usecs_to_jiffies(t_nfb));
 
                 /* set idle flag */
-                hctx->ccid3hctx_idle = 1;   
+                hctx->ccid3hctx_idle = 1;
                 break;
         case TFRC_SSTATE_NO_SENT:
-                if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)
-                        DCCP_WARN("Illegal ACK received - no packet sent\n");
+                /* XXX when implementing bidirectional rx/tx check this again */
+                DCCP_WARN("Illegal ACK received - no packet sent\n");
                 /* fall through */
         case TFRC_SSTATE_TERM:          /* ignore feedback when closing */
                 break;
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 7371a2f3acf4..4a3279cd684c 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -248,8 +248,18 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
                             DCCP_ACKVEC_STATE_RECEIVED))
                 goto discard;
 
-        ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
-        ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
+        /*
+         * Deliver to the CCID module in charge.
+         * FIXME: Currently DCCP operates one-directional only, i.e. a listening
+         *        server is not at the same time a connecting client. There is
+         *        not much sense in delivering to both rx/tx sides at the moment
+         *        (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
+                ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
 
         return __dccp_rcv_established(sk, skb, dh, len);
 discard:
@@ -484,8 +494,11 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
                                     DCCP_ACKVEC_STATE_RECEIVED))
                         goto discard;
 
-                ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
-                ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
+                /* 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
+                        ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
         }
 
         /*