]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
tcp: Remove use of inet6_sk and add IPv6 checks to tracepoint
authorDavid Ahern <dsahern@gmail.com>
Wed, 18 Oct 2017 15:17:29 +0000 (08:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Oct 2017 12:04:58 +0000 (13:04 +0100)
commit890056783c60ad9d0789774af2bc10fe4f27dd9d
tree18ae8de6682d9165606b5806c8ab8315717ba92b
parent17c918840fb07e5819f8df03345d7f4a5e5b791c
tcp: Remove use of inet6_sk and add IPv6 checks to tracepoint

386fd5da401d ("tcp: Check daddr_cache before use in tracepoint") was the
second version of the tracepoint fixup patch. This patch is the delta
between v2 and v3.  Specifically, remove the use of inet6_sk and check
sk_family as requested by Eric and add IS_ENABLED(CONFIG_IPV6) around
the use of sk_v6_rcv_saddr and sk_v6_daddr as done in sock_common (noted
by Cong).

Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Tested-by: Song Liu <songliubraving@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/trace/events/tcp.h