diff options
Diffstat (limited to 'net/dccp/probe.c')
-rw-r--r-- | net/dccp/probe.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 37731da41481..dc328425fa20 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c | |||
@@ -75,26 +75,25 @@ 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->inet_dport) == port || |
84 | ntohs(inet->sport) == port) { | 84 | ntohs(inet->inet_sport) == port) { |
85 | if (hctx) | 85 | if (hc) |
86 | printl("%pI4:%u %pI4:%u %d %d %d %d %u " | 86 | printl("%pI4:%u %pI4:%u %d %d %d %d %u %llu %llu %d\n", |
87 | "%llu %llu %d\n", | 87 | &inet->inet_saddr, ntohs(inet->inet_sport), |
88 | &inet->saddr, ntohs(inet->sport), | 88 | &inet->inet_daddr, ntohs(inet->inet_dport), size, |
89 | &inet->daddr, ntohs(inet->dport), size, | 89 | hc->tx_s, hc->tx_rtt, hc->tx_p, |
90 | hctx->ccid3hctx_s, hctx->ccid3hctx_rtt, | 90 | hc->tx_x_calc, hc->tx_x_recv >> 6, |
91 | hctx->ccid3hctx_p, hctx->ccid3hctx_x_calc, | 91 | hc->tx_x >> 6, hc->tx_t_ipi); |
92 | hctx->ccid3hctx_x_recv >> 6, | ||
93 | hctx->ccid3hctx_x >> 6, hctx->ccid3hctx_t_ipi); | ||
94 | else | 92 | else |
95 | printl("%pI4:%u %pI4:%u %d\n", | 93 | printl("%pI4:%u %pI4:%u %d\n", |
96 | &inet->saddr, ntohs(inet->sport), | 94 | &inet->inet_saddr, ntohs(inet->inet_sport), |
97 | &inet->daddr, ntohs(inet->dport), size); | 95 | &inet->inet_daddr, ntohs(inet->inet_dport), |
96 | size); | ||
98 | } | 97 | } |
99 | 98 | ||
100 | jprobe_return(); | 99 | jprobe_return(); |