diff options
| author | Petr Machata | 2018-07-10 09:02:59 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-07-12 08:10:19 +0200 |
| commit | b5de82f3dfbebc2d1b6db72c68f119a1e0427ca8 (patch) | |
| tree | 65612105eca58cee46fa24ce4f5bee81ef05984b /drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c | |
| parent | net: Add lag.h, net_lag_port_dev_txable() (diff) | |
| download | kernel-qcow2-linux-b5de82f3dfbebc2d1b6db72c68f119a1e0427ca8.tar.gz kernel-qcow2-linux-b5de82f3dfbebc2d1b6db72c68f119a1e0427ca8.tar.xz kernel-qcow2-linux-b5de82f3dfbebc2d1b6db72c68f119a1e0427ca8.zip | |
mlxsw: spectrum_span: Change LAG lower selection
When offloading mirror-to-gretap, mlxsw needs to preroute the path that
the encapsulated packet will take. That path may include a LAG device
above a front panel port. So far, mlxsw resolved the path to the first
up front panel slave of the LAG interface, but that only reflects
administrative state of the port. It neglects to consider whether the
port actually has a carrier, and what the LACP state is.
So instead of checking upness of the device, check carrier state and
txability.
Signed-off-by: Petr Machata <petrm@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c index 3d187d88cc7c..e42d640cddab 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c @@ -36,6 +36,7 @@ #include <linux/list.h> #include <net/arp.h> #include <net/gre.h> +#include <net/lag.h> #include <net/ndisc.h> #include <net/ip6_tunnel.h> @@ -254,7 +255,9 @@ mlxsw_sp_span_entry_lag(struct net_device *lag_dev) struct list_head *iter; netdev_for_each_lower_dev(lag_dev, dev, iter) - if ((dev->flags & IFF_UP) && mlxsw_sp_port_dev_check(dev)) + if (netif_carrier_ok(dev) && + net_lag_port_dev_txable(dev) && + mlxsw_sp_port_dev_check(dev)) return dev; return NULL; |