diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2009-10-04 20:53:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-07 16:51:24 -0400 |
commit | 996ccf49005662ee7fee38a45be5cb27bf370b1d (patch) | |
tree | 5aeea073a9e399ca7536f03f23dc48860047687a /net/dccp/probe.c | |
parent | 77d2dd93742222973d253443d98ab8402d641038 (diff) |
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 430d16fd6f5..5e6ec8b9b7b 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, | |||
75 | struct msghdr *msg, size_t size) | 75 | struct msghdr *msg, size_t size) |
76 | { | 76 | { |
77 | const struct inet_sock *inet = inet_sk(sk); | 77 | const struct inet_sock *inet = inet_sk(sk); |
78 | struct ccid3_hc_tx_sock *hctx = NULL; | 78 | struct ccid3_hc_tx_sock *hc = NULL; |
79 | 79 | ||
80 | if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3) | 80 | if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3) |
81 | hctx = ccid3_hc_tx_sk(sk); | 81 | hc = ccid3_hc_tx_sk(sk); |
82 | 82 | ||
83 | if (port == 0 || ntohs(inet->dport) == port || | 83 | if (port == 0 || ntohs(inet->dport) == port || |
84 | ntohs(inet->sport) == port) { | 84 | ntohs(inet->sport) == port) { |
85 | if (hctx) | 85 | if (hc) |
86 | printl("%pI4:%u %pI4:%u %d %d %d %d %u %llu %llu %d\n", | 86 | printl("%pI4:%u %pI4:%u %d %d %d %d %u %llu %llu %d\n", |
87 | &inet->saddr, ntohs(inet->sport), | 87 | &inet->saddr, ntohs(inet->sport), |
88 | &inet->daddr, ntohs(inet->dport), size, | 88 | &inet->daddr, ntohs(inet->dport), size, |
89 | hctx->tx_s, hctx->tx_rtt, hctx->tx_p, | 89 | hc->tx_s, hc->tx_rtt, hc->tx_p, |
90 | hctx->tx_x_calc, hctx->tx_x_recv >> 6, | 90 | hc->tx_x_calc, hc->tx_x_recv >> 6, |
91 | hctx->tx_x >> 6, hctx->tx_t_ipi); | 91 | hc->tx_x >> 6, hc->tx_t_ipi); |
92 | else | 92 | else |
93 | printl("%pI4:%u %pI4:%u %d\n", | 93 | printl("%pI4:%u %pI4:%u %d\n", |
94 | &inet->saddr, ntohs(inet->sport), | 94 | &inet->saddr, ntohs(inet->sport), |