dccp: API to query the current TX/RX CCID

This provides function to query the current TX/RX CCID dynamically,
without reliance on the minisock value, using dynamic information
available in the currently loaded CCID module.

This query function is then used to
 (a) provide the getsockopt part for getting/setting CCIDs via sockopts;
 (b) replace the current test for "which CCID is in use" in probe.c.

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, 2 insertions, 5 deletions

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 49ba8d5ec4b5..37731da41481 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -74,14 +74,11 @@ static void printl(const char *fmt, ...)
 static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
                          struct msghdr *msg, size_t size)
 {
-        const struct dccp_minisock *dmsk = dccp_msk(sk);
         const struct inet_sock *inet = inet_sk(sk);
-        const struct ccid3_hc_tx_sock *hctx;
+        struct ccid3_hc_tx_sock *hctx = NULL;
 
-        if (dmsk->dccpms_tx_ccid == DCCPC_CCID3)
+        if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3)
                 hctx = ccid3_hc_tx_sk(sk);
-        else
-                hctx = NULL;
 
         if (port == 0 || ntohs(inet->dport) == port ||
             ntohs(inet->sport) == port) {