xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv4: Prepare rtable for IPv6 gateway

Browse Source 
To allow the gateway to be either an IPv4 or IPv6 address, remove
rt_uses_gateway from rtable and replace with rt_gw_family. If
rt_gw_family is set it implies rt_uses_gateway. Rename rt_gateway
to rt_gw4 to represent the IPv4 version.

Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern
2019-04-05 16:30:27 -07:00
committed by David S. Miller
parent bdf0046771
commit 1550c17193
13 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/net/route.h
View File

@@ -55,12 +55,12 @@ struct rtable {
unsigned int rt_flags;
__u16 rt_type;
__u8 rt_is_input;
__u8 rt_uses_gateway;
u8 rt_gw_family;
int rt_iif;
/* Info on neighbour */
__be32 rt_gateway;
__be32 rt_gw4;
/* Miscellaneous cached information */
u32 rt_mtu_locked:1,
@@ -82,8 +82,8 @@ static inline bool rt_is_output_route(const struct rtable *rt)
static inline __be32 rt_nexthop(const struct rtable *rt, __be32 daddr)
{
if (rt->rt_gateway)
return rt->rt_gateway;
if (rt->rt_gw_family == AF_INET)
return rt->rt_gw4;
return daddr;
}