aboutsummaryrefslogtreecommitdiff
path: root/net/dccp/probe.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2008-09-04 07:30:19 +0200
committerGerrit Renker <gerrit@erg.abdn.ac.uk>2008-09-04 07:45:33 +0200
commit842d1ef14ff37e9611eab479f31a0d74c1a5c4c0 (patch)
treec6b6a6a26bb20ad0f167bb65915bfd6590b1aae8 /net/dccp/probe.c
parent1fb87509606cb19f5f603e54c28af7da149049f3 (diff)
dccp ccid-3: Remove ccid3hc{tx,rx}_ prefixes
This patch does the same for CCID-3 as the previous patch for CCID-2: s#ccid3hctx_##g; s#ccid3hcrx_##g; plus manual editing to retain consistency. Please note: expanded the fields of the `struct tfrc_tx_info' in the hc_tx_sock, since using short #define identifiers is not a good idea. The only place where this embedded struct was used is ccid3_hc_tx_getsockopt(). Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Diffstat (limited to 'net/dccp/probe.c')
-rw-r--r--net/dccp/probe.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 9ca783d7467..a87fd4fc1b3 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -87,10 +87,8 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
"%llu %llu %d\n",
NIPQUAD(inet->saddr), ntohs(inet->sport),
NIPQUAD(inet->daddr), ntohs(inet->dport), size,
- hctx->ccid3hctx_s, hctx->ccid3hctx_rtt,
- hctx->ccid3hctx_p, hctx->ccid3hctx_x_calc,
- hctx->ccid3hctx_x_recv >> 6,
- hctx->ccid3hctx_x >> 6, hctx->ccid3hctx_t_ipi);
+ hctx->s, hctx->rtt, hctx->p, hctx->x_calc,
+ hctx->x_recv >> 6, hctx->x >> 6, hctx->t_ipi);
else
printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d\n",
NIPQUAD(inet->saddr), ntohs(inet->sport),