Revert "vdpa/mlx5: Fix rule forwarding VLAN to TIR"

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2169174

Upstream Status: RHEL only

SVQ can not work with vlan filtering and support VLAN in SVQ is not a
high priority now, so need to revert these commit in rhel9.2

This reverts commit d119215.

Signed-off-by: Cindy Lu <lulu@redhat.com>

Author: lulu-github-name

drivers/vdpa/mlx5/net/mlx5_vnet.c

@@ -1468,13 +1468,11 @@ static int mlx5_vdpa_add_mac_vlan_rules(struct mlx5_vdpa_net *ndev, u8 *mac,
 	dmac_v = MLX5_ADDR_OF(fte_match_param, headers_v, outer_headers.dmac_47_16);
 	eth_broadcast_addr(dmac_c);
 	ether_addr_copy(dmac_v, mac);
-	if (ndev->mvdev.actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VLAN)) {
-		MLX5_SET(fte_match_set_lyr_2_4, headers_c, cvlan_tag, 1);
-		MLX5_SET_TO_ONES(fte_match_set_lyr_2_4, headers_c, first_vid);
-	}
+	MLX5_SET(fte_match_set_lyr_2_4, headers_c, cvlan_tag, 1);
 	if (tagged) {
 		MLX5_SET(fte_match_set_lyr_2_4, headers_v, cvlan_tag, 1);
-		MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_vid, vid);
+		MLX5_SET_TO_ONES(fte_match_set_lyr_2_4, headers_c, first_vid);
+		MLX5_SET(fte_match_set_lyr_2_4, headers_c, first_vid, vid);
 	}
 	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
 	dest.type = MLX5_FLOW_DESTINATION_TYPE_TIR;