nfsd4.1: common slot allocation size calculation

[safe/jmp/linux-2.6] / net / dccp / probe.c

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 49ba8d5..37731da 100644 (file)
--- 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) {