OSDN Git Service

net: Replace nhc_has_gw with nhc_gw_family
authorDavid Ahern <dsahern@gmail.com>
Fri, 5 Apr 2019 23:30:26 +0000 (16:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Apr 2019 22:22:40 +0000 (15:22 -0700)
commitbdf004677107e3b847c5db09c9fbf8edefa24996
treec0df291ae563fc3a8ea801243a77b77a9334ea61
parent71df5777aaaeff673c242a49b945b1b96fe81718
net: Replace nhc_has_gw with nhc_gw_family

Allow the gateway in a fib_nh_common to be from a different address
family than the outer fib{6}_nh. To that end, replace nhc_has_gw with
nhc_gw_family and update users of nhc_has_gw to check nhc_gw_family.
Now nhc_family is used to know if the nh_common is part of a fib_nh
or fib6_nh (used for container_of to get to route family specific data),
and nhc_gw_family represents the address family for the gateway.

Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
include/net/ip6_route.h
include/net/ip_fib.h
include/trace/events/fib.h
net/core/filter.c
net/ipv4/fib_semantics.c
net/ipv4/route.c
net/ipv6/addrconf.c
net/ipv6/ip6_fib.c
net/ipv6/route.c