|
@@ -248,18 +248,8 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
|
|
|
DCCP_ACKVEC_STATE_RECEIVED))
|
|
|
goto discard;
|
|
|
|
|
|
- /*
|
|
|
- * 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_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);
|
|
|
+ ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
|
|
|
+ ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
|
|
|
|
|
|
return __dccp_rcv_established(sk, skb, dh, len);
|
|
|
discard:
|
|
@@ -494,11 +484,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
|
|
|
DCCP_ACKVEC_STATE_RECEIVED))
|
|
|
goto discard;
|
|
|
|
|
|
- /* XXX see the comments in dccp_rcv_established about this */
|
|
|
- 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);
|
|
|
+ ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
|
|
|
+ ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
|
|
|
}
|
|
|
|
|
|
/*
|