net/mlx5e: Simplify get_route_and_out_devs helper function

The helper function has "if" branches that do the same. Merge them to
simplify the code.

Signed-off-by: Eli Britstein <elibr@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
index a6a52806be453dc6caab06e263d6237d28e06c1c..ae439d95f5a3111253e7264b023ba48beb304481 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
@@ -40,20 +40,15 @@ static int get_route_and_out_devs(struct mlx5e_priv *priv,
        /* if the egress device isn't on the same HW e-switch or
         * it's a LAG device, use the uplink
         */
+       *route_dev = dev;
        if (!netdev_port_same_parent_id(priv->netdev, real_dev) ||
-           dst_is_lag_dev) {
-               *route_dev = dev;
+           dst_is_lag_dev || is_vlan_dev(*route_dev))
                *out_dev = uplink_dev;
-       } else {
-               *route_dev = dev;
-               if (is_vlan_dev(*route_dev))
-                       *out_dev = uplink_dev;
-               else if (mlx5e_eswitch_rep(dev) &&
-                        mlx5e_is_valid_eswitch_fwd_dev(priv, dev))
-                       *out_dev = *route_dev;
-               else
-                       return -EOPNOTSUPP;
-       }
+       else if (mlx5e_eswitch_rep(dev) &&
+                mlx5e_is_valid_eswitch_fwd_dev(priv, dev))
+               *out_dev = *route_dev;
+       else
+               return -EOPNOTSUPP;
 
        if (!(mlx5e_eswitch_rep(*out_dev) &&
              mlx5e_is_uplink_rep(netdev_priv(*out_dev))))