Message ID | 1558179958-6268-1-git-send-email-wenxu@ucloud.cn |
---|---|
State | Awaiting Upstream |
Delegated to: | David Miller |
Headers | show |
Series | [v3] net/mlx5e: Add bonding device for indr block to offload the packet received from bonding device | expand |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 5283e16..883ade4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -813,6 +813,7 @@ static int mlx5e_nic_rep_netdevice_event(struct notifier_block *nb, struct net_device *netdev = netdev_notifier_info_to_dev(ptr); if (!mlx5e_tc_tun_device_to_offload(priv, netdev) && + !netif_is_lag_master(netdev) && !is_vlan_dev(netdev)) return NOTIFY_OK; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 31cd02f..7bf9b3d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -2886,6 +2886,9 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, if (err) return err; } + if (netif_is_lag_master(parse_attr->filter_dev) && + uplink_upper != parse_attr->filter_dev) + return -EOPNOTSUPP; if (!mlx5e_eswitch_rep(out_dev)) return -EOPNOTSUPP;