diff options
author | Mark Brown | 2019-05-20 12:54:21 +0200 |
---|---|---|
committer | Mark Brown | 2019-05-20 12:54:21 +0200 |
commit | eceb995e04b74204c73f9dd0ccb19061d5082063 (patch) | |
tree | 265d09722dbaaa4a4c97619d763a40d2be954f16 /drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c | |
parent | spi: tegra114: add support for TX and RX trimmers (diff) | |
parent | Linux 5.2-rc1 (diff) | |
download | kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.gz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.xz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.zip |
Merge tag 'v5.2-rc1' into spi-5.3
Linux 5.2-rc1
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c index 536c23c578c3..560a60e522f9 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c @@ -316,7 +316,11 @@ mlxsw_sp_span_gretap4_route(const struct net_device *to_dev, dev = rt->dst.dev; *saddrp = fl4.saddr; - *daddrp = rt->rt_gateway; + if (rt->rt_gw_family == AF_INET) + *daddrp = rt->rt_gw4; + /* can not offload if route has an IPv6 gateway */ + else if (rt->rt_gw_family == AF_INET6) + dev = NULL; out: ip_rt_put(rt); |