Commit 996ccf49 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller

dccp ccid-3: Remove CCID naming redundancy 2/2

This continues the previous patch, by applying the same change to CCID-3.
Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77d2dd93
This diff is collapsed.
...@@ -75,20 +75,20 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk, ...@@ -75,20 +75,20 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
struct msghdr *msg, size_t size) struct msghdr *msg, size_t size)
{ {
const struct inet_sock *inet = inet_sk(sk); const struct inet_sock *inet = inet_sk(sk);
struct ccid3_hc_tx_sock *hctx = NULL; struct ccid3_hc_tx_sock *hc = NULL;
if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3) if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3)
hctx = ccid3_hc_tx_sk(sk); hc = ccid3_hc_tx_sk(sk);
if (port == 0 || ntohs(inet->dport) == port || if (port == 0 || ntohs(inet->dport) == port ||
ntohs(inet->sport) == port) { ntohs(inet->sport) == port) {
if (hctx) if (hc)
printl("%pI4:%u %pI4:%u %d %d %d %d %u %llu %llu %d\n", printl("%pI4:%u %pI4:%u %d %d %d %d %u %llu %llu %d\n",
&inet->saddr, ntohs(inet->sport), &inet->saddr, ntohs(inet->sport),
&inet->daddr, ntohs(inet->dport), size, &inet->daddr, ntohs(inet->dport), size,
hctx->tx_s, hctx->tx_rtt, hctx->tx_p, hc->tx_s, hc->tx_rtt, hc->tx_p,
hctx->tx_x_calc, hctx->tx_x_recv >> 6, hc->tx_x_calc, hc->tx_x_recv >> 6,
hctx->tx_x >> 6, hctx->tx_t_ipi); hc->tx_x >> 6, hc->tx_t_ipi);
else else
printl("%pI4:%u %pI4:%u %d\n", printl("%pI4:%u %pI4:%u %d\n",
&inet->saddr, ntohs(inet->sport), &inet->saddr, ntohs(inet->sport),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment