diff options
author | David Ahern <dsahern@kernel.org> | 2022-04-13 11:43:20 -0600 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-04-15 14:27:30 -0700 |
commit | db53cd3d88dc328dea2e968c9c8d3b4294a8a674 (patch) | |
tree | a4478d8286c17d1a9a228a07ac69aac30e6e4563 /drivers | |
parent | 83daab06252ee5d0e1f4373ff28b79304945fc19 (diff) | |
download | linux-stable-db53cd3d88dc328dea2e968c9c8d3b4294a8a674.tar.gz linux-stable-db53cd3d88dc328dea2e968c9c8d3b4294a8a674.tar.bz2 linux-stable-db53cd3d88dc328dea2e968c9c8d3b4294a8a674.zip |
net: Handle l3mdev in ip_tunnel_init_flow
Ido reported that the commit referenced in the Fixes tag broke
a gre use case with dummy devices. Add a check to ip_tunnel_init_flow
to see if the oif is an l3mdev port and if so set the oif to 0 to
avoid the oif comparison in fib_lookup_good_nhc.
Fixes: 40867d74c374 ("net: Add l3mdev index to flow struct and avoid oif reset for port devices")
Reported-by: Ido Schimmel <idosch@idosch.org>
Signed-off-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c index b73466470f75..fe663b0ab708 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c @@ -423,7 +423,7 @@ mlxsw_sp_span_gretap4_route(const struct net_device *to_dev, parms = mlxsw_sp_ipip_netdev_parms4(to_dev); ip_tunnel_init_flow(&fl4, parms.iph.protocol, *daddrp, *saddrp, - 0, 0, parms.link, tun->fwmark, 0); + 0, 0, dev_net(to_dev), parms.link, tun->fwmark, 0); rt = ip_route_output_key(tun->net, &fl4); if (IS_ERR(rt)) |