Revert "net/mlx5e: Fail attempt to offload e-switch TC flows"

hulk inclusion
category: bugfix
bugzilla: 6105
CVE: NA

-------------------------------------------------

Patch "net/mlx5e: Fail attempt to offload e-switch TC flows"
depends on another patch "net/mlx5e: Use dedicated uplink
vport netdev representor", the depended patch isn't a bugfix
and it has too many conflicts with present code, so we'd
better revert this patch.
Signed-off-by: NKeefe LIU <liuqifa@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

@@ -924,15 +924,6 @@ static const struct net_device_ops mlx5e_netdev_ops_rep = {
 	.ndo_change_mtu          = mlx5e_change_rep_mtu,
 };
 
-bool mlx5e_eswitch_rep(struct net_device *netdev)
-{
-	if (netdev->netdev_ops == &mlx5e_netdev_ops_vf_rep ||
-	    netdev->netdev_ops == &mlx5e_netdev_ops_uplink_rep)
-		return true;
-
-	return false;
-}
-
 static void mlx5e_build_rep_params(struct mlx5_core_dev *mdev,
 				   struct mlx5e_params *params, u16 mtu)
 {

drivers/net/ethernet/mellanox/mlx5/core/en_rep.h

@@ -158,9 +158,6 @@ void mlx5e_rep_encap_entry_detach(struct mlx5e_priv *priv,
 				  struct mlx5e_encap_entry *e);
 
 void mlx5e_rep_queue_neigh_stats_work(struct mlx5e_priv *priv);
-
-bool mlx5e_eswitch_rep(struct net_device *netdev);
-
 #else /* CONFIG_MLX5_ESWITCH */
 static inline void mlx5e_register_vport_reps(struct mlx5e_priv *priv) {}
 static inline void mlx5e_unregister_vport_reps(struct mlx5e_priv *priv) {}

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

@@ -2721,10 +2721,6 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, struct tcf_exts *exts,
 			    is_merged_eswitch_dev(priv, out_dev)) {
 				action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
 					  MLX5_FLOW_CONTEXT_ACTION_COUNT;
-
-				if (!mlx5e_eswitch_rep(out_dev))
-					return -EOPNOTSUPP;
-
 				out_priv = netdev_priv(out_dev);
 				rpriv = out_priv->ppriv;
 				attr->out_rep[attr->out_count] = rpriv->rep;