diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2009-10-05 00:53:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-07 13:51:24 -0700 |
| commit | 996ccf49005662ee7fee38a45be5cb27bf370b1d (patch) | |
| tree | 5aeea073a9e399ca7536f03f23dc48860047687a /net/dccp/probe.c | |
| parent | 77d2dd93742222973d253443d98ab8402d641038 (diff) | |
| download | op-kernel-dev-996ccf49005662ee7fee38a45be5cb27bf370b1d.zip op-kernel-dev-996ccf49005662ee7fee38a45be5cb27bf370b1d.tar.gz | |
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: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/probe.c')
| -rw-r--r-- | net/dccp/probe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 430d16f..5e6ec8b 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -75,20 +75,20 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, size_t size) { 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) - hctx = ccid3_hc_tx_sk(sk); + hc = ccid3_hc_tx_sk(sk); if (port == 0 || ntohs(inet->dport) == port || ntohs(inet->sport) == port) { - if (hctx) + if (hc) printl("%pI4:%u %pI4:%u %d %d %d %d %u %llu %llu %d\n", &inet->saddr, ntohs(inet->sport), &inet->daddr, ntohs(inet->dport), size, - hctx->tx_s, hctx->tx_rtt, hctx->tx_p, - hctx->tx_x_calc, hctx->tx_x_recv >> 6, - hctx->tx_x >> 6, hctx->tx_t_ipi); + hc->tx_s, hc->tx_rtt, hc->tx_p, + hc->tx_x_calc, hc->tx_x_recv >> 6, + hc->tx_x >> 6, hc->tx_t_ipi); else printl("%pI4:%u %pI4:%u %d\n", &inet->saddr, ntohs(inet->sport), |
