4 files changed, 0 insertions, 34 deletions

diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index 647cb0614f84..bcc643f992ae 100644
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -253,20 +253,6 @@ out_module_put:
 
 EXPORT_SYMBOL_GPL(ccid_new);
 
-struct ccid *ccid_hc_rx_new(unsigned char id, struct sock *sk, gfp_t gfp)
-{
-        return ccid_new(id, sk, 1, gfp);
-}
-
-EXPORT_SYMBOL_GPL(ccid_hc_rx_new);
-
-struct ccid *ccid_hc_tx_new(unsigned char id,struct sock *sk,  gfp_t gfp)
-{
-        return ccid_new(id, sk, 0, gfp);
-}
-
-EXPORT_SYMBOL_GPL(ccid_hc_tx_new);
-
 static void ccid_delete(struct ccid *ccid, struct sock *sk, int rx)
 {
         struct ccid_operations *ccid_ops;
diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h
index 803343aed004..18f69423a708 100644
--- a/net/dccp/ccid.h
+++ b/net/dccp/ccid.h
@@ -111,11 +111,6 @@ extern int  ccid_getsockopt_builtin_ccids(struct sock *sk, int len,
 extern struct ccid *ccid_new(unsigned char id, struct sock *sk, int rx,
                              gfp_t gfp);
 
-extern struct ccid *ccid_hc_rx_new(unsigned char id, struct sock *sk,
-                                   gfp_t gfp);
-extern struct ccid *ccid_hc_tx_new(unsigned char id, struct sock *sk,
-                                   gfp_t gfp);
-
 static inline int ccid_get_current_rx_ccid(struct dccp_sock *dp)
 {
         struct ccid *ccid = dp->dccps_hc_rx_ccid;
diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index 077f78d579c4..a0d5891a37bf 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -1124,22 +1124,9 @@ int dccp_feat_init(struct sock *sk)
         INIT_LIST_HEAD(&dmsk->dccpms_pending);  /* XXX no longer used */
         INIT_LIST_HEAD(&dmsk->dccpms_conf);     /* XXX no longer used */
 
-        /* CCID L */
-        rc = __feat_register_sp(&dp->dccps_featneg, DCCPF_CCID, 1, 0,
-                                &dmsk->dccpms_tx_ccid, 1);
-        if (rc)
-                goto out;
-
-        /* CCID R */
-        rc = __feat_register_sp(&dp->dccps_featneg, DCCPF_CCID, 0, 0,
-                                &dmsk->dccpms_rx_ccid, 1);
-        if (rc)
-                goto out;
-
         /* Ack ratio */
         rc = __feat_register_nn(&dp->dccps_featneg, DCCPF_ACK_RATIO, 0,
                                 dp->dccps_l_ack_ratio);
-out:
         return rc;
 }
 
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 308b6b928c3d..210c346899ba 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -45,8 +45,6 @@ EXPORT_SYMBOL_GPL(dccp_death_row);
 void dccp_minisock_init(struct dccp_minisock *dmsk)
 {
         dmsk->dccpms_sequence_window = sysctl_dccp_feat_sequence_window;
-        dmsk->dccpms_rx_ccid         = sysctl_dccp_feat_rx_ccid;
-        dmsk->dccpms_tx_ccid         = sysctl_dccp_feat_tx_ccid;
         dmsk->dccpms_send_ack_vector = sysctl_dccp_feat_send_ack_vector;
         dmsk->dccpms_send_ndp_count  = sysctl_dccp_feat_send_ndp_count;
 }