Commit 803f3e22 authored by Alexey Kodanev's avatar Alexey Kodanev Committed by David S. Miller

ipv4: mpls: fix mpls_xmit for iptunnel

When using mpls over gre/gre6 setup, rt->rt_gw4 address is not set, the
same for rt->rt_gw_family.  Therefore, when rt->rt_gw_family is checked
in mpls_xmit(), neigh_xmit() call is skipped. As a result, such setup
doesn't work anymore.

This issue was found with LTP mpls03 tests.

Fixes: 1550c171 ("ipv4: Prepare rtable for IPv6 gateway")
Signed-off-by: default avatarAlexey Kodanev <alexey.kodanev@oracle.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b5f6841
...@@ -133,12 +133,12 @@ static int mpls_xmit(struct sk_buff *skb) ...@@ -133,12 +133,12 @@ static int mpls_xmit(struct sk_buff *skb)
mpls_stats_inc_outucastpkts(out_dev, skb); mpls_stats_inc_outucastpkts(out_dev, skb);
if (rt) { if (rt) {
if (rt->rt_gw_family == AF_INET) if (rt->rt_gw_family == AF_INET6)
err = neigh_xmit(NEIGH_ARP_TABLE, out_dev, &rt->rt_gw4,
skb);
else if (rt->rt_gw_family == AF_INET6)
err = neigh_xmit(NEIGH_ND_TABLE, out_dev, &rt->rt_gw6, err = neigh_xmit(NEIGH_ND_TABLE, out_dev, &rt->rt_gw6,
skb); skb);
else
err = neigh_xmit(NEIGH_ARP_TABLE, out_dev, &rt->rt_gw4,
skb);
} else if (rt6) { } else if (rt6) {
if (ipv6_addr_v4mapped(&rt6->rt6i_gateway)) { if (ipv6_addr_v4mapped(&rt6->rt6i_gateway)) {
/* 6PE (RFC 4798) */ /* 6PE (RFC 4798) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment