mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
ipv4: Prepare rtable for IPv6 gateway
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 <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
bdf0046771
commit
1550c17193
13 changed files with 57 additions and 45 deletions
|
|
@ -137,10 +137,13 @@ static int mpls_xmit(struct sk_buff *skb)
|
|||
|
||||
mpls_stats_inc_outucastpkts(out_dev, skb);
|
||||
|
||||
if (rt)
|
||||
err = neigh_xmit(NEIGH_ARP_TABLE, out_dev, &rt->rt_gateway,
|
||||
skb);
|
||||
else if (rt6) {
|
||||
if (rt) {
|
||||
if (rt->rt_gw_family == AF_INET)
|
||||
err = neigh_xmit(NEIGH_ARP_TABLE, out_dev, &rt->rt_gw4,
|
||||
skb);
|
||||
else
|
||||
err = -EAFNOSUPPORT;
|
||||
} else if (rt6) {
|
||||
if (ipv6_addr_v4mapped(&rt6->rt6i_gateway)) {
|
||||
/* 6PE (RFC 4798) */
|
||||
err = neigh_xmit(NEIGH_ARP_TABLE, out_dev, &rt6->rt6i_gateway.s6_addr32[3],
|
||||
|
|
|
|||
Loading…
Reference in a new issue