Commit 45e7d4c0 authored by Eli Britstein's avatar Eli Britstein Committed by Saeed Mahameed
Browse files

net/mlx5e: Support tagged tunnel over bond 



Stacked devices like bond interface may have a VLAN device on top of
them. Detect lag state correctly under this condition, and return the
correct routed net device, according to it the encap header is built.

Fixes: e32ee6c7 ("net/mlx5e: Support tunnel encap over tagged Ethernet")
Signed-off-by: default avatarEli Britstein <elibr@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 47c9d2c9

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+6 −5
Original line number Diff line number Diff line
@@ -11,24 +11,25 @@ static int get_route_and_out_devs(struct mlx5e_priv *priv, 
				  struct net_device **route_dev,

				  struct net_device **out_dev)

{

	struct net_device *uplink_dev, *uplink_upper, *real_dev;

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

	struct net_device *uplink_dev, *uplink_upper;

	bool dst_is_lag_dev;



	real_dev = is_vlan_dev(dev) ? vlan_dev_real_dev(dev) : dev;

	uplink_dev = mlx5_eswitch_uplink_get_proto_dev(esw, REP_ETH);

	uplink_upper = netdev_master_upper_dev_get(uplink_dev);

	dst_is_lag_dev = (uplink_upper &&

			  netif_is_lag_master(uplink_upper) &&

			  dev == uplink_upper &&

			  real_dev == uplink_upper &&

			  mlx5_lag_is_sriov(priv->mdev));



	/* if the egress device isn't on the same HW e-switch or

	 * it's a LAG device, use the uplink

	 */

	if (!netdev_port_same_parent_id(priv->netdev, dev) ||

	if (!netdev_port_same_parent_id(priv->netdev, real_dev) ||

	    dst_is_lag_dev) {

		*route_dev = uplink_dev;

		*out_dev = *route_dev;

		*route_dev = dev;

		*out_dev = uplink_dev;

	} else {

		*route_dev = dev;

		if (is_vlan_dev(*route_dev))

CRA Git | Maintained and supported by SUSTech CRA and CCSE