]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tcp: fix a compile error in DBGUNDO()
authorEric Dumazet <edumazet@google.com>
Fri, 23 Sep 2016 00:54:00 +0000 (17:54 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 20 Nov 2016 01:17:34 +0000 (01:17 +0000)
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>
net/ipv4/tcp_input.c

index d3b64bfedd1891583702f49cf28ac7c8369fda7c..50023e8af6686211cb7ac971a0a20c6a722bd03d 100644 (file)
@@ -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);