dccp: Remove obsolete parts of the old CCID interface

The TX/RX CCIDs of the minisock are now redundant: similar to the Ack Vector
case, their value equals initially that of the sysctl, but at the end of
feature negotiation may be something different.

The old interface removed by this patch thus has been replaced by the newer
interface to dynamically query the currently loaded CCIDs.

Also removed are the constructors for the TX CCID and the RX CCID, since the
switch "rx <-> non-rx" is done by the handler in minisocks.c (and the handler
is the only place in the code where CCIDs are loaded).

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 13 deletions

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;
 }