summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2016-09-22 17:54:00 -0700
committerBen Hutchings <ben@decadent.org.uk>2016-11-20 01:17:34 +0000
commit1ae83f8c0d2714a1f934ecb656fd5ff6a4a486c1 (patch)
tree4de09207eeab7ed03f11745ee96f0820154893a6 /net
parentf1790ee2d43355e0d1cf9392a5de8bb47e016540 (diff)
downloadlinux-stable-1ae83f8c0d2714a1f934ecb656fd5ff6a4a486c1.tar.gz
linux-stable-1ae83f8c0d2714a1f934ecb656fd5ff6a4a486c1.tar.bz2
linux-stable-1ae83f8c0d2714a1f934ecb656fd5ff6a4a486c1.zip
tcp: fix a compile error in DBGUNDO()
commit 019b1c9fe32a2a32c1153e31375f87ec3e591273 upstream. If DBGUNDO() is enabled (FASTRETRANS_DEBUG > 1), a compile error will happen, since inet6_sk(sk)->daddr became sk->sk_v6_daddr Fixes: efe4208f47f9 ("ipv6: make lookups simpler and faster") Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_input.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index d3b64bfedd18..50023e8af668 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2316,10 +2316,9 @@ static void DBGUNDO(struct sock *sk, const char *msg)
}
#if IS_ENABLED(CONFIG_IPV6)
else if (sk->sk_family == AF_INET6) {
- struct ipv6_pinfo *np = inet6_sk(sk);
pr_debug("Undo %s %pI6/%u c%u l%u ss%u/%u p%u\n",
msg,
- &np->daddr, ntohs(inet->inet_dport),
+ &sk->sk_v6_daddr, ntohs(inet->inet_dport),
tp->snd_cwnd, tcp_left_out(tp),
tp->snd_ssthresh, tp->prior_ssthresh,
tp->packets_out);