Merge pull request #24709 from keszybz/partition-table-constants

Expose various GPT UUIDs as public contants and link them up in docs

diff --git a/TODO b/TODO
index 2a9a700568b9be8c51b70ea73fb222d244f73215..d9c7c6df6ac5ed460aaf024789562e54828df535 100644 (file)
--- a/TODO
+++ b/TODO
@@ -115,6 +115,8 @@ Deprecations and removals:
 
 * ~2023: remove support for TPM_PCR_INDEX_KERNEL_PARAMETERS_COMPAT
 
+* H2 2023: remove support for unmerged-usr
+
 Features:
 
 * add ability to path_is_valid() to classify paths that refer to a dir from
@@ -187,11 +189,6 @@ Features:
 * sd-boot: include domain specific hash string in hash function for random seed
   plus sizes of everything. also include DMI/SMBIOS blob
 
-* accept a random seed via DMI/SMBIOS vendor string that is credited to the
-  kernel RNG, as cheap alternative to virtio-rng (problem: when credited it
-  must also be invalidated, question is if we can safely do that for SMBIOS
-  data structures)
-
 * sd-stub: invoke random seed logic the same way as in sd-boot, except if
   random seed EFI variable is already set. That way, the variable set will be
   set in all cases: if you just use sd-stub, or just sd-boot, or both.

diff --git a/docs/AUTOMATIC_BOOT_ASSESSMENT.md b/docs/AUTOMATIC_BOOT_ASSESSMENT.md
index c1173cf5093820337c1242b9e306a899426d3d85..c2a53f48dcf7a1c52762c4fef627a3e9026507c9 100644 (file)
--- a/docs/AUTOMATIC_BOOT_ASSESSMENT.md
+++ b/docs/AUTOMATIC_BOOT_ASSESSMENT.md
@@ -197,6 +197,14 @@ are a couple of recommendations.
    wrap them in a unit and order them after `boot-complete.target`, pulling it
    in.
 
+   Such unit would be typically wanted (or required) by one of the
+   [`bootup`](https://www.freedesktop.org/software/systemd/man/bootup.html) targets,
+   for example `multi-user.target`. To avoid potential loops due to conflicting
+   [default dependencies](https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Default%20Dependencies)
+   ordering, it is recommended to also add an explicit dependency (e.g.
+   `After=multi-user.target`) to the unit. This overrides the implicit ordering
+   and allows `boot-complete.target` to start after the given bootup target.
+
 ## FAQ
 
 1. *I have a service which — when it fails — should immediately cause a

diff --git a/docs/BOOT_LOADER_SPECIFICATION.md b/docs/BOOT_LOADER_SPECIFICATION.md
index 7a1aa2112bf21b1e4cf0fef5f8cdca4a2f9d6874..918803376828e8961922ce17befd4fb7326470da 100644 (file)
--- a/docs/BOOT_LOADER_SPECIFICATION.md
+++ b/docs/BOOT_LOADER_SPECIFICATION.md
@@ -8,12 +8,12 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 # The Boot Loader Specification
 
 This document defines a set of file formats and naming conventions that allow
-the boot loader configuration to be shared between multiple operating systems
+the boot loader menu entries to be shared between multiple operating systems
 and boot loaders installed on one device.
 
-Operating systems cooperatively manage a boot loader configuration directory
-that contains drop-in files, making multi-boot scenarios easy to support. Boot
-menu items are defined via a simple format that can be understood by different
+Operating systems cooperatively manage boot loader menu entry directories that
+contain drop-in files, making multi-boot scenarios easy to support. Boot menu
+entries are defined via two simple formats that can be understood by different
 boot loader implementations, operating systems, and userspace programs. The
 same scheme can be used to prepare OS media for cases where the firmware
 includes a boot loader.
@@ -23,72 +23,105 @@ includes a boot loader.
 The target audience for this specification is:
 
 * Boot loader developers, to write a boot loader that directly reads its
-  configuration from these files
+  menu entries from these files
 * Firmware developers, to add generic boot loading support directly to the
   firmware itself
 * OS installer developers, to create appropriate partitions and set up the
-  initial boot loader configuration
-* Distribution developers, to create appropriate configuration snippets when
+  initial boot loader menu entries
+* Distribution developers, to create appropriate menu entry snippets when
   installing or updating kernel packages
 * UI developers, to implement user interfaces that list and select among the
   available boot options
 
-## The Boot Partition
+## The Partitions
 
 Everything described below is located on one or two partitions. The boot loader
-or user-space programs reading the boot loader configuration should locate them
+or user-space programs reading the boot loader menu entries should locate them
 in the following manner:
 
 * On disks with an MBR partition table:
 
-  * The boot partition — partition with the type ID of 0xEA — shall be used
-    for boot loader configuration and entries.
+  * The boot partition — a partition with the type ID of `0xEA` — shall be used
+    as the single location for boot loader menu entries.
 
 * On disks with GPT (GUID Partition Table)
 
-  * The EFI System Partition (ESP for short) — a partition with GPT type GUID
-    of `c12a7328-f81f-11d2-ba4b-00a0c93ec93b` — should be used for boot loader
-    configuration and boot entries.
+  * The EFI System Partition (ESP for short) — a partition with a GPT type GUID
+    of `c12a7328-f81f-11d2-ba4b-00a0c93ec93b` — may be used as one of two locations for
+    boot loader menu entries.
 
   * Optionally, an Extended Boot Loader Partition (XBOOTLDR partition for
     short) — a partition with GPT type GUID of
-    `bc13c2ff-59e6-4262-a352-b275fd6f7172` — may be used as an additional
-    location for boot loader entries. This partition must be located on the
-    same disk as the ESP.
+    `bc13c2ff-59e6-4262-a352-b275fd6f7172` — may be used as the second of two
+    locations for boot loader menu entries. This partition must be located on
+    the same disk as the ESP.
 
-In the text below, `$BOOT` will be used to refer to (the root of) the first of
-the two partitions (the boot partition on MBR disks and the ESP on GPT disks),
-and `$XBOOTLDR` will be used to refer to (the root of) the optional second
-partition.
+There may be at most one partition of each of the types listed above on the
+same disk.
 
-An installer for the operating system should use this logic when selecting or
+**Note:** _These partitions are **shared** among all OS installations on the
+same disk. Instead of maintaining one boot partition per installed OS (as
+`/boot/` was traditionally handled), all installed OSes use the same place for
+boot loader menu entries._
+
+For systems where the firmware is able to read file systems directly, the ESP
+must — and the MBR boot and GPT XBOOTLDR partition should — be a file system
+readable by the firmware. For most systems this means VFAT (16 or 32
+bit). Applications accessing both partitions should hence not assume that
+fancier file system features such as symlinks, hardlinks, access control or
+case sensitivity are supported.
+
+### The `$BOOT` Partition Placeholder
+
+In the text below, the placeholder `$BOOT` will be used to refer to the
+partition determined as follows:
+
+ 1. On disks with an MBR partition table: → the boot partition, as described above
+
+ 2. On disks with a GPT partition table: → the XBOOTLDR partition if it exists
+
+ 3. Otherwise, on disks with a GPT partition table: → the ESP
+
+`$BOOT` is the *primary* place to put boot menu entry resources into, but
+typically not the only one. Most importantly, boot loaders should also pick up
+menu entries from the ESP, even if XBOOTLDR exists (for details see below).
+
+### Creating These Partitions
+
+An installer for an operating system should use this logic when selecting or
 creating partitions:
 
-  * If `$BOOT` is not found, a new suitably sized partition (let's say 500MB)
-    should be created, matching the characteristics described above. On disks
-    with GPT, only the ESP partition without the XBOOTLDR partition should be
-    created.
+  * If a boot partition (in case of MBR) or an XBOOTLDR partition (in case of
+    GPT) already exists it should be used as `$BOOT` and used as primary
+    location to place boot loader menu resources in.
 
-  * If the OS is installed on a disk with GPT and the ESP partition is found
-    but is too small, a new suitably sized (let's say 500MB) XBOOTLDR partition
-    shall be created.
+  * Otherwise, if on GPT and an ESP is found and it is large enough (let's say
+    at least 1G) it should be used as `$BOOT` and used as primary location to
+    place boot loader menu resources in.
 
-Those file systems shall be determined during _installation time_, and an fstab
-entry may be created. If only one partition is used, it should be mounted on
-`/boot/`. If both XBOOTLDR partition and the ESP are used, they should be
-mounted on `/boot` and `/efi`, or on `/boot` and `/boot/efi`.
+  * Otherwise, if on GPT and neither XBOOTLDR nor ESP exist, an ESP should be
+    created of the appropriate size and be used as `$BOOT`, and used as primary
+    location to place boot loader menu resources in.
 
-**Note:** _Those file systems are **shared** among all OS installations on the
-system. Instead of maintaining one boot partition per installed OS (as `/boot/`
-was traditionally handled), all installed OSes use the same place for boot-time
-configuration._
+  * Otherwise, a boot partition (in case of MBR) or XBOOTLDR partition (in case
+    of GPT) should be created of an appropriate size, and be used as `$BOOT`,
+    and used as primary location to place boot loader menu resources in.
 
-For systems where the firmware is able to read file systems directly, the ESP
-must — and the XBOOTLDR partition should — be a file system readable by the
-firmware. For most systems this means VFAT (16 or 32 bit). Applications
-accessing both partitions should hence not assume that fancier file system
-features such as symlinks, hardlinks, access control or case sensitivity are
-supported.
+These partitions shall be determined during _installation time_, and
+`/etc/fstab` entries may be created.
+
+### Mount Points
+
+It is recommended to mount `$BOOT` to `/boot/`, and the ESP to `/efi/`. If
+`$BOOT` and the ESP are the same, then either a bind mount or a symlink should
+be established making the partition available under both paths.
+
+(Mounting the ESP to `/boot/efi/`, as was traditionally done, is not
+recommended. Such a nested setup complicates an implementation via direct
+`autofs` mounts — as implemented by `systemd` for example —, as establishing
+the inner `autofs` will trigger the outer one. Mounting the two partitions via
+`autofs` is recommended because the simple VFAT file system has weak data
+integrity properties and should remain unmounted whenever possible.)
 
 ## Boot Loader Entries
 
@@ -108,37 +141,43 @@ from the user. Only entries matching the feature set of boot loader and system
 shall be considered and displayed. This allows image builders to put together
 images that transparently support multiple different architectures.
 
-Note that the boot partitions are not supposed to be the exclusive territory of
-this specification. This specification only defines semantics of the `/loader/`
-directory inside the file system (see below), but it doesn't intend to define
-ownership of the whole file system. Boot loaders, firmware, and other software
-implementing this specification may choose to place other files and directories
-in the same file system. For example, boot loaders that implement this
-specification might install their own boot code on the same partition; this is
-particularly common in the case of the ESP. Implementations of this specification
-must be able to operate correctly if files or directories other than `/loader/`
-are found in the top level directory. Implementations that add their own files
-or directories to the file systems should use well-named directories, to make
-name collisions between multiple users of the file system unlikely.
+Note that the three partitions described above are not supposed to be the
+exclusive territory of this specification. This specification only defines
+semantics of the `/loader/entries/` directory (along with the companion file
+`/loader/entries.srel`) and the `/EFI/Linux/` directory inside the file system,
+but it doesn't intend to define contents of the rest of the file system. Boot
+loaders, firmware, and other software implementing this specification may
+choose to place other files and directories in the same file system. For
+example, boot loaders that implement this specification might install their own
+boot code on the same partition; this is particularly common in the case of the
+ESP. Implementations of this specification must be able to operate correctly if
+files or directories other than `/loader/entries/` and `/EFI/Linux/` are found
+in the top level directory. Implementations that add their own files or
+directories to the file systems should use well-named directories, to make name
+collisions between multiple users of the file system unlikely.
 
 ### Type #1 Boot Loader Specification Entries
 
-`$ESP/loader/` is the main directory containing the configuration for the boot
-loader.
-
-**Note:** _In all cases the `/loader/` directory should be located directly in
-the root of the file system. Specifically, the `/loader/` directory should
-**not** be located under the `/EFI/` subdirectory on the ESP._
-
-`$BOOT/loader/entries/` and `$XBOOTLDR/loader/entries/` are the directories
-containing the drop-in snippets defining boot entries, one `.conf` file for
-each boot menu item. Each OS may provide one or more such entries. The boot
-loader should enumerate both directories and provide a merged list.
-
-The file name is used for identification of the boot item but shall never be
-presented to the user in the UI. The file name may be chosen freely but should
-be unique enough to avoid clashes between OS installations. More specifically,
-it is suggested to include the `entry-token` (see
+`/loader/entries/` in `$BOOT` is the primary directory containing Type #1
+drop-in snippets defining boot entries, one `.conf` file for each boot menu
+item. Each OS may provide one or more such entries.
+
+If the ESP is separate from `$BOOT` it may also contain a `/loader/entries/`
+directory, where the boot loader should look for boot entry snippets, as an
+additional source. The boot loader should enumerate both directories and
+present a merged list to the user. Note that this is done for compatibility
+only: while boot loaders should look in both places, OSes should only add their
+files to `$BOOT`.
+
+**Note:** _In all cases the `/loader/entries/` directory should be located
+directly in the root of the file system. Specifically, the `/loader/entries/`
+directory should **not** be located under the `/EFI/` subdirectory on the ESP._
+
+The file name of the boot entry snippets is used for identification of the boot
+item but shall never be presented to the user in the UI. The file name may be
+chosen freely but should be unique enough to avoid clashes between OS
+installations. More specifically, it is suggested to include the `entry-token`
+(see
 [kernel-install](https://www.freedesktop.org/software/systemd/man/kernel-install.html))
 or machine ID (see
 [/etc/machine-id](https://www.freedesktop.org/software/systemd/man/machine-id.html)),
@@ -155,9 +194,9 @@ set: ASCII upper and lower case characters, digits, "+", "-", "_" and ".".
 Also, the file names should have a length of at least one and at most 255
 characters (including the file name suffix).
 
-These configuration snippets shall be UNIX-style text files (i.e. lines
+These boot loader menu snippets shall be UNIX-style text files (i.e. lines
 separated by a single newline character), in the UTF-8 encoding. The
-configuration snippets are loosely inspired by Grub1's configuration syntax.
+boot loader menu snippets are loosely inspired by Grub1's configuration syntax.
 Lines beginning with "#" are used for comments and shall be ignored. The first
 word of a line is used as key and is separated by one or more spaces from the
 value.
@@ -202,16 +241,17 @@ The following keys are recognized:
 
   Example: `sort-key fedora`
 
-* `linux` is the Linux kernel to spawn and as a path relative to file system
-  root. It is recommended that every distribution creates a machine id and
-  version specific subdirectory and places its kernels and initial RAM disk
-  images there.
+* `linux` is the Linux kernel image to execute and takes a path relative to the
+  root of the file system containing the boot entry snippet itself. It is
+  recommended that every distribution creates an entry-token/machine-id and
+  version specific subdirectory and places its kernels and initrd images there
+  (see below).
 
   Example: `linux /6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/linux`
 
-* `initrd` is the initrd to use when executing the kernel. This key is
-  optional. This key may appear more than once in which case all specified
-  images are used, in the order they are listed.
+* `initrd` is the initrd `cpio` image to use when executing the kernel. This key
+  may appear more than once in which case all specified images are used, in the
+  order they are listed.
 
   Example: `initrd 6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/initrd`
 
@@ -220,7 +260,7 @@ The following keys are recognized:
 
 * `options` shall contain kernel parameters to pass to the Linux kernel to
   spawn. This key is optional and may appear more than once in which case all
-  specified parameters are used in the order they are listed.
+  specified parameters are combined in the order they are listed.
 
   Example: `options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2 quiet`
 
@@ -244,7 +284,7 @@ The following keys are recognized:
 
   Example: `architecture aa64`
 
-Each configuration drop-in snippet must include at least a `linux` or an `efi`
+Each boot loader menu entry drop-in snippet must include at least a `linux` or an `efi`
 key. Here is an example for a complete drop-in file:
 
     # /boot/loader/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
@@ -268,18 +308,27 @@ i.e. it is a good idea that both images shipped as UEFI PE images and those
 which are not don't make unnecessary assumption on the underlying firmware,
 i.e. don't hard depend on legacy BIOS calls or UEFI boot services.
 
-When Type #1 configuration snippets refer to other files (for `linux`,
+When Type #1 boot loader menu entry snippets refer to other files (for `linux`,
 `initrd`, `efi`, `devicetree`, and `devicetree-overlay`), those files must be
 located on the same partition, and the paths must be absolute paths relative to
 the root of that file system. The naming of those files can be chosen by the
-installer. A recommended scheme is described in the next section.
+installer. A recommended scheme is described in the next section. Paths should
+be normalized, i.e. not include `..`, `.` or a sequence of more than one
+`/`. Paths may be prefixed with a `/`, but this is optional and has the same
+effect as paths without it: all paths are always relative to the root directory
+of the partition they are referenced from.
+
+Even though the backing file system is typically case-insensitive (i.e. VFAT)
+it is strongly recommended to reference files in the casing actually used for
+the directories/files, so that placing these files on other file systems is
+still safe and robust.
 
 ### Recommended Directory Layout for Additional Files
 
 It is recommended to place the kernel and other other files comprising a single
 boot loader entry in a separate directory:
 `/<entry-token-or-machine-id>/<version>/`. This naming scheme uses the same
-elements as the boot loader configuration snippet, providing the same level of
+elements as the boot loader menu entry snippet, providing the same level of
 uniqueness.
 
 Example: `$BOOT/6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/linux`
@@ -292,8 +341,8 @@ because it is hard to avoid conflicts in a multi-boot installation.
 ### Standard-conformance Marker File
 
 Unfortunately, there are implementations of boot loading infrastructure that
-are also using the `/loader/entries/` directory, but installing files that do
-not follow this specification. In order to minimize confusion, a boot loader
+are also using the `/loader/entries/` directory, but install files that do not
+follow this specification. In order to minimize confusion, a boot loader
 implementation may place the file `/loader/entries.srel` next to the
 `/loader/entries/` directory containing the ASCII string `type1` (followed by a
 UNIX newline). Tools that need to determine whether an existing directory
@@ -306,13 +355,16 @@ does not exist, no assumptions should be made.
 ### Type #2 EFI Unified Kernel Images
 
 A unified kernel image is a single EFI PE executable combining an EFI stub
-loader, a kernel image, an initramfs image, and the kernel command line. See
-the description of the `--uefi` option in
-[dracut(8)](https://man7.org/linux/man-pages/man8/dracut.8.html). Such unified
-images are installed in the`$BOOT/EFI/Linux/` and `$XBOOTLDR/EFI/Linux/`
-directories and must have the extension `.efi`.
-Support for images of this type is of course specific to systems with EFI
-firmware. Ignore this section if you work on systems not supporting EFI.
+loader, a kernel image, an initrd image, and the kernel command line. See
+[systemd-stub(7)](https://www.freedesktop.org/software/systemd/man/systemd-stub.html)
+for details. The primary place for such unified images is the `/EFI/Linux/`
+directory in `$BOOT`. Operating systems should place unified EFI kernels only
+in the `$BOOT` partition. Boot loaders should also look in the `/EFI/Linux/` of
+the ESP — if it is different from `$BOOT` — and present a merged list of menu
+entries from both partitions. Regardless if placed in the primary or secondary
+location: the files must have the extension `.efi`.  Support for images of this
+type is of course specific to systems with EFI firmware. Ignore this section if
+you work on systems not supporting EFI.
 
 Type #2 file names should be chosen from the same restricted character set as
 Type #1 described above (but with the file name suffix of `.efi` instead of
@@ -322,7 +374,7 @@ Images of this type have the advantage that all metadata and payload that makes
 up the boot entry is contained in a single PE file that can be signed
 cryptographically as one for the purpose of EFI SecureBoot.
 
-A valid unified kernel image must contain two PE sections:
+A valid unified kernel image in the `/EFI/Linux/` directory must contain two PE sections:
 
 * `.cmdline` section with the kernel command line,
 * `.osrel` section with an embedded copy of the
@@ -339,42 +391,44 @@ On EFI, any such images shall be added to the list of valid boot entries.
 
 ### Additional Notes
 
-Note that these configurations snippets do not need to be the only
-configuration source for a boot loader. It may extend this list of entries with
-additional items from other configuration files (for example its own native
-configuration files) or automatically detected other entries without explicit
-configuration.
+Note that these boot entry snippets and unified kernels do not need to be the
+only menu entry sources for a boot loader. It may extend this list of
+entries with additional items from other configuration files (for example its
+own native configuration files) or automatically detected other entries without
+explicit configuration.
 
 To make this explicitly clear: this specification is designed with "free"
-operating systems in mind, starting Windows or macOS is out of focus with these
-configuration snippets, use boot-loader specific solutions for that. In the
-text above, if we say "OS" we hence imply "free", i.e. primarily Linux (though
-this could be easily be extended to the BSDs and whatnot).
+operating systems in mind, starting Windows or MacOS is out of focus with these
+boot loader menu entry snippets, use boot-loader specific solutions for
+that. In the text above, if we say "OS" we hence imply "free", i.e. primarily
+Linux (though this could be easily be extended to the BSDs and whatnot).
 
-Note that all paths used in the configuration snippets use a Unix-style "/" as
-path separator. This needs to be converted to an EFI-style "\\" separator in
-EFI boot loaders.
+Note that all paths used in the boot loader menu entry snippets use a
+Unix-style "/" as path separator. This needs to be converted to an EFI-style
+"\\" separator in EFI boot loaders.
 
 
 ## Locating Boot Entries
 
-A _boot loader_ locates `$BOOT` and `$XBOOTLDR`, then simply reads all the
-files `$BOOT/loader/entries/*.conf` and `$XBOOTLDR/loader/entries/*.conf`, and
-populates its boot menu. On EFI, it then extends this with any unified kernel
-images found in `$BOOT/EFI/Linux/*.efi` and `$XBOOTLDR/EFI/Linux/*.efi`. It may
-also add additional entries, for example a "Reboot into firmware" option.
-Optionally it may sort the menu based on the `sort-key`, `machine-id` and
-`version` fields, and possibly others. It uses the file name to identify
-specific items, for example in case it supports storing away default entry
-information somewhere. A boot loader should generally not modify these files.
+A _boot loader_ locates the XBOOTLDR partition and the ESP, then simply reads
+all the files `/loader/entries/*.conf` in them, and populates its boot menu
+(and handle gracefully if one of the two partitions is missing). On EFI, it
+then extends this with any unified kernel images found in `/EFI/Linux/*.efi` in
+the two partitions. It may also add additional entries, for example a "Reboot
+into firmware" option.  Optionally it may sort the menu based on the
+`sort-key`, `machine-id` and `version` fields, and possibly others. It uses the
+file name to identify specific items, for example in case it supports storing
+away default entry information somewhere. A boot loader should generally not
+modify these files.
 
 For "Boot Loader Specification Entries" (Type #1), the _kernel package
-installer_ installs the kernel and initrd images to `$XBOOTLDR` (if used) or
-`$BOOT`. It is recommended to place these files in a vendor and OS and
-installation specific directory. It then generates a configuration snippet,
-placing it in `$BOOT/loader/entries/xyz.conf`, with "xyz" as concatenation of
-machine id and version information (see above). The files created by a kernel
-package are tied to the kernel package and should be removed along with it.
+installer_ installs the kernel and initrd images to `$BOOT`. It is recommended
+to place these files in a vendor and OS and installation specific directory. It
+then generates a boot loader menu entry snippet, placing it in
+`$BOOT/loader/entries/xyz.conf`, with "xyz" as concatenation of
+entry-token/machine-id and version information (see above). The files created
+by a kernel package are tied to the kernel package and should be removed along
+with it.
 
 For "EFI Unified Kernel Images" (Type #2), the vendor or kernel package
 installer should create the combined image and drop it into
@@ -382,14 +436,16 @@ installer should create the combined image and drop it into
 removed along with it.
 
 A _UI application_ intended to show available boot options shall operate
-similarly to a boot loader, but might apply additional filters, for example by
-filtering the booted OS via the machine ID, or by suppressing all but the
-newest kernel versions.
+similarly to a boot loader (and thus search both `$BOOT` and the ESP if
+distinct), but might apply additional filters, for example by filtering the
+booted OS via the machine ID, or by suppressing all but the newest kernel
+versions.
 
 An _OS installer_ picks the right place for `$BOOT` as defined above (possibly
 creating a partition and file system for it) and creates the `/loader/entries/`
-directory in it. It then installs an appropriate boot loader that can read
-these snippets. Finally, it installs one or more kernel packages.
+directory and the `/loader/entries.srel` file in it (the latter only if the
+directory didn't exist yet). It then installs an appropriate boot loader that
+can read these snippets. Finally, it installs one or more kernel packages.
 
 ## Boot counting
 
@@ -403,7 +459,7 @@ boots is exhausted, the entry is marked as "bad".
 Which boots are "successful" is determined by the operating system. systemd
 provides a generic mechanism that can be extended with arbitrary checks and
 actions, see [Automatic Boot Assessment](AUTOMATIC_BOOT_ASSESSMENT.md), but the
-boot counting mechanism described in this specifaction can also be used with
+boot counting mechanism described in this specification can also be used with
 other implementations.
 
 The boot counting data is stored in the name of the boot loader entry. A boot
@@ -562,18 +618,18 @@ This specification brings the following advantages:
   interfering with the entries of other installed operating systems.
 
 * Drop-in directories are now pretty ubiquitous on Linux as an easy way to
-  extend configuration without having to edit, regenerate or manipulate
+  extend boot loader menus without having to edit, regenerate or manipulate
   configuration files. For the sake of uniformity, we should do the same for
   the boot menu.
 
-* Userspace code can sanely parse boot loader configuration which is essential
+* Userspace code can sanely parse boot loader menu entries which is essential
   with modern firmware which does not necessarily initialize USB keyboards
   during boot, which makes boot menus hard to reach for the user. If userspace
-  code can parse the boot loader configuration too, UI can be written that
+  code can parse the boot loader menu entries too, UI can be written that
   select a boot menu item to boot into before rebooting the machine, thus not
   requiring interactivity during early boot.
 
-* To unify and thus simplify configuration of the various boot loaders, which
+* To unify and thus simplify menu entries of the various boot loaders, which
   makes configuration of the boot loading process easier for users,
   administrators, and developers alike.
 
@@ -673,9 +729,9 @@ There are a couple of items that are out of focus for this specification:
 * Referencing kernels or initrds on other partitions other than the partition
   containing the Type #1 boot loader entry. This is by design, as specifying
   other partitions or devices would require a non-trivial language for denoting
-  device paths. In particular this means that on non-EFI systems configuration
-  snippets following this specification cannot be used to spawn other operating
-  systems (such as Windows).
+  device paths. In particular this means that on non-EFI systems boot loader
+  menu entry snippets following this specification cannot be used to spawn
+  other operating systems (such as Windows).
 
 
 ## Links

diff --git a/docs/CNAME b/docs/CNAME
deleted file mode 100644 (file)
index cdcf4d9..0000000
--- a/docs/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-systemd.io
\ No newline at end of file

diff --git a/hwdb.d/20-OUI.hwdb b/hwdb.d/20-OUI.hwdb
index c46086633cfc62e535c9a75ddb3171d4f3dd84f0..ff772346b9a8cb6809c0997f79d67b18f5e1dcd0 100644 (file)
--- a/hwdb.d/20-OUI.hwdb
+++ b/hwdb.d/20-OUI.hwdb
@@ -2427,7 +2427,7 @@ OUI:000326*
  ID_OUI_FROM_DATABASE=Iwasaki Information Systems Co., Ltd.
 
 OUI:000327*
- ID_OUI_FROM_DATABASE=ACT'L
+ ID_OUI_FROM_DATABASE=HMS Industrial Networks
 
 OUI:000328*
  ID_OUI_FROM_DATABASE=Mace Group, Inc.
@@ -2841,7 +2841,7 @@ OUI:0003B0*
  ID_OUI_FROM_DATABASE=Xsense Technology Corp.
 
 OUI:0003B1*
- ID_OUI_FROM_DATABASE=Hospira Inc.
+ ID_OUI_FROM_DATABASE=ICU Medical, Inc.
 
 OUI:0003B2*
  ID_OUI_FROM_DATABASE=Radware
@@ -6882,7 +6882,7 @@ OUI:00090E*
  ID_OUI_FROM_DATABASE=Helix Technology Inc.
 
 OUI:00090F*
- ID_OUI_FROM_DATABASE=Fortinet Inc.
+ ID_OUI_FROM_DATABASE=Fortinet, Inc.
 
 OUI:000910*
  ID_OUI_FROM_DATABASE=Simple Access Inc.
@@ -7032,7 +7032,7 @@ OUI:000940*
  ID_OUI_FROM_DATABASE=AGFEO GmbH & Co. KG
 
 OUI:000941*
- ID_OUI_FROM_DATABASE=Allied Telesis R&D Center K.K.
+ ID_OUI_FROM_DATABASE=Allied Telesis K.K.
 
 OUI:000942*
  ID_OUI_FROM_DATABASE=Wireless Technologies, Inc
@@ -8544,7 +8544,7 @@ OUI:000B39*
  ID_OUI_FROM_DATABASE=Keisoku Giken Co.,Ltd.
 
 OUI:000B3A*
- ID_OUI_FROM_DATABASE=PESA
+ ID_OUI_FROM_DATABASE=PESA Inc.
 
 OUI:000B3B*
  ID_OUI_FROM_DATABASE=devolo AG
@@ -9114,7 +9114,7 @@ OUI:000BF7*
  ID_OUI_FROM_DATABASE=NIDEK CO.,LTD
 
 OUI:000BF8*
- ID_OUI_FROM_DATABASE=Infinera
+ ID_OUI_FROM_DATABASE=Infinera, Inc.
 
 OUI:000BF9*
  ID_OUI_FROM_DATABASE=Gemstone Communications, Inc.
@@ -9828,7 +9828,7 @@ OUI:000CE5*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
 OUI:000CE6*
- ID_OUI_FROM_DATABASE=Fortinet Inc.
+ ID_OUI_FROM_DATABASE=Fortinet, Inc.
 
 OUI:000CE7*
  ID_OUI_FROM_DATABASE=MediaTek Inc.
@@ -12918,7 +12918,7 @@ OUI:0010EB*
  ID_OUI_FROM_DATABASE=SELSIUS SYSTEMS, INC.
 
 OUI:0010EC*
- ID_OUI_FROM_DATABASE=RPCG, LLC
+ ID_OUI_FROM_DATABASE=Embedded Planet
 
 OUI:0010ED*
  ID_OUI_FROM_DATABASE=SUNDANCE TECHNOLOGY, INC.
@@ -14475,7 +14475,7 @@ OUI:0012F2*
  ID_OUI_FROM_DATABASE=Brocade Communications Systems LLC
 
 OUI:0012F3*
- ID_OUI_FROM_DATABASE=connectBlue AB
+ ID_OUI_FROM_DATABASE=u-blox AG
 
 OUI:0012F4*
  ID_OUI_FROM_DATABASE=Belco International Co.,Ltd.
@@ -19935,7 +19935,7 @@ OUI:001A0E*
  ID_OUI_FROM_DATABASE=Cheng Uei Precision Industry Co.,Ltd
 
 OUI:001A0F*
- ID_OUI_FROM_DATABASE=Sistemas Avanzados de Control, S.A.
+ ID_OUI_FROM_DATABASE=ARTECHE GROUP
 
 OUI:001A10*
  ID_OUI_FROM_DATABASE=LUCENT TRANS ELECTRONICS CO.,LTD
@@ -20595,7 +20595,7 @@ OUI:001AEA*
  ID_OUI_FROM_DATABASE=Radio Terminal Systems Pty Ltd
 
 OUI:001AEB*
- ID_OUI_FROM_DATABASE=Allied Telesis R&D Center K.K.
+ ID_OUI_FROM_DATABASE=Allied Telesis K.K.
 
 OUI:001AEC*
  ID_OUI_FROM_DATABASE=Keumbee Electronics Co.,Ltd.
@@ -23898,7 +23898,7 @@ OUI:001E6F*
  ID_OUI_FROM_DATABASE=Magna-Power Electronics, Inc.
 
 OUI:001E70*
- ID_OUI_FROM_DATABASE=Cobham Antenna Systems
+ ID_OUI_FROM_DATABASE=Chelton Limited
 
 OUI:001E71*
  ID_OUI_FROM_DATABASE=MIrcom Group of Companies
@@ -30063,7 +30063,7 @@ OUI:00267E*
  ID_OUI_FROM_DATABASE=PARROT SA
 
 OUI:00267F*
- ID_OUI_FROM_DATABASE=Zenterio AB
+ ID_OUI_FROM_DATABASE=Oregan Networks Ltd.
 
 OUI:002680*
  ID_OUI_FROM_DATABASE=SIL3 Pty.Ltd
@@ -31373,6 +31373,9 @@ OUI:0030FE*
 OUI:0030FF*
  ID_OUI_FROM_DATABASE=DataFab Systems Inc.
 
+OUI:003126*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:003146*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -33143,6 +33146,9 @@ OUI:005C86*
 OUI:005CB1*
  ID_OUI_FROM_DATABASE=Gospell DIGITAL TECHNOLOGY CO., LTD
 
+OUI:005CC2*
+ ID_OUI_FROM_DATABASE=SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
+
 OUI:005D03*
  ID_OUI_FROM_DATABASE=Xilinx, Inc
 
@@ -37679,6 +37685,9 @@ OUI:00C164*
 OUI:00C1B1*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:00C28F*
+ ID_OUI_FROM_DATABASE=Allied Telesis K.K.
+
 OUI:00C2C6*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -37694,6 +37703,9 @@ OUI:00C3F4*
 OUI:00C52C*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:00C585*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:00C5DB*
  ID_OUI_FROM_DATABASE=Datatech Sistemas Digitales Avanzados SL
 
@@ -39599,15 +39611,24 @@ OUI:02CF1C*
 OUI:02E6D3*
  ID_OUI_FROM_DATABASE=NIXDORF COMPUTER CORP.
 
+OUI:040067*
+ ID_OUI_FROM_DATABASE=Stanley Black & Decker
+
 OUI:04021F*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
 OUI:0402CA*
  ID_OUI_FROM_DATABASE=Shenzhen Vtsonic Co.,ltd
 
+OUI:040312*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:0403D6*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
+OUI:0404B8*
+ ID_OUI_FROM_DATABASE=China Hualu Panasonic AVC Networks Co., LTD.
+
 OUI:0404EA*
  ID_OUI_FROM_DATABASE=Valens Semiconductor Ltd.
 
@@ -39800,6 +39821,9 @@ OUI:043110*
 OUI:0432F4*
  ID_OUI_FROM_DATABASE=Partron
 
+OUI:04331F*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:043385*
  ID_OUI_FROM_DATABASE=Nanchang BlackShark Co.,Ltd.
 
@@ -40142,6 +40166,9 @@ OUI:0481AE*
 OUI:04848A*
  ID_OUI_FROM_DATABASE=7INOVA TECHNOLOGY LIMITED
 
+OUI:048680*
+ ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co.,Ltd.
+
 OUI:04885F*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -40227,7 +40254,7 @@ OUI:049F06*
  ID_OUI_FROM_DATABASE=Smobile Co., Ltd.
 
 OUI:049F15*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Humane
 
 OUI:049F81*
  ID_OUI_FROM_DATABASE=NETSCOUT SYSTEMS INC
@@ -40316,6 +40343,9 @@ OUI:04BAD6*
 OUI:04BBF9*
  ID_OUI_FROM_DATABASE=Pavilion Data Systems Inc
 
+OUI:04BC6D*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:04BC87*
  ID_OUI_FROM_DATABASE=Shenzhen JustLink Technology Co., LTD
 
@@ -41228,6 +41258,9 @@ OUI:0805CD*
 OUI:0805E2*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:08085C*
+ ID_OUI_FROM_DATABASE=Luna Products
+
 OUI:0808C2*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -41303,6 +41336,9 @@ OUI:0819A6*
 OUI:081A1E*
  ID_OUI_FROM_DATABASE=Shenzhen iComm Semiconductor CO.,LTD
 
+OUI:081AFD*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:081C6E*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -41465,6 +41501,9 @@ OUI:083A5C*
 OUI:083A88*
  ID_OUI_FROM_DATABASE=Universal Global Scientific Industrial Co., Ltd.
 
+OUI:083A8D*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:083AB8*
  ID_OUI_FROM_DATABASE=Shinoda Plasma Co., Ltd.
 
@@ -41507,6 +41546,9 @@ OUI:0845D1*
 OUI:084656*
  ID_OUI_FROM_DATABASE=VEO-LABS
 
+OUI:0846C7*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:08474C*
  ID_OUI_FROM_DATABASE=Nokia
 
@@ -41546,12 +41588,18 @@ OUI:08512E*
 OUI:085240*
  ID_OUI_FROM_DATABASE=EbV Elektronikbau- und Vertriebs GmbH
 
+OUI:085411*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:0854BB*
  ID_OUI_FROM_DATABASE=SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD
 
 OUI:085531*
  ID_OUI_FROM_DATABASE=Routerboard.com
 
+OUI:08569B*
+ ID_OUI_FROM_DATABASE=WiZ
+
 OUI:085700*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -41597,6 +41645,9 @@ OUI:086266*
 OUI:086361*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:086518*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:0865F0*
  ID_OUI_FROM_DATABASE=JM Zengge Co., Ltd
 
@@ -41639,6 +41690,9 @@ OUI:086D41*
 OUI:086DF2*
  ID_OUI_FROM_DATABASE=Shenzhen MIMOWAVE Technology Co.,Ltd
 
+OUI:086E9C*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:086F48*
  ID_OUI_FROM_DATABASE=Shenzhen iComm Semiconductor CO.,LTD
 
@@ -41765,6 +41819,9 @@ OUI:0894EF*
 OUI:08952A*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
+OUI:089542*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:0896AD*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -42542,6 +42599,9 @@ OUI:0C62A6*
 OUI:0C63FC*
  ID_OUI_FROM_DATABASE=Nanjing Signway Technology Co., Ltd
 
+OUI:0C6422*
+ ID_OUI_FROM_DATABASE=Beijing Wiseasy Technology Co.,Ltd.
+
 OUI:0C6803*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -42609,7 +42669,7 @@ OUI:0C73EB9*
  ID_OUI_FROM_DATABASE=Beijing L&S Lancom Platform Tech. Co., Ltd.
 
 OUI:0C73EBA*
- ID_OUI_FROM_DATABASE=Pi Innovo LLC
+ ID_OUI_FROM_DATABASE=Dana
 
 OUI:0C73EBB*
  ID_OUI_FROM_DATABASE=Synaccess Networks
@@ -42899,6 +42959,9 @@ OUI:0C9D92*
 OUI:0C9E91*
  ID_OUI_FROM_DATABASE=Sankosha Corporation
 
+OUI:0C9F71*
+ ID_OUI_FROM_DATABASE=Dolphin Electronics (DongGuan) Co., Ltd.
+
 OUI:0CA06C*
  ID_OUI_FROM_DATABASE=Industrial Cyber Sensing Inc.
 
@@ -42935,6 +42998,9 @@ OUI:0CAE7D*
 OUI:0CAEBD*
  ID_OUI_FROM_DATABASE=Edifier International
 
+OUI:0CAF31*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:0CAF5A*
  ID_OUI_FROM_DATABASE=GENUS POWER INFRASTRUCTURES LIMITED
 
@@ -43268,6 +43334,9 @@ OUI:0CF893*
 OUI:0CF9C0*
  ID_OUI_FROM_DATABASE=SKY UK LIMITED
 
+OUI:0CFC18*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:0CFC83*
  ID_OUI_FROM_DATABASE=Airoha Technology Corp.,
 
@@ -43422,7 +43491,7 @@ OUI:1008B1*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
 OUI:10090C*
- ID_OUI_FROM_DATABASE=Janome Sewing Machine Co., Ltd.
+ ID_OUI_FROM_DATABASE=JANOME Corporation
 
 OUI:1009F9*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
@@ -43562,6 +43631,9 @@ OUI:102D41*
 OUI:102D96*
  ID_OUI_FROM_DATABASE=Looxcie Inc.
 
+OUI:102E00*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:102EAF*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -43679,6 +43751,9 @@ OUI:104A7D*
 OUI:104B46*
  ID_OUI_FROM_DATABASE=Mitsubishi Electric Corporation
 
+OUI:104C43*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:104D15*
  ID_OUI_FROM_DATABASE=Viaanix Inc
 
@@ -43793,6 +43868,9 @@ OUI:105CBF*
 OUI:105DDC*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:105F02*
+ ID_OUI_FROM_DATABASE=Private
+
 OUI:105F06*
  ID_OUI_FROM_DATABASE=Actiontec Electronics, Inc
 
@@ -43835,6 +43913,9 @@ OUI:1065A3*
 OUI:1065CF*
  ID_OUI_FROM_DATABASE=IQSIM
 
+OUI:106650*
+ ID_OUI_FROM_DATABASE=Robert Bosch JuP1
+
 OUI:106682*
  ID_OUI_FROM_DATABASE=NEC Platforms, Ltd.
 
@@ -43919,6 +44000,9 @@ OUI:107D1A*
 OUI:1081B4*
  ID_OUI_FROM_DATABASE=Hunan Greatwall Galaxy Science and Technology Co.,Ltd.
 
+OUI:10823D*
+ ID_OUI_FROM_DATABASE=Ruijie Networks Co.,LTD
+
 OUI:108286*
  ID_OUI_FROM_DATABASE=Luxshare Precision Industry Co.,Ltd
 
@@ -43988,6 +44072,9 @@ OUI:109693*
 OUI:1097BD*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:109826*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:109836*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -44009,6 +44096,9 @@ OUI:109D7A*
 OUI:109E3A*
  ID_OUI_FROM_DATABASE=Zhejiang Tmall Technology Co., Ltd.
 
+OUI:109F4F*
+ ID_OUI_FROM_DATABASE=New H3C Intelligence Terminal Co., Ltd.
+
 OUI:109FA9*
  ID_OUI_FROM_DATABASE=Actiontec Electronics, Inc
 
@@ -44045,11 +44135,14 @@ OUI:10A659*
 OUI:10A743*
  ID_OUI_FROM_DATABASE=SK Mtek Limited
 
+OUI:10A829*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:10A932*
  ID_OUI_FROM_DATABASE=Beijing Cyber Cloud Technology Co. ,Ltd.
 
 OUI:10AE60*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
 OUI:10AEA5*
  ID_OUI_FROM_DATABASE=Duskrise inc.
@@ -44102,6 +44195,9 @@ OUI:10B9FE*
 OUI:10BAA5*
  ID_OUI_FROM_DATABASE=GANA I&C CO., LTD
 
+OUI:10BBF3*
+ ID_OUI_FROM_DATABASE=HUNAN FN-LINK TECHNOLOGY LIMITED
+
 OUI:10BC97*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -44117,6 +44213,9 @@ OUI:10BEF5*
 OUI:10BF48*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
+OUI:10BF67*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:10C07C*
  ID_OUI_FROM_DATABASE=Blu-ray Disc Association
 
@@ -44216,6 +44315,9 @@ OUI:10D542*
 OUI:10D561*
  ID_OUI_FROM_DATABASE=Tuya Smart Inc.
 
+OUI:10D680*
+ ID_OUI_FROM_DATABASE=Tendyron Corporation
+
 OUI:10D7B0*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -44229,10 +44331,10 @@ OUI:10DC4A*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
 OUI:10DCB60*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Apex Supply Chain Technologies
 
 OUI:10DCB61*
- ID_OUI_FROM_DATABASE=ABB Switzerland Ltd.
+ ID_OUI_FROM_DATABASE=Hitachi Energy Switzerland Ltd
 
 OUI:10DCB62*
  ID_OUI_FROM_DATABASE=CAL-COMP INDUSTRIA E COMERCIO DE ELETRONICOS E INFORMATICA LTDA
@@ -44315,6 +44417,9 @@ OUI:10E77A*
 OUI:10E7C6*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
+OUI:10E840*
+ ID_OUI_FROM_DATABASE=ZOWEE TECHNOLOGY(HEYUAN) CO., LTD.
+
 OUI:10E878*
  ID_OUI_FROM_DATABASE=Nokia
 
@@ -44384,6 +44489,9 @@ OUI:10FACE*
 OUI:10FBF0*
  ID_OUI_FROM_DATABASE=KangSheng LTD.
 
+OUI:10FC33*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:10FC54*
  ID_OUI_FROM_DATABASE=Shany Electronic Co., Ltd.
 
@@ -44421,7 +44529,7 @@ OUI:140467*
  ID_OUI_FROM_DATABASE=SNK Technologies Co.,Ltd.
 
 OUI:140708*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=CP PLUS GMBH & CO. KG
 
 OUI:1407E0*
  ID_OUI_FROM_DATABASE=Abrantix AG
@@ -44571,11 +44679,14 @@ OUI:141FBAE*
  ID_OUI_FROM_DATABASE=POS Systema LLC
 
 OUI:141FBAF*
- ID_OUI_FROM_DATABASE=IEEE Registration Authority
+ ID_OUI_FROM_DATABASE=Private
 
 OUI:14205E*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:142103*
+ ID_OUI_FROM_DATABASE=Calix Inc.
+
 OUI:142233*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
@@ -44591,6 +44702,9 @@ OUI:14230A*
 OUI:1423D7*
  ID_OUI_FROM_DATABASE=EUTRONIX CO., LTD.
 
+OUI:1423F2*
+ ID_OUI_FROM_DATABASE=Broadcom Limited
+
 OUI:142475*
  ID_OUI_FROM_DATABASE=4DReplay, Inc
 
@@ -44735,6 +44849,9 @@ OUI:144978*
 OUI:1449BC*
  ID_OUI_FROM_DATABASE=DrayTek Corp.
 
+OUI:1449D4*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:1449E0*
  ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO-MECHANICS(THAILAND)
 
@@ -44882,6 +44999,9 @@ OUI:146102*
 OUI:14612F*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
+OUI:1461A4*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
 OUI:146308*
  ID_OUI_FROM_DATABASE=JABIL CIRCUIT (SHANGHAI) LTD.
 
@@ -45053,6 +45173,9 @@ OUI:149ECF*
 OUI:149F3C*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:149F43*
+ ID_OUI_FROM_DATABASE=Cisco Meraki
+
 OUI:149FB6*
  ID_OUI_FROM_DATABASE=GUANGDONG GENIUS TECHNOLOGY CO., LTD.
 
@@ -45110,6 +45233,9 @@ OUI:14ABC5*
 OUI:14ABF0*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:14AC60*
+ ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
+
 OUI:14ADCA*
  ID_OUI_FROM_DATABASE=China Mobile Iot Limited company
 
@@ -45176,6 +45302,9 @@ OUI:14B31F*
 OUI:14B370*
  ID_OUI_FROM_DATABASE=Gigaset Digital Technology (Shenzhen) Co., Ltd.
 
+OUI:14B3A1*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:14B457*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
@@ -45275,6 +45404,9 @@ OUI:14D169*
 OUI:14D19E*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:14D424*
+ ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
+
 OUI:14D4FE*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -45290,6 +45422,9 @@ OUI:14DAE9*
 OUI:14DB85*
  ID_OUI_FROM_DATABASE=S NET MEDIA
 
+OUI:14DC51*
+ ID_OUI_FROM_DATABASE=Xiamen Cheerzing IOT Technology Co.,Ltd.
+
 OUI:14DCE2*
  ID_OUI_FROM_DATABASE=THALES AVS France
 
@@ -45461,6 +45596,9 @@ OUI:18146C*
 OUI:1816C9*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:1816E8*
+ ID_OUI_FROM_DATABASE=Siliconware Precision Industries Co., Ltd.
+
 OUI:181714*
  ID_OUI_FROM_DATABASE=DAEWOOIS
 
@@ -45468,7 +45606,7 @@ OUI:181725*
  ID_OUI_FROM_DATABASE=Cameo Communications, Inc.
 
 OUI:18188B*
- ID_OUI_FROM_DATABASE=FUJITSU CONNECTED TECHNOLOGIES LIMITED
+ ID_OUI_FROM_DATABASE=FCNT LMITED
 
 OUI:18193F*
  ID_OUI_FROM_DATABASE=Tamtron Oy
@@ -45536,6 +45674,9 @@ OUI:182AD3*
 OUI:182B05*
  ID_OUI_FROM_DATABASE=8D Technologies
 
+OUI:182C65*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:182C91*
  ID_OUI_FROM_DATABASE=Concept Development, Inc.
 
@@ -45915,7 +46056,7 @@ OUI:1874E23*
  ID_OUI_FROM_DATABASE=CT Company
 
 OUI:1874E24*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Aggressive Electronics Manufacturing Services Pvt Limited
 
 OUI:1874E25*
  ID_OUI_FROM_DATABASE=HANGZHOU ZHOUJU ELECTRONIC TECHNOLOGICAL CO.,LTD
@@ -46340,6 +46481,51 @@ OUI:18C2BF*
 OUI:18C300*
  ID_OUI_FROM_DATABASE=Nokia
 
+OUI:18C3F40*
+ ID_OUI_FROM_DATABASE=Scati Labs, S.A.
+
+OUI:18C3F41*
+ ID_OUI_FROM_DATABASE=Enertex Bayern GmbH
+
+OUI:18C3F42*
+ ID_OUI_FROM_DATABASE=Changsha Kiloview Electronics Co., Ltd.
+
+OUI:18C3F43*
+ ID_OUI_FROM_DATABASE=General Test Systems
+
+OUI:18C3F44*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:18C3F45*
+ ID_OUI_FROM_DATABASE=Synaptics, Inc
+
+OUI:18C3F46*
+ ID_OUI_FROM_DATABASE=VeriFone Systems (China), Inc.
+
+OUI:18C3F47*
+ ID_OUI_FROM_DATABASE=Shenzhen Yecon-Tech Co.,Ltd.
+
+OUI:18C3F48*
+ ID_OUI_FROM_DATABASE=Shenzhen Liandian Communication Technology Co.LTD
+
+OUI:18C3F49*
+ ID_OUI_FROM_DATABASE=Ningbo Yuda Communication Technology Co.,Ltd
+
+OUI:18C3F4A*
+ ID_OUI_FROM_DATABASE=Shenzhen Yunlianxin Technology Co., Ltd.
+
+OUI:18C3F4B*
+ ID_OUI_FROM_DATABASE=VECTOR TECHNOLOGIES, LLC
+
+OUI:18C3F4C*
+ ID_OUI_FROM_DATABASE=HANGZHOU ZHONGKEJIGUANG TECHNOLOGY CO., LTD
+
+OUI:18C3F4D*
+ ID_OUI_FROM_DATABASE=Shenzhen C & D Electronics Co., Ltd.
+
+OUI:18C3F4E*
+ ID_OUI_FROM_DATABASE=SHENZHEN MEGMEET ELECTRICAL CO., LTD
+
 OUI:18C451*
  ID_OUI_FROM_DATABASE=Tucson Embedded Systems
 
@@ -46397,6 +46583,9 @@ OUI:18D6C7*
 OUI:18D6CF*
  ID_OUI_FROM_DATABASE=Kurth Electronic GmbH
 
+OUI:18D6DD*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:18D717*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -46571,6 +46760,9 @@ OUI:18F9C4*
 OUI:18FA6F*
  ID_OUI_FROM_DATABASE=ISC applied systems corp
 
+OUI:18FAB7*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:18FB7B*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -46706,6 +46898,9 @@ OUI:1C184A*
 OUI:1C19DE*
  ID_OUI_FROM_DATABASE=eyevis GmbH
 
+OUI:1C1A1B*
+ ID_OUI_FROM_DATABASE=Shanghai Sunmi Technology Co.,Ltd.
+
 OUI:1C1AC0*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -46793,6 +46988,9 @@ OUI:1C21D1E*
 OUI:1C21D1F*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:1C2285*
+ ID_OUI_FROM_DATABASE=Serrature Meroni SpA
+
 OUI:1C232C*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -47099,6 +47297,12 @@ OUI:1C61B4*
 OUI:1C62B8*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:1C6349*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
+OUI:1C63A5*
+ ID_OUI_FROM_DATABASE=securityplatform
+
 OUI:1C63B7*
  ID_OUI_FROM_DATABASE=OpenProducts 237 AB
 
@@ -47129,6 +47333,9 @@ OUI:1C697A*
 OUI:1C69A5*
  ID_OUI_FROM_DATABASE=BlackBerry RTS
 
+OUI:1C6A76*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:1C6A7A*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -47270,6 +47477,9 @@ OUI:1C83B0*
 OUI:1C8464*
  ID_OUI_FROM_DATABASE=FORMOSA WIRELESS COMMUNICATION CORP.
 
+OUI:1C8682*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:1C869A*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -47465,6 +47675,12 @@ OUI:1C8879D*
 OUI:1C8879E*
  ID_OUI_FROM_DATABASE=Orion Labs inc
 
+OUI:1C8B76*
+ ID_OUI_FROM_DATABASE=Calix Inc.
+
+OUI:1C8BEF*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Electronics Co.,Ltd
+
 OUI:1C8E5C*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -47477,6 +47693,9 @@ OUI:1C8F8A*
 OUI:1C90BE*
  ID_OUI_FROM_DATABASE=Ericsson AB
 
+OUI:1C90FF*
+ ID_OUI_FROM_DATABASE=Tuya Smart Inc.
+
 OUI:1C9148*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -47513,6 +47732,9 @@ OUI:1C973D*
 OUI:1C97C5*
  ID_OUI_FROM_DATABASE=Ynomia Pty Ltd
 
+OUI:1C97FB*
+ ID_OUI_FROM_DATABASE=CoolBitX Ltd.
+
 OUI:1C98C1*
  ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 
@@ -47765,6 +47987,9 @@ OUI:1CB796*
 OUI:1CB857*
  ID_OUI_FROM_DATABASE=Becon Technologies Co,.Ltd.
 
+OUI:1CB8BA*
+ ID_OUI_FROM_DATABASE=XIAMEN LEELEN TECHNOLOGY CO., LTD
+
 OUI:1CB9C4*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
@@ -48041,6 +48266,9 @@ OUI:1CF8D0*
 OUI:1CFA68*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
+OUI:1CFC17*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:1CFCBB*
  ID_OUI_FROM_DATABASE=Realfiction ApS
 
@@ -48179,6 +48407,9 @@ OUI:200BC7*
 OUI:200BCF*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
+OUI:200C86*
+ ID_OUI_FROM_DATABASE=GX India Pvt Ltd
+
 OUI:200CC8*
  ID_OUI_FROM_DATABASE=NETGEAR
 
@@ -48212,6 +48443,9 @@ OUI:2013E0*
 OUI:20163D*
  ID_OUI_FROM_DATABASE=Integrated Device Technology (Malaysia) Sdn. Bhd.
 
+OUI:201642*
+ ID_OUI_FROM_DATABASE=Microsoft Corporation
+
 OUI:2016B9*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -48227,6 +48461,9 @@ OUI:20180E*
 OUI:201A06*
  ID_OUI_FROM_DATABASE=COMPAL INFORMATION (KUNSHAN) CO., LTD.
 
+OUI:201A94*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:201B88*
  ID_OUI_FROM_DATABASE=Dongguan Liesheng Electronic Co., Ltd.
 
@@ -48296,6 +48533,9 @@ OUI:202DF8*
 OUI:20311C*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:20318D*
+ ID_OUI_FROM_DATABASE=Giax GmbH
+
 OUI:2031EB*
  ID_OUI_FROM_DATABASE=HDSN
 
@@ -48311,6 +48551,9 @@ OUI:2032C6*
 OUI:2034FB*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:203626*
+ ID_OUI_FROM_DATABASE=TP-Link Corporation Limited
+
 OUI:20365B*
  ID_OUI_FROM_DATABASE=Megafone Limited
 
@@ -48332,6 +48575,9 @@ OUI:203956*
 OUI:203A07*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:203A43*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:203AEF*
  ID_OUI_FROM_DATABASE=Sivantos GmbH
 
@@ -48356,6 +48602,9 @@ OUI:203DBD*
 OUI:204005*
  ID_OUI_FROM_DATABASE=feno GmbH
 
+OUI:20406A*
+ ID_OUI_FROM_DATABASE=AMPAK Technology,Inc.
+
 OUI:20415A*
  ID_OUI_FROM_DATABASE=Smarteh d.o.o.
 
@@ -48464,6 +48713,9 @@ OUI:205D47*
 OUI:205E64*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:205E97*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:205EF7*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -48602,6 +48854,9 @@ OUI:2082C0*
 OUI:2083F8*
  ID_OUI_FROM_DATABASE=Advanced Digital Broadcast SA
 
+OUI:2084F5*
+ ID_OUI_FROM_DATABASE=Yufei Innovation Software(Shenzhen) Co., Ltd.
+
 OUI:20858C*
  ID_OUI_FROM_DATABASE=Assa
 
@@ -48737,6 +48992,9 @@ OUI:20A2E4*
 OUI:20A2E7*
  ID_OUI_FROM_DATABASE=Lee-Dickens Ltd
 
+OUI:20A5CB*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:20A60C*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -48746,6 +49004,9 @@ OUI:20A680*
 OUI:20A6CD*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
+OUI:20A766*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:20A783*
  ID_OUI_FROM_DATABASE=miControl GmbH
 
@@ -49118,6 +49379,9 @@ OUI:24085D*
 OUI:240917*
  ID_OUI_FROM_DATABASE=Devlin Electronics Limited
 
+OUI:240935*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:240995*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -49172,6 +49436,9 @@ OUI:241145*
 OUI:241148*
  ID_OUI_FROM_DATABASE=Entropix, LLC
 
+OUI:241153*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:2411D0*
  ID_OUI_FROM_DATABASE=Chongqing Ehs Science and Technology Development Co.,Ltd.
 
@@ -49226,6 +49493,12 @@ OUI:241510D*
 OUI:241510E*
  ID_OUI_FROM_DATABASE=Satellite Link Technology CO.,LTD
 
+OUI:241551*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
+OUI:24161B*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:24166D*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -49487,6 +49760,9 @@ OUI:245BF0*
 OUI:245CBF*
  ID_OUI_FROM_DATABASE=NCSE
 
+OUI:245CC5*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:245CCB*
  ID_OUI_FROM_DATABASE=AXIe Consortium, Inc.
 
@@ -49772,6 +50048,9 @@ OUI:24A534*
 OUI:24A65E*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:24A6FA*
+ ID_OUI_FROM_DATABASE=WEIFANG GOERTEK ELECTRONICS CO.,LTD
+
 OUI:24A799*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -49817,6 +50096,9 @@ OUI:24B6FD*
 OUI:24B72A*
  ID_OUI_FROM_DATABASE=China Dragon Technology Limited
 
+OUI:24B7DA*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:24B88C*
  ID_OUI_FROM_DATABASE=Crenus Co.,Ltd.
 
@@ -49955,6 +50237,9 @@ OUI:24DBAD*
 OUI:24DBED*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:24DC0F*
+ ID_OUI_FROM_DATABASE=Phytium Technology Co.,Ltd.
+
 OUI:24DEC6*
  ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
 
@@ -49973,12 +50258,18 @@ OUI:24E271*
 OUI:24E314*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:24E3DE*
+ ID_OUI_FROM_DATABASE=China Telecom Fufu Information Technology Co., Ltd.
+
 OUI:24E43F*
  ID_OUI_FROM_DATABASE=Wenzhou Kunmei Communication Technology Co.,Ltd.
 
 OUI:24E4C8*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
+OUI:24E50F*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:24E5AA*
  ID_OUI_FROM_DATABASE=Philips Oral Healthcare, Inc.
 
@@ -50027,6 +50318,9 @@ OUI:24EE9A*
 OUI:24F094*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:24F0D3*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:24F0FF*
  ID_OUI_FROM_DATABASE=GHT Co., Ltd.
 
@@ -50108,6 +50402,9 @@ OUI:28068D*
 OUI:28070D*
  ID_OUI_FROM_DATABASE=GUANGZHOU WINSOUND INFORMATION TECHNOLOGY CO.,LTD.
 
+OUI:280AEE*
+ ID_OUI_FROM_DATABASE=Renesas Electronics (Penang) Sdn. Bhd.
+
 OUI:280B5C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -50222,6 +50519,9 @@ OUI:282A87*
 OUI:282B96*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:282BB9*
+ ID_OUI_FROM_DATABASE=Shenzhen Xiongxin Technology Co.,Ltd
+
 OUI:282C020*
  ID_OUI_FROM_DATABASE=SAKATA DENKI Co., Ltd.
 
@@ -50618,6 +50918,9 @@ OUI:287B09*
 OUI:287CDB*
  ID_OUI_FROM_DATABASE=Hefei  Toycloud Technology Co.,ltd
 
+OUI:287E80*
+ ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
+
 OUI:287FCF*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -50627,6 +50930,9 @@ OUI:288023*
 OUI:288088*
  ID_OUI_FROM_DATABASE=NETGEAR
 
+OUI:28808A*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:2880A2*
  ID_OUI_FROM_DATABASE=Novatel Wireless Solutions, Inc.
 
@@ -50660,6 +50966,9 @@ OUI:288CB8*
 OUI:288EEC*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:288FF6*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:2891D0*
  ID_OUI_FROM_DATABASE=Stage Tec Entwicklungsgesellschaft für professionelle Audiotechnik mbH
 
@@ -50888,6 +51197,9 @@ OUI:28C2DD*
 OUI:28C538*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:28C5D2*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:28C63F*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -51021,7 +51333,7 @@ OUI:28E14C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
 OUI:28E297*
- ID_OUI_FROM_DATABASE=Shanghai InfoTM Microelectronics Co.,Ltd.
+ ID_OUI_FROM_DATABASE=Shanghai InfoTM Microelectronics Co.,Ltd
 
 OUI:28E31F*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
@@ -51044,6 +51356,9 @@ OUI:28E608*
 OUI:28E6E9*
  ID_OUI_FROM_DATABASE=SIS Sat Internet Services GmbH
 
+OUI:28E71D*
+ ID_OUI_FROM_DATABASE=Arista Networks
+
 OUI:28E794*
  ID_OUI_FROM_DATABASE=Microtime Computer Inc.
 
@@ -51290,6 +51605,9 @@ OUI:2C0823*
 OUI:2C088C*
  ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
 
+OUI:2C08B4*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:2C094D*
  ID_OUI_FROM_DATABASE=Raptor Engineering, LLC
 
@@ -51557,6 +51875,9 @@ OUI:2C3068*
 OUI:2C3124*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:2C326A*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:2C3311*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -51764,12 +52085,18 @@ OUI:2C55D3*
 OUI:2C56DC*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
+OUI:2C572C*
+ ID_OUI_FROM_DATABASE=Allwinner Technology Co., Ltd
+
 OUI:2C5731*
  ID_OUI_FROM_DATABASE=Wingtech Group (HongKong）Limited
 
 OUI:2C5741*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:2C57CE*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:2C584F*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -51870,7 +52197,7 @@ OUI:2C691D9*
  ID_OUI_FROM_DATABASE=SHENZHEN EX-LINK TECHNOLOGY CO.,LTD
 
 OUI:2C691DA*
- ID_OUI_FROM_DATABASE=Panasonic Appliances Marketing Asia Pacific (A division of Panasonic Malaysia Sdn Bhd
+ ID_OUI_FROM_DATABASE=Panasonic Appliances Marketing Asia Pacific
 
 OUI:2C691DB*
  ID_OUI_FROM_DATABASE=Shenzhen Daren HI-Tech Electronics Co., Ltd.
@@ -51881,9 +52208,15 @@ OUI:2C691DC*
 OUI:2C691DD*
  ID_OUI_FROM_DATABASE=Ascentac Inc.
 
+OUI:2C691DE*
+ ID_OUI_FROM_DATABASE=Chengdu Qianhong Communication Co., Ltd.
+
 OUI:2C69BA*
  ID_OUI_FROM_DATABASE=RF Controls, LLC
 
+OUI:2C69CC*
+ ID_OUI_FROM_DATABASE=Valeo Detection Systems
+
 OUI:2C6A6F0*
  ID_OUI_FROM_DATABASE=Shanghai Shuncom Electronic Technology Co.,Ltd
 
@@ -51944,6 +52277,9 @@ OUI:2C6DC1*
 OUI:2C6E85*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:2C6F4E*
+ ID_OUI_FROM_DATABASE=Hubei Yuan Times Technology Co.,Ltd.
+
 OUI:2C6F51*
  ID_OUI_FROM_DATABASE=Herospeed Digital Technology Limited
 
@@ -51968,6 +52304,12 @@ OUI:2C73A0*
 OUI:2C750F*
  ID_OUI_FROM_DATABASE=Shanghai Dongzhou-Lawton Communication Technology Co. Ltd.
 
+OUI:2C75CB*
+ ID_OUI_FROM_DATABASE=Novitec Co., Ltd.
+
+OUI:2C7600*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:2C768A*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
@@ -52013,6 +52355,9 @@ OUI:2C86D2*
 OUI:2C8A72*
  ID_OUI_FROM_DATABASE=HTC Corporation
 
+OUI:2C8AC7*
+ ID_OUI_FROM_DATABASE=Ubee Interactive Co., Limited
+
 OUI:2C8BF2*
  ID_OUI_FROM_DATABASE=Hitachi Metals America Ltd
 
@@ -52034,6 +52379,9 @@ OUI:2C922C*
 OUI:2C93FB*
  ID_OUI_FROM_DATABASE=Sercomm France Sarl
 
+OUI:2C9452*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:2C9464*
  ID_OUI_FROM_DATABASE=Cincoze Co., Ltd.
 
@@ -52067,6 +52415,9 @@ OUI:2C9D1E*
 OUI:2C9D65*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:2C9E00*
+ ID_OUI_FROM_DATABASE=Sony Interactive Entertainment Inc.
+
 OUI:2C9E5F*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -52115,6 +52466,9 @@ OUI:2CA780*
 OUI:2CA79E*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:2CA7EF*
+ ID_OUI_FROM_DATABASE=OnePlus Technology (Shenzhen) Co., Ltd
+
 OUI:2CA835*
  ID_OUI_FROM_DATABASE=RIM
 
@@ -52175,6 +52529,9 @@ OUI:2CB693*
 OUI:2CB69D*
  ID_OUI_FROM_DATABASE=RED Digital Cinema
 
+OUI:2CB6C8*
+ ID_OUI_FROM_DATABASE=Raisecom Technology CO., LTD
+
 OUI:2CB8ED*
  ID_OUI_FROM_DATABASE=SonicWall
 
@@ -52388,6 +52745,9 @@ OUI:2CF203*
 OUI:2CF295*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:2CF2A5*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:2CF432*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -52506,7 +52866,7 @@ OUI:300A602*
  ID_OUI_FROM_DATABASE=Advanced Electronic Designs, Inc.
 
 OUI:300A603*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Intergard do Brasil Ind e Com de Eletr e Mec Ltda
 
 OUI:300A604*
  ID_OUI_FROM_DATABASE=AVIC JONHON OPTRONIC TECHNOLOGY CO., LTD.
@@ -52598,12 +52958,18 @@ OUI:3018CF*
 OUI:301966*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:301984*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:301A28*
  ID_OUI_FROM_DATABASE=Mako Networks Ltd
 
 OUI:301A30*
  ID_OUI_FROM_DATABASE=Mako Networks Ltd
 
+OUI:301ABA*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:301B97*
  ID_OUI_FROM_DATABASE=Lierda Science & Technology Group Co.,Ltd
 
@@ -52635,7 +53001,7 @@ OUI:301F9A8*
  ID_OUI_FROM_DATABASE=FINE TRIUMPH TECHNOLOGY CORP.,LTD.
 
 OUI:301F9A9*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Deep Sentinel
 
 OUI:301F9AA*
  ID_OUI_FROM_DATABASE=HUNAN CHANGSHA HENGJIAN TECHNOLDGY DEVELPMENT CO.,LTD.
@@ -53276,6 +53642,9 @@ OUI:30AFCE*
 OUI:30B037*
  ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
 
+OUI:30B0EA*
+ ID_OUI_FROM_DATABASE=Shenzhen Chuangxin Internet Communication Technology Co., Ltd
+
 OUI:30B164*
  ID_OUI_FROM_DATABASE=Power Electronics International Inc.
 
@@ -53339,6 +53708,9 @@ OUI:30C507*
 OUI:30C50F*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:30C6D7*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:30C6F7*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -53408,9 +53780,15 @@ OUI:30D941*
 OUI:30D9D9*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:30DE4B*
+ ID_OUI_FROM_DATABASE=TP-Link Corporation Limited
+
 OUI:30DE86*
  ID_OUI_FROM_DATABASE=Cedac Software S.r.l.
 
+OUI:30DF17*
+ ID_OUI_FROM_DATABASE=ALPSALPINE CO .,LTD
+
 OUI:30DF8D*
  ID_OUI_FROM_DATABASE=SHENZHEN GONGJIN ELECTRONICS CO.,LT
 
@@ -53477,6 +53855,9 @@ OUI:30F42F*
 OUI:30F6B9*
  ID_OUI_FROM_DATABASE=Ecocentric Energy
 
+OUI:30F6EF*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:30F70D*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -53693,6 +54074,9 @@ OUI:3414B5*
 OUI:341513*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:341593*
+ ID_OUI_FROM_DATABASE=Ruckus Wireless
+
 OUI:34159E*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -53708,6 +54092,9 @@ OUI:341A4C*
 OUI:341B22*
  ID_OUI_FROM_DATABASE=Grandbeing Technology Co., Ltd
 
+OUI:341B2D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:341CF0*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -53738,6 +54125,9 @@ OUI:34243E*
 OUI:34255D*
  ID_OUI_FROM_DATABASE=Shenzhen Loadcom Technology Co.,Ltd
 
+OUI:3425B4*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:3425BE*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -53894,6 +54284,9 @@ OUI:34466F*
 OUI:3446EC*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:34479A*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:3448ED*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -54008,6 +54401,9 @@ OUI:3463D4*
 OUI:3464A9*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
+OUI:346679*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:3466EA*
  ID_OUI_FROM_DATABASE=VERTU INTERNATIONAL CORPORATION LIMITED
 
@@ -54533,6 +54929,9 @@ OUI:34DE1A*
 OUI:34DE34*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:34DF20*
+ ID_OUI_FROM_DATABASE=Shenzhen Comstar .Technology Co.,Ltd
+
 OUI:34DF2A*
  ID_OUI_FROM_DATABASE=Fujikon Industrial Co.,Limited
 
@@ -54656,6 +55055,9 @@ OUI:34F0CA*
 OUI:34F150*
  ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
 
+OUI:34F223*
+ ID_OUI_FROM_DATABASE=Fujian Newland Communication Science Technology Co.,Ltd.
+
 OUI:34F39A*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -54968,6 +55370,9 @@ OUI:38378B*
 OUI:38384B*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:3838A6*
+ ID_OUI_FROM_DATABASE=Arista Networks
+
 OUI:383A210*
  ID_OUI_FROM_DATABASE=R3C Information(Shenzhen) Co.，Ltd.
 
@@ -55067,6 +55472,9 @@ OUI:384608*
 OUI:3847BC*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:3847F2*
+ ID_OUI_FROM_DATABASE=Recogni Inc
+
 OUI:38484C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -55097,6 +55505,9 @@ OUI:38521A*
 OUI:385247*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:385319*
+ ID_OUI_FROM_DATABASE=34ED LLC DBA Centegix
+
 OUI:38539C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -55151,6 +55562,12 @@ OUI:3863BB*
 OUI:3863F6*
  ID_OUI_FROM_DATABASE=3NOD MULTIMEDIA(SHENZHEN)CO.,LTD
 
+OUI:386407*
+ ID_OUI_FROM_DATABASE=Qingdao Intelligent&Precise Electronics Co.,Ltd.
+
+OUI:386504*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
 OUI:3865B2*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -55359,7 +55776,7 @@ OUI:3894ED*
  ID_OUI_FROM_DATABASE=NETGEAR
 
 OUI:389592*
- ID_OUI_FROM_DATABASE=Beijing Tendyron Corporation
+ ID_OUI_FROM_DATABASE=Tendyron Corporation
 
 OUI:3897A4*
  ID_OUI_FROM_DATABASE=ELECOM CO.,LTD.
@@ -55379,6 +55796,9 @@ OUI:389AF6*
 OUI:389D92*
  ID_OUI_FROM_DATABASE=Seiko Epson Corporation
 
+OUI:389E80*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:389F5A*
  ID_OUI_FROM_DATABASE=C-Kur TV Inc.
 
@@ -55470,7 +55890,7 @@ OUI:38A95F*
  ID_OUI_FROM_DATABASE=Actifio Inc
 
 OUI:38A9EA*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=HK DAPU ELECTRONIC TECHNOLOGY CO., LIMITED
 
 OUI:38AA3C*
  ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO MECHANICS CO., LTD.
@@ -55634,6 +56054,12 @@ OUI:38BC01*
 OUI:38BC1A*
  ID_OUI_FROM_DATABASE=MEIZU Technology Co., Ltd.
 
+OUI:38BC61*
+ ID_OUI_FROM_DATABASE=Starkoff Co., Ltd.
+
+OUI:38BD7A*
+ ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
+
 OUI:38BEAB*
  ID_OUI_FROM_DATABASE=AltoBeam (China) Inc.
 
@@ -55673,6 +56099,9 @@ OUI:38C9A9*
 OUI:38CA73*
  ID_OUI_FROM_DATABASE=Shenzhen MiaoMing  Intelligent Technology Co.,Ltd
 
+OUI:38CA84*
+ ID_OUI_FROM_DATABASE=HP Inc.
+
 OUI:38CA97*
  ID_OUI_FROM_DATABASE=Contour Design LLC
 
@@ -55889,6 +56318,9 @@ OUI:38F8B7*
 OUI:38F8CA*
  ID_OUI_FROM_DATABASE=OWIN Inc.
 
+OUI:38F8F6*
+ ID_OUI_FROM_DATABASE=Adtran Inc
+
 OUI:38F9D3*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -55964,6 +56396,9 @@ OUI:38FF36*
 OUI:3C01EF*
  ID_OUI_FROM_DATABASE=Sony Corporation
 
+OUI:3C0268*
+ ID_OUI_FROM_DATABASE=Infinera, Inc.
+
 OUI:3C02B1*
  ID_OUI_FROM_DATABASE=Creation Technologies LP
 
@@ -55976,12 +56411,18 @@ OUI:3C04BF*
 OUI:3C0518*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:3C058E*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:3C05AB*
  ID_OUI_FROM_DATABASE=Product Creation Studio
 
 OUI:3C0630*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:3C0664*
+ ID_OUI_FROM_DATABASE=Beijing Leagrid Technology Co.,Ltd.
+
 OUI:3C06A7*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -56030,6 +56471,9 @@ OUI:3C10E6*
 OUI:3C11B2*
  ID_OUI_FROM_DATABASE=Fraunhofer FIT
 
+OUI:3C135A*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:3C13CC*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -56075,6 +56519,9 @@ OUI:3C1A79*
 OUI:3C1A9E*
  ID_OUI_FROM_DATABASE=VitalThings AS
 
+OUI:3C1BF8*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:3C1CBE*
  ID_OUI_FROM_DATABASE=JADAK LLC
 
@@ -56171,6 +56618,9 @@ OUI:3C2C94*
 OUI:3C2C99*
  ID_OUI_FROM_DATABASE=Edgecore Networks Corporation
 
+OUI:3C2CA6*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Electronics Co.,Ltd
+
 OUI:3C2DB7*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -56270,6 +56720,9 @@ OUI:3C39E7F*
 OUI:3C3A73*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
+OUI:3C3B99*
+ ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
+
 OUI:3C3F51*
  ID_OUI_FROM_DATABASE=2CRSI
 
@@ -56393,6 +56846,9 @@ OUI:3C57BD*
 OUI:3C57D5*
  ID_OUI_FROM_DATABASE=FiveCo
 
+OUI:3C585D*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:3C58C2*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -56714,6 +57170,9 @@ OUI:3CA10D*
 OUI:3CA161*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:3CA2C3*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:3CA308*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -56768,6 +57227,9 @@ OUI:3CAB8E*
 OUI:3CAE69*
  ID_OUI_FROM_DATABASE=ESA Elektroschaltanlagen Grimma GmbH
 
+OUI:3CB07E*
+ ID_OUI_FROM_DATABASE=Arounds Intelligent Equipment Co., Ltd.
+
 OUI:3CB15B*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
@@ -56939,6 +57401,9 @@ OUI:3CE36B*
 OUI:3CE3E7*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
+OUI:3CE441*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:3CE4B0*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -57014,6 +57479,9 @@ OUI:3CF808*
 OUI:3CF862*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:3CFA06*
+ ID_OUI_FROM_DATABASE=Microsoft Corporation
+
 OUI:3CFA43*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -57209,6 +57677,9 @@ OUI:4018D7*
 OUI:401920*
  ID_OUI_FROM_DATABASE=Movon Corporation
 
+OUI:401A58*
+ ID_OUI_FROM_DATABASE=Wistron Neweb Corporation
+
 OUI:401B5F*
  ID_OUI_FROM_DATABASE=WEIFANG GOERTEK ELECTRONICS CO.,LTD
 
@@ -57320,6 +57791,9 @@ OUI:40313C*
 OUI:40329D*
  ID_OUI_FROM_DATABASE=Union Image Co.,Ltd
 
+OUI:403306*
+ ID_OUI_FROM_DATABASE=Taicang T&W Electronics
+
 OUI:40331A*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -57824,6 +58298,9 @@ OUI:40B0A1*
 OUI:40B0FA*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
+OUI:40B15C*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:40B2C8*
  ID_OUI_FROM_DATABASE=Nortel Networks
 
@@ -57899,9 +58376,15 @@ OUI:40BEEE*
 OUI:40BF17*
  ID_OUI_FROM_DATABASE=Digistar Telecom. SA
 
+OUI:40C1F6*
+ ID_OUI_FROM_DATABASE=Shenzhen Jingxun Technology Co., Ltd.
+
 OUI:40C245*
  ID_OUI_FROM_DATABASE=Shenzhen Hexicom Technology Co., Ltd.
 
+OUI:40C2BA*
+ ID_OUI_FROM_DATABASE=COMPAL INFORMATION (KUNSHAN) CO., LTD.
+
 OUI:40C3BC*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -58001,6 +58484,9 @@ OUI:40DEAD*
 OUI:40DF02*
  ID_OUI_FROM_DATABASE=LINE BIZ Plus
 
+OUI:40E11C*
+ ID_OUI_FROM_DATABASE=shenzhen Cloud High Communication Technology Co.,Ltd
+
 OUI:40E171*
  ID_OUI_FROM_DATABASE=Jiangsu Huitong Group Co.,Ltd.
 
@@ -58079,6 +58565,9 @@ OUI:40ED98D*
 OUI:40ED98E*
  ID_OUI_FROM_DATABASE=BORDA TECHNOLOGY
 
+OUI:40EDCF*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:40EE15*
  ID_OUI_FROM_DATABASE=Zioncom Electronics (Shenzhen) Ltd.
 
@@ -58271,6 +58760,9 @@ OUI:4403A7*
 OUI:440444*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
+OUI:4405E8*
+ ID_OUI_FROM_DATABASE=twareLAB
+
 OUI:44070B*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
@@ -58278,7 +58770,7 @@ OUI:4409B8*
  ID_OUI_FROM_DATABASE=Salcomp (Shenzhen) CO., LTD.
 
 OUI:440CEE*
- ID_OUI_FROM_DATABASE=Robert Bosch Elektronika Kft
+ ID_OUI_FROM_DATABASE=Robert Bosch Elektronikai Kft.
 
 OUI:440CFD*
  ID_OUI_FROM_DATABASE=NetMan Co., Ltd.
@@ -58307,6 +58799,9 @@ OUI:441441*
 OUI:441622*
  ID_OUI_FROM_DATABASE=Microsoft Corporation
 
+OUI:4416FA*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:441793*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -58367,6 +58862,9 @@ OUI:4423AA*
 OUI:4425BB*
  ID_OUI_FROM_DATABASE=Bamboo Entertainment Corporation
 
+OUI:44272E*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:4427F3*
  ID_OUI_FROM_DATABASE=70mai Co.,Ltd.
 
@@ -58397,6 +58895,9 @@ OUI:443192*
 OUI:44322A*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
+OUI:443262*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:4432C2*
  ID_OUI_FROM_DATABASE=GOAL Co., Ltd.
 
@@ -58454,6 +58955,12 @@ OUI:443E07*
 OUI:443EB2*
  ID_OUI_FROM_DATABASE=DEOTRON Co., LTD.
 
+OUI:4441F0*
+ ID_OUI_FROM_DATABASE=zte corporation
+
+OUI:444201*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:44422F*
  ID_OUI_FROM_DATABASE=TESTOP CO.,LTD.
 
@@ -58481,6 +58988,9 @@ OUI:4448C1*
 OUI:4448FF*
  ID_OUI_FROM_DATABASE=Qingdao Haier Technology Co.,Ltd
 
+OUI:444988*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:444A65*
  ID_OUI_FROM_DATABASE=Silverflare Ltd.
 
@@ -58547,6 +59057,9 @@ OUI:44599F*
 OUI:4459E3*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:445ADF*
+ ID_OUI_FROM_DATABASE=MIKAMI & CO., LTD.
+
 OUI:445BED*
  ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
 
@@ -58577,6 +59090,9 @@ OUI:44619C*
 OUI:446246*
  ID_OUI_FROM_DATABASE=Comat AG
 
+OUI:44643C*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:44650D*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -58760,6 +59276,9 @@ OUI:448C00*
 OUI:448C52*
  ID_OUI_FROM_DATABASE=KTIS CO., Ltd
 
+OUI:448CAB*
+ ID_OUI_FROM_DATABASE=Beijing Flitlink Vientiane Technology Co., LTD
+
 OUI:448DBF*
  ID_OUI_FROM_DATABASE=Rhino Mobility LLC
 
@@ -58769,6 +59288,9 @@ OUI:448E12*
 OUI:448E81*
  ID_OUI_FROM_DATABASE=VIG
 
+OUI:448EEC*
+ ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
+
 OUI:448F17*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co., Ltd. ARTIK
 
@@ -58958,6 +59480,9 @@ OUI:44B4B2*
 OUI:44B6BE*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:44B7D0*
+ ID_OUI_FROM_DATABASE=Microchip Technology Inc.
+
 OUI:44B994*
  ID_OUI_FROM_DATABASE=Douglas Lighting Controls
 
@@ -59030,6 +59555,9 @@ OUI:44D1FA*
 OUI:44D244*
  ID_OUI_FROM_DATABASE=Seiko Epson Corporation
 
+OUI:44D267*
+ ID_OUI_FROM_DATABASE=Snorble
+
 OUI:44D2CA*
  ID_OUI_FROM_DATABASE=Anvia TV Oy
 
@@ -59051,6 +59579,9 @@ OUI:44D454*
 OUI:44D4E0*
  ID_OUI_FROM_DATABASE=Sony Corporation
 
+OUI:44D506*
+ ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
+
 OUI:44D5A5*
  ID_OUI_FROM_DATABASE=AddOn Computer
 
@@ -59144,6 +59675,9 @@ OUI:44E08E*
 OUI:44E137*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:44E2F1*
+ ID_OUI_FROM_DATABASE=NewRadio Technologies Co. , Ltd.
+
 OUI:44E49A*
  ID_OUI_FROM_DATABASE=OMNITRONICS PTY LTD
 
@@ -59369,6 +59903,9 @@ OUI:4818FA*
 OUI:481A84*
  ID_OUI_FROM_DATABASE=Pointer Telocation Ltd
 
+OUI:481B40*
+ ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
+
 OUI:481BD2*
  ID_OUI_FROM_DATABASE=Intron Scientific co., ltd.
 
@@ -59573,6 +60110,9 @@ OUI:485519*
 OUI:48555C*
  ID_OUI_FROM_DATABASE=Wu Qi Technologies,Inc.
 
+OUI:48555E*
+ ID_OUI_FROM_DATABASE=Shenzhen Skyworth  Digital  Technology  CO., Ltd
+
 OUI:48555F*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
@@ -59615,6 +60155,9 @@ OUI:485D60*
 OUI:485DEB*
  ID_OUI_FROM_DATABASE=Just Add Power
 
+OUI:485DED*
+ ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
+
 OUI:485F99*
  ID_OUI_FROM_DATABASE=Cloud Network Technology (Samoa) Limited
 
@@ -59831,6 +60374,9 @@ OUI:488E42*
 OUI:488EEF*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:488F4C*
+ ID_OUI_FROM_DATABASE=shenzhen trolink  Technology Co.,Ltd
+
 OUI:488F5A*
  ID_OUI_FROM_DATABASE=Routerboard.com
 
@@ -59999,6 +60545,12 @@ OUI:48C093*
 OUI:48C1AC*
  ID_OUI_FROM_DATABASE=PLANTRONICS, INC.
 
+OUI:48C1EE*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
+OUI:48C35A*
+ ID_OUI_FROM_DATABASE=LENOVO(BEIJING)CO., LTD.
+
 OUI:48C3B0*
  ID_OUI_FROM_DATABASE=Pharos Co.Ltd
 
@@ -60119,6 +60671,9 @@ OUI:48E695*
 OUI:48E6C0*
  ID_OUI_FROM_DATABASE=SIMCom Wireless Solutions Co.,Ltd.
 
+OUI:48E729*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:48E7DA*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
@@ -60347,9 +60902,15 @@ OUI:4C2219*
 OUI:4C2258*
  ID_OUI_FROM_DATABASE=cozybit, Inc.
 
+OUI:4C22F3*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
 OUI:4C2498*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:4C24CE*
+ ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
+
 OUI:4C2578*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
@@ -60554,6 +61115,12 @@ OUI:4C56DF*
 OUI:4C57CA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:4C5BB3*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
+OUI:4C5CDF*
+ ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
+
 OUI:4C5D3C*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -60689,6 +61256,48 @@ OUI:4C7403*
 OUI:4C7487*
  ID_OUI_FROM_DATABASE=Leader Phone Communication Technology Co., Ltd.
 
+OUI:4C74A70*
+ ID_OUI_FROM_DATABASE=Shenzhen Timekettle Technologies Co.,Ltd
+
+OUI:4C74A71*
+ ID_OUI_FROM_DATABASE=Shenzhen Hollyland Technology Co.,Ltd
+
+OUI:4C74A72*
+ ID_OUI_FROM_DATABASE=Cyanview
+
+OUI:4C74A73*
+ ID_OUI_FROM_DATABASE=GoCodeIT Inc
+
+OUI:4C74A74*
+ ID_OUI_FROM_DATABASE=Wuxi Micro Innovation Integrated Circuit Design Co., Ltd
+
+OUI:4C74A75*
+ ID_OUI_FROM_DATABASE=AGILITY ROBOTICS, INC.
+
+OUI:4C74A76*
+ ID_OUI_FROM_DATABASE=ABB LV Installation Materials Co., Ltd. Beijing
+
+OUI:4C74A77*
+ ID_OUI_FROM_DATABASE=COREIP TECHNOLOGY PRIVATE LIMITED
+
+OUI:4C74A78*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:4C74A79*
+ ID_OUI_FROM_DATABASE=Suzhou XiongLi Technology Inc.
+
+OUI:4C74A7A*
+ ID_OUI_FROM_DATABASE=RAONARK
+
+OUI:4C74A7B*
+ ID_OUI_FROM_DATABASE=traplinked Gmbh
+
+OUI:4C74A7C*
+ ID_OUI_FROM_DATABASE=N3com
+
+OUI:4C74A7D*
+ ID_OUI_FROM_DATABASE=ddcpersia
+
 OUI:4C74BF*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -60752,6 +61361,9 @@ OUI:4C80BA*
 OUI:4C8120*
  ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 
+OUI:4C82A9*
+ ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
+
 OUI:4C82CF*
  ID_OUI_FROM_DATABASE=Dish Technologies Corp
 
@@ -60852,7 +61464,7 @@ OUI:4C93A64*
  ID_OUI_FROM_DATABASE=4TheWall - 4D Sistem A.S
 
 OUI:4C93A65*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Fastenal IP Company
 
 OUI:4C93A66*
  ID_OUI_FROM_DATABASE=Shandong Senter Electronic Co., Ltd
@@ -60887,6 +61499,9 @@ OUI:4C9614*
 OUI:4C962D*
  ID_OUI_FROM_DATABASE=Fresh AB
 
+OUI:4C968A*
+ ID_OUI_FROM_DATABASE=Wacom Co.,Ltd.
+
 OUI:4C98EF*
  ID_OUI_FROM_DATABASE=Zeo
 
@@ -60968,6 +61583,9 @@ OUI:4CAEEC*
 OUI:4CB008*
  ID_OUI_FROM_DATABASE=Shenzhen Gwelltimes Technology Co.,Ltd
 
+OUI:4CB087*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:4CB0E8*
  ID_OUI_FROM_DATABASE=Beijing RongZhi xinghua technology co., LTD
 
@@ -61016,6 +61634,9 @@ OUI:4CB9C8*
 OUI:4CB9EA*
  ID_OUI_FROM_DATABASE=iRobot Corporation
 
+OUI:4CBA7D*
+ ID_OUI_FROM_DATABASE=Gemtek Technology Co., Ltd.
+
 OUI:4CBAA3*
  ID_OUI_FROM_DATABASE=Bison Electronics Inc.
 
@@ -61334,6 +61955,9 @@ OUI:4CFBF4*
 OUI:4CFBFE*
  ID_OUI_FROM_DATABASE=Sercomm Japan Corporation
 
+OUI:4CFC22*
+ ID_OUI_FROM_DATABASE=SHANGHAI HI-TECH CONTROL SYSTEM CO.,LTD.
+
 OUI:4CFCAA*
  ID_OUI_FROM_DATABASE=Tesla,Inc.
 
@@ -61373,6 +61997,9 @@ OUI:500604*
 OUI:5006AB*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:5007C3*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:500959*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
@@ -61382,6 +62009,9 @@ OUI:5009E5*
 OUI:500A52*
  ID_OUI_FROM_DATABASE=Huiwan Technologies Co. Ltd
 
+OUI:500B26*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:500B32*
  ID_OUI_FROM_DATABASE=Foxda Technology Industrial(ShenZhen)Co.,LTD
 
@@ -61457,6 +62087,9 @@ OUI:501479*
 OUI:5014B5*
  ID_OUI_FROM_DATABASE=Richfit Information Technology Co., Ltd
 
+OUI:5014C1*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:5017FF*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -61496,6 +62129,9 @@ OUI:5021EC*
 OUI:502267*
  ID_OUI_FROM_DATABASE=PixeLINK
 
+OUI:50236D*
+ ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
+
 OUI:5023A2*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -61505,6 +62141,12 @@ OUI:50252B*
 OUI:502690*
  ID_OUI_FROM_DATABASE=FUJITSU LIMITED
 
+OUI:5026EF*
+ ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
+
+OUI:5027A9*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:5027C7*
  ID_OUI_FROM_DATABASE=TECHNART Co.,Ltd
 
@@ -61637,6 +62279,9 @@ OUI:504061*
 OUI:50411C*
  ID_OUI_FROM_DATABASE=AMPAK Technology,Inc.
 
+OUI:504172*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:5041B9*
  ID_OUI_FROM_DATABASE=I-O DATA DEVICE,INC.
 
@@ -61661,9 +62306,15 @@ OUI:50465D*
 OUI:5046AE*
  ID_OUI_FROM_DATABASE=MERCURY CORPORATION
 
+OUI:504877*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
 OUI:5048EB*
  ID_OUI_FROM_DATABASE=BEIJING HAIHEJINSHENG NETWORK TECHNOLOGY CO. LTD.
 
+OUI:504921*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:5049B0*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -61751,6 +62402,9 @@ OUI:5058B0*
 OUI:505967*
  ID_OUI_FROM_DATABASE=Intent Solutions Inc
 
+OUI:505A65*
+ ID_OUI_FROM_DATABASE=AzureWave Technologies, Inc.
+
 OUI:505AC6*
  ID_OUI_FROM_DATABASE=GUANGDONG SUPER TELECOM CO.,LTD.
 
@@ -62315,6 +62969,9 @@ OUI:50D2F5*
 OUI:50D37F*
  ID_OUI_FROM_DATABASE=Yu Fly Mikly Way Science and Technology Co., Ltd.
 
+OUI:50D45C*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:50D4F7*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -62519,6 +63176,9 @@ OUI:50FC30*
 OUI:50FC9F*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:50FDD5*
+ ID_OUI_FROM_DATABASE=SJI Industry Company
+
 OUI:50FEF2*
  ID_OUI_FROM_DATABASE=Sify Technologies Ltd
 
@@ -62624,6 +63284,9 @@ OUI:540E58*
 OUI:540F57*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
+OUI:54102E*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:541031*
  ID_OUI_FROM_DATABASE=SMARTO
 
@@ -62894,6 +63557,9 @@ OUI:5462E2*
 OUI:5464D9*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:5464DE*
+ ID_OUI_FROM_DATABASE=u-blox AG
+
 OUI:546503*
  ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co., Ltd.
 
@@ -62936,6 +63602,9 @@ OUI:546D52*
 OUI:546F71*
  ID_OUI_FROM_DATABASE=uAvionix Corporation
 
+OUI:547068*
+ ID_OUI_FROM_DATABASE=VTech Communications Limited
+
 OUI:5471DD*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -63287,12 +63956,18 @@ OUI:54C33E*
 OUI:54C415*
  ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 
+OUI:54C45B*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
 OUI:54C480*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
 OUI:54C57A*
  ID_OUI_FROM_DATABASE=Sunnovo International Limited
 
+OUI:54C6FF*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:54C80F*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -63341,6 +64016,9 @@ OUI:54D46F*
 OUI:54D751*
  ID_OUI_FROM_DATABASE=Proximus
 
+OUI:54D7E3*
+ ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
+
 OUI:54D9C6*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -63386,6 +64064,9 @@ OUI:54E15B*
 OUI:54E1AD*
  ID_OUI_FROM_DATABASE=LCFC(HeFei) Electronics Technology co., ltd
 
+OUI:54E1B6*
+ ID_OUI_FROM_DATABASE=Renesas Electronics (Penang) Sdn. Bhd.
+
 OUI:54E2C8*
  ID_OUI_FROM_DATABASE=Dongguan Aoyuan Electronics Technology Co., Ltd
 
@@ -63587,6 +64268,9 @@ OUI:581FEF*
 OUI:582059*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:582071*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:58208A0*
  ID_OUI_FROM_DATABASE=Annapurna labs
 
@@ -63731,6 +64415,45 @@ OUI:5846E1*
 OUI:584704*
  ID_OUI_FROM_DATABASE=Shenzhen Webridge Technology Co.,Ltd
 
+OUI:5847CA0*
+ ID_OUI_FROM_DATABASE=LITUM BILGI TEKNOLOJILERI SAN. VE TIC. A.S.
+
+OUI:5847CA1*
+ ID_OUI_FROM_DATABASE=Hexagon Metrology Services Ltd.
+
+OUI:5847CA2*
+ ID_OUI_FROM_DATABASE=ONAWHIM (OAW) INC.
+
+OUI:5847CA4*
+ ID_OUI_FROM_DATABASE=Future Tech Development FZC LLC
+
+OUI:5847CA6*
+ ID_OUI_FROM_DATABASE=Shenzhen C & D Electronics Co., Ltd.
+
+OUI:5847CA7*
+ ID_OUI_FROM_DATABASE=Shenzhen Meigao Electronic Equipment Co.,Ltd
+
+OUI:5847CA8*
+ ID_OUI_FROM_DATABASE=Birger Engineering, Inc.
+
+OUI:5847CA9*
+ ID_OUI_FROM_DATABASE=Kingnuo Intelligent Technology (Jiaxing) Co., Ltd.
+
+OUI:5847CAA*
+ ID_OUI_FROM_DATABASE=Powder Watts, LLC
+
+OUI:5847CAB*
+ ID_OUI_FROM_DATABASE=Suzhou Laisai Intelligence Technology Co.,Ltd
+
+OUI:5847CAC*
+ ID_OUI_FROM_DATABASE=SMS ELECTRIC CO., LTD ZHENGZHOU
+
+OUI:5847CAD*
+ ID_OUI_FROM_DATABASE=PRACTEK Technology Co., Ltd.
+
+OUI:5847CAE*
+ ID_OUI_FROM_DATABASE=AZURE SUMMIT TECHNOLOGY
+
 OUI:584822*
  ID_OUI_FROM_DATABASE=Sony Corporation
 
@@ -63833,9 +64556,15 @@ OUI:5856E8*
 OUI:58570D*
  ID_OUI_FROM_DATABASE=Danfoss Solar Inverters
 
+OUI:5858CD*
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
+
 OUI:5859C2*
  ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
+OUI:585B69*
+ ID_OUI_FROM_DATABASE=TVT CO., LTD
+
 OUI:585FF6*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -63887,6 +64616,9 @@ OUI:586B14*
 OUI:586C25*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:586D67*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:586D8F*
  ID_OUI_FROM_DATABASE=Cisco-Linksys, LLC
 
@@ -63896,6 +64628,9 @@ OUI:586ED6*
 OUI:5870C6*
  ID_OUI_FROM_DATABASE=Shanghai Xiaoyi Technology Co., Ltd.
 
+OUI:5873D1*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:587521*
  ID_OUI_FROM_DATABASE=CJSC RTSoft
 
@@ -63998,6 +64733,9 @@ OUI:5891CF*
 OUI:58920D*
  ID_OUI_FROM_DATABASE=Kinetic Avionics Limited
 
+OUI:589351*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:589396*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
@@ -64019,6 +64757,9 @@ OUI:5894B2*
 OUI:5894CF*
  ID_OUI_FROM_DATABASE=Vertex Standard LMR, Inc.
 
+OUI:58957E*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:5895D80*
  ID_OUI_FROM_DATABASE=Shenzhen DOOGEE Hengtong Technology CO.,LTD
 
@@ -64172,6 +64913,9 @@ OUI:58B633*
 OUI:58B961*
  ID_OUI_FROM_DATABASE=SOLEM Electronique
 
+OUI:58B965*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:58B9E1*
  ID_OUI_FROM_DATABASE=Crystalfontz America, Inc.
 
@@ -64304,6 +65048,12 @@ OUI:58E28F*
 OUI:58E326*
  ID_OUI_FROM_DATABASE=Compass Technologies Inc.
 
+OUI:58E403*
+ ID_OUI_FROM_DATABASE=Wistron Neweb Corporation
+
+OUI:58E434*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:58E476*
  ID_OUI_FROM_DATABASE=CENTRON COMMUNICATIONS TECHNOLOGIES FUJIAN CO.,LTD
 
@@ -64392,7 +65142,7 @@ OUI:58F2FC*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
 OUI:58F387*
- ID_OUI_FROM_DATABASE=HCCP
+ ID_OUI_FROM_DATABASE=Airios
 
 OUI:58F39C*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@@ -64406,6 +65156,9 @@ OUI:58F67B*
 OUI:58F6BF*
  ID_OUI_FROM_DATABASE=Kyoto University
 
+OUI:58F85C*
+ ID_OUI_FROM_DATABASE=LLC Proizvodstvennaya Kompania TransService
+
 OUI:58F987*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -64586,6 +65339,9 @@ OUI:5C1DD9*
 OUI:5C20D0*
  ID_OUI_FROM_DATABASE=Asoni Communication Co., Ltd.
 
+OUI:5C2167*
+ ID_OUI_FROM_DATABASE=Rockwell Automation
+
 OUI:5C22C4*
  ID_OUI_FROM_DATABASE=DAE EUN ELETRONICS CO., LTD
 
@@ -64610,6 +65366,9 @@ OUI:5C260A*
 OUI:5C2623*
  ID_OUI_FROM_DATABASE=WaveLynx Technologies Corporation
 
+OUI:5C2763*
+ ID_OUI_FROM_DATABASE=Itibia Technologies
+
 OUI:5C27D4*
  ID_OUI_FROM_DATABASE=Shenzhen Qihu Intelligent Technology Company Limited
 
@@ -64625,6 +65384,9 @@ OUI:5C2E59*
 OUI:5C2ED2*
  ID_OUI_FROM_DATABASE=ABC(XiSheng) Electronics Co.,Ltd
 
+OUI:5C2FAF*
+ ID_OUI_FROM_DATABASE=HomeWizard B.V.
+
 OUI:5C313E*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -64694,6 +65456,9 @@ OUI:5C4527*
 OUI:5C46B0*
  ID_OUI_FROM_DATABASE=SIMCom Wireless Solutions Limited
 
+OUI:5C475E*
+ ID_OUI_FROM_DATABASE=Ring LLC
+
 OUI:5C4979*
  ID_OUI_FROM_DATABASE=AVM Audiovisuelles Marketing und Computersysteme GmbH
 
@@ -65036,6 +65801,9 @@ OUI:5C9AA1*
 OUI:5C9AD8*
  ID_OUI_FROM_DATABASE=FUJITSU LIMITED
 
+OUI:5CA06C*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:5CA176*
  ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
 
@@ -65081,6 +65849,9 @@ OUI:5CA933*
 OUI:5CAAFD*
  ID_OUI_FROM_DATABASE=Sonos, Inc.
 
+OUI:5CAC3D*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:5CAC4C*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -65144,6 +65915,9 @@ OUI:5CBA37*
 OUI:5CBAEF*
  ID_OUI_FROM_DATABASE=CHONGQING FUGUI ELECTRONICS CO.,LTD.
 
+OUI:5CBBEE*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:5CBD9A*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -65177,6 +65951,9 @@ OUI:5CC6D0*
 OUI:5CC6E9*
  ID_OUI_FROM_DATABASE=Edifier International
 
+OUI:5CC7C1*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:5CC7D7*
  ID_OUI_FROM_DATABASE=AZROAD TECHNOLOGY COMPANY LIMITED
 
@@ -65459,6 +66236,9 @@ OUI:5CFB7C*
 OUI:5CFC66*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:5CFC6E*
+ ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
+
 OUI:5CFE9E*
  ID_OUI_FROM_DATABASE=Wiwynn Corporation Tainan Branch
 
@@ -65471,6 +66251,9 @@ OUI:5CFFFF*
 OUI:600194*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:6001B1*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:600292*
  ID_OUI_FROM_DATABASE=PEGATRON CORPORATION
 
@@ -65801,15 +66584,24 @@ OUI:6055F9*
 OUI:605661*
  ID_OUI_FROM_DATABASE=IXECLOUD Tech
 
+OUI:60567D*
+ ID_OUI_FROM_DATABASE=AM Telecom co., Ltd.
+
 OUI:605699*
  ID_OUI_FROM_DATABASE=Private
 
 OUI:605718*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:605747*
+ ID_OUI_FROM_DATABASE=CIG SHANGHAI CO LTD
+
 OUI:60577D*
  ID_OUI_FROM_DATABASE=eero inc.
 
+OUI:605801*
+ ID_OUI_FROM_DATABASE=Shandong ZTop Microelectronics Co., Ltd.
+
 OUI:605B30*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -65876,6 +66668,9 @@ OUI:606C66*
 OUI:606D3C*
  ID_OUI_FROM_DATABASE=Luxshare Precision Industry Company Limited
 
+OUI:606D9D*
+ ID_OUI_FROM_DATABASE=Otto Bock Healthcare Products GmbH
+
 OUI:606DC7*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -65885,6 +66680,9 @@ OUI:606ED0*
 OUI:606EE8*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:60706C*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:607072*
  ID_OUI_FROM_DATABASE=SHENZHEN HONGDE SMART LINK TECHNOLOGY CO., LTD
 
@@ -66104,6 +66902,9 @@ OUI:60A10A*
 OUI:60A11E*
  ID_OUI_FROM_DATABASE=Wuhan Maxsine Electric Co.,Ltd.
 
+OUI:60A2C6*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:60A37D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -66233,6 +67034,9 @@ OUI:60C658*
 OUI:60C798*
  ID_OUI_FROM_DATABASE=Verifone
 
+OUI:60C7BE*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:60C980*
  ID_OUI_FROM_DATABASE=Trymus
 
@@ -66590,6 +67394,9 @@ OUI:641269*
 OUI:641331*
  ID_OUI_FROM_DATABASE=Bosch Car Multimedia (Wuhu) Co. Ltd.
 
+OUI:64135A*
+ ID_OUI_FROM_DATABASE=Itectra A/S
+
 OUI:64136C*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -66668,6 +67475,9 @@ OUI:642737*
 OUI:642753*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:642943*
+ ID_OUI_FROM_DATABASE=D-Link Corporation
+
 OUI:6429ED*
  ID_OUI_FROM_DATABASE=AO PKK Milandr
 
@@ -66819,7 +67629,7 @@ OUI:644346*
  ID_OUI_FROM_DATABASE=GuangDong Quick Network Computer CO.,LTD
 
 OUI:6444D5*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=TD Tech
 
 OUI:6447E0*
  ID_OUI_FROM_DATABASE=Feitian Technologies Co., Ltd
@@ -67094,6 +67904,9 @@ OUI:647BD4*
 OUI:647C34*
  ID_OUI_FROM_DATABASE=Ubee Interactive Co., Limited
 
+OUI:647CE8*
+ ID_OUI_FROM_DATABASE=Palo Alto Networks
+
 OUI:647D81*
  ID_OUI_FROM_DATABASE=YOKOTA INDUSTRIAL CO,.LTD
 
@@ -67124,6 +67937,9 @@ OUI:64899A*
 OUI:6489F1*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:648CBB*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:648D9E*
  ID_OUI_FROM_DATABASE=IVT Electronic Co.,Ltd
 
@@ -67259,6 +68075,9 @@ OUI:64B473*
 OUI:64B5C6*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
+OUI:64B5F2*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:64B623*
  ID_OUI_FROM_DATABASE=Schrack Seconet Care Communication GmbH
 
@@ -67376,6 +68195,9 @@ OUI:64D241*
 OUI:64D2C4*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:64D315*
+ ID_OUI_FROM_DATABASE=HMD Global Oy
+
 OUI:64D4BD*
  ID_OUI_FROM_DATABASE=ALPSALPINE CO,.LTD
 
@@ -67406,6 +68228,9 @@ OUI:64DAA0*
 OUI:64DB18*
  ID_OUI_FROM_DATABASE=OpenPattern
 
+OUI:64DB38*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:64DB43*
  ID_OUI_FROM_DATABASE=Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
 
@@ -67418,6 +68243,9 @@ OUI:64DB8B*
 OUI:64DBA0*
  ID_OUI_FROM_DATABASE=Select Comfort
 
+OUI:64DBF7*
+ ID_OUI_FROM_DATABASE=Nokia Shanghai Bell Co., Ltd.
+
 OUI:64DC01*
  ID_OUI_FROM_DATABASE=Static Systems Group PLC
 
@@ -67448,6 +68276,9 @@ OUI:64E161*
 OUI:64E172*
  ID_OUI_FROM_DATABASE=Shenzhen Qihoo Intelligent Technology Co.,Ltd
 
+OUI:64E220*
+ ID_OUI_FROM_DATABASE=Qisda Corporation
+
 OUI:64E599*
  ID_OUI_FROM_DATABASE=EFM Networks
 
@@ -67460,6 +68291,9 @@ OUI:64E682*
 OUI:64E7D8*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:64E833*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:64E84F*
  ID_OUI_FROM_DATABASE=Serialway Communication Technology Co. Ltd
 
@@ -67631,6 +68465,9 @@ OUI:681295*
 OUI:681324*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:6813E2*
+ ID_OUI_FROM_DATABASE=Eltex Enterprise LTD
+
 OUI:681401*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -67655,6 +68492,9 @@ OUI:68193F*
 OUI:6819AC*
  ID_OUI_FROM_DATABASE=Guangzhou Xianyou Intelligent Technogoly CO., LTD
 
+OUI:681AA4*
+ ID_OUI_FROM_DATABASE=Shenzhen Skyworth  Digital  Technology  CO., Ltd
+
 OUI:681AB2*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -67688,6 +68528,9 @@ OUI:68228E*
 OUI:68234B*
  ID_OUI_FROM_DATABASE=Nihon Dengyo Kousaku
 
+OUI:682624*
+ ID_OUI_FROM_DATABASE=Ergatta
+
 OUI:68262A*
  ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
 
@@ -67697,6 +68540,9 @@ OUI:682719*
 OUI:682737*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:68275F*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:6828BA*
  ID_OUI_FROM_DATABASE=Dejai
 
@@ -67775,6 +68621,9 @@ OUI:683F7D*
 OUI:68403C*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
+OUI:68418F*
+ ID_OUI_FROM_DATABASE=Telechips, Inc.
+
 OUI:684352*
  ID_OUI_FROM_DATABASE=Bhuu Limited
 
@@ -67793,6 +68642,9 @@ OUI:684749*
 OUI:684898*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:684992*
+ ID_OUI_FROM_DATABASE=Cisco Meraki
+
 OUI:6849B2*
  ID_OUI_FROM_DATABASE=CARLO GAVAZZI LTD
 
@@ -67904,6 +68756,9 @@ OUI:6869CA*
 OUI:6869F2*
  ID_OUI_FROM_DATABASE=ComAp s.r.o.
 
+OUI:686CE6*
+ ID_OUI_FROM_DATABASE=Microsoft Corporation
+
 OUI:686DBC*
  ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 
@@ -68039,6 +68894,9 @@ OUI:6886A7*
 OUI:6886E7*
  ID_OUI_FROM_DATABASE=Orbotix, Inc.
 
+OUI:68871C*
+ ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
+
 OUI:68876B*
  ID_OUI_FROM_DATABASE=INQ Mobile Limited
 
@@ -68132,6 +68990,9 @@ OUI:689361*
 OUI:689423*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
+OUI:68962E*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:68966A*
  ID_OUI_FROM_DATABASE=OHSUNG
 
@@ -68216,6 +69077,9 @@ OUI:68A878*
 OUI:68A8E1*
  ID_OUI_FROM_DATABASE=Wacom Co.,Ltd.
 
+OUI:68AAC4*
+ ID_OUI_FROM_DATABASE=Altice Labs S.A.
+
 OUI:68AAD2*
  ID_OUI_FROM_DATABASE=DATECS LTD.,
 
@@ -68261,6 +69125,9 @@ OUI:68B6B3*
 OUI:68B6FC*
  ID_OUI_FROM_DATABASE=Hitron Technologies. Inc
 
+OUI:68B8BB*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Electronics Co.,Ltd
+
 OUI:68B8D9*
  ID_OUI_FROM_DATABASE=Act KDE, Inc.
 
@@ -68324,6 +69191,9 @@ OUI:68D1FD*
 OUI:68D247*
  ID_OUI_FROM_DATABASE=Portalis LC
 
+OUI:68D40C*
+ ID_OUI_FROM_DATABASE=TELLESCOM INDUSTRIA E COMERCIO EM TELECOMUNICACAO
+
 OUI:68D482*
  ID_OUI_FROM_DATABASE=SHENZHEN GONGJIN ELECTRONICS CO.,LT
 
@@ -68378,6 +69248,9 @@ OUI:68E154*
 OUI:68E166*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:68E1DC*
+ ID_OUI_FROM_DATABASE=BUFFALO.INC
+
 OUI:68E209*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -68417,6 +69290,9 @@ OUI:68ED43*
 OUI:68EDA4*
  ID_OUI_FROM_DATABASE=Shenzhen Seavo Technology Co.,Ltd
 
+OUI:68EE4B*
+ ID_OUI_FROM_DATABASE=Sharetronic Data Technology Co.,Ltd
+
 OUI:68EE88*
  ID_OUI_FROM_DATABASE=Shenzhen TINNO Mobile Technology Corp.
 
@@ -68444,6 +69320,9 @@ OUI:68F125*
 OUI:68F38E*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:68F543*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:68F728*
  ID_OUI_FROM_DATABASE=LCFC(HeFei) Electronics Technology co., ltd
 
@@ -68462,6 +69341,9 @@ OUI:68FB95*
 OUI:68FCB3*
  ID_OUI_FROM_DATABASE=Next Level Security Systems, Inc.
 
+OUI:68FCB6*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:68FCCA*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -68753,6 +69635,9 @@ OUI:6C3C53*
 OUI:6C3C7C*
  ID_OUI_FROM_DATABASE=CANON INC.
 
+OUI:6C3C8C*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:6C3E6D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -68819,6 +69704,9 @@ OUI:6C4D73*
 OUI:6C4E86*
  ID_OUI_FROM_DATABASE=Third Millennium Systems Ltd.
 
+OUI:6C4EF6*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:6C504D*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -68828,6 +69716,9 @@ OUI:6C51BF*
 OUI:6C54CD*
  ID_OUI_FROM_DATABASE=LAMPEX ELECTRONICS LIMITED
 
+OUI:6C5563*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:6C558D*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -68906,6 +69797,9 @@ OUI:6C5C3DD*
 OUI:6C5C3DE*
  ID_OUI_FROM_DATABASE=Clinton Electronics Corporation
 
+OUI:6C5CB1*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:6C5CDE*
  ID_OUI_FROM_DATABASE=SunReports, Inc.
 
@@ -68945,6 +69839,9 @@ OUI:6C639C*
 OUI:6C641A*
  ID_OUI_FROM_DATABASE=Penguin Computing
 
+OUI:6C6567*
+ ID_OUI_FROM_DATABASE=BELIMO Automation AG
+
 OUI:6C67EF*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -68972,6 +69869,9 @@ OUI:6C7039*
 OUI:6C709F*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:6C70CB*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:6C710D*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -68990,6 +69890,9 @@ OUI:6C7220*
 OUI:6C724A*
  ID_OUI_FROM_DATABASE=Onkyo Technology K.K.
 
+OUI:6C72E2*
+ ID_OUI_FROM_DATABASE=amitek
+
 OUI:6C72E7*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -69005,6 +69908,9 @@ OUI:6C7660*
 OUI:6C79B8*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:6C7E67*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:6C81FE*
  ID_OUI_FROM_DATABASE=Mitsuba Corporation
 
@@ -69048,7 +69954,7 @@ OUI:6C90B1*
  ID_OUI_FROM_DATABASE=SanLogic Inc
 
 OUI:6C9106*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Katena Computing Technologies
 
 OUI:6C92BF*
  ID_OUI_FROM_DATABASE=Inspur Electronic Information Industry Co.,Ltd.
@@ -69119,6 +70025,9 @@ OUI:6C96CF*
 OUI:6C976D*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
+OUI:6C97AA*
+ ID_OUI_FROM_DATABASE=AI TECHNOLOGY CO.,LTD.
+
 OUI:6C98EB*
  ID_OUI_FROM_DATABASE=Riverbed Technology, Inc.
 
@@ -69239,6 +70148,9 @@ OUI:6CB0CE*
 OUI:6CB0FD*
  ID_OUI_FROM_DATABASE=Shenzhen Xinghai Iot Technology Co.,Ltd
 
+OUI:6CB133*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:6CB158*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -69341,6 +70253,9 @@ OUI:6CD032*
 OUI:6CD146*
  ID_OUI_FROM_DATABASE=FRAMOS GmbH
 
+OUI:6CD199*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:6CD1B0*
  ID_OUI_FROM_DATABASE=WING SING ELECTRONICS HONG KONG LIMITED
 
@@ -69551,6 +70466,9 @@ OUI:7001B5*
 OUI:700258*
  ID_OUI_FROM_DATABASE=01DB-METRAVIB
 
+OUI:70033F*
+ ID_OUI_FROM_DATABASE=Pimax Technology(ShangHai)Co.,Ltd
+
 OUI:70037E*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
@@ -69671,6 +70589,9 @@ OUI:701F53*
 OUI:702084*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Industry Co., Ltd.
 
+OUI:7022FE*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:702393*
  ID_OUI_FROM_DATABASE=fos4X GmbH
 
@@ -69683,6 +70604,9 @@ OUI:702559*
 OUI:702605*
  ID_OUI_FROM_DATABASE=SONY Visual Products Inc.
 
+OUI:702804*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:70288B*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -69815,6 +70739,9 @@ OUI:70441C*
 OUI:704642*
  ID_OUI_FROM_DATABASE=CHYNG HONG ELECTRONIC CO., LTD.
 
+OUI:704777*
+ ID_OUI_FROM_DATABASE=Ruckus Wireless
+
 OUI:7047E9*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -69845,6 +70772,9 @@ OUI:704CED*
 OUI:704D7B*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
+OUI:704DE7*
+ ID_OUI_FROM_DATABASE=TECNO MOBILE LIMITED
+
 OUI:704E01*
  ID_OUI_FROM_DATABASE=KWANGWON TECH CO., LTD.
 
@@ -70376,6 +71306,9 @@ OUI:70ACD7*
 OUI:70AD54*
  ID_OUI_FROM_DATABASE=Malvern Instruments Ltd
 
+OUI:70AED5*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:70AF24*
  ID_OUI_FROM_DATABASE=TP Vision Belgium NV
 
@@ -71247,7 +72180,7 @@ OUI:70B3D5118*
  ID_OUI_FROM_DATABASE=Macromatic Industrial Controls, Inc.
 
 OUI:70B3D5119*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=YPP Corporation
 
 OUI:70B3D511A*
  ID_OUI_FROM_DATABASE=Mahindra Electric Mobility Limited
@@ -71817,7 +72750,7 @@ OUI:70B3D51D6*
  ID_OUI_FROM_DATABASE=MacGray Services
 
 OUI:70B3D51D7*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=BAE Systems Apllied Intelligence
 
 OUI:70B3D51D8*
  ID_OUI_FROM_DATABASE=Blue Skies Global LLC
@@ -72741,7 +73674,7 @@ OUI:70B3D530D*
  ID_OUI_FROM_DATABASE=Fiberbase
 
 OUI:70B3D530E*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Ecolonum Inc.
 
 OUI:70B3D530F*
  ID_OUI_FROM_DATABASE=Cardinal Scales Manufacturing Co
@@ -73539,7 +74472,7 @@ OUI:70B3D5418*
  ID_OUI_FROM_DATABASE=DEV Systemtechnik GmbH& Co KG
 
 OUI:70B3D541A*
- ID_OUI_FROM_DATABASE=HYOSUNG Power & Industrial Systems
+ ID_OUI_FROM_DATABASE=HYOSUNG Heavy Industries Corporation
 
 OUI:70B3D541B*
  ID_OUI_FROM_DATABASE=SYS TEC electronic GmbH
@@ -74199,7 +75132,7 @@ OUI:70B3D54F7*
  ID_OUI_FROM_DATABASE=Foxtel srl
 
 OUI:70B3D54F8*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=SICPA SA - GSS
 
 OUI:70B3D54F9*
  ID_OUI_FROM_DATABASE=OptoPrecision GmbH
@@ -74658,7 +75591,7 @@ OUI:70B3D5590*
  ID_OUI_FROM_DATABASE=812th AITS
 
 OUI:70B3D5591*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Medicomp, Inc
 
 OUI:70B3D5592*
  ID_OUI_FROM_DATABASE=CRDE
@@ -75309,7 +76242,7 @@ OUI:70B3D5669*
  ID_OUI_FROM_DATABASE=Panoramic Power
 
 OUI:70B3D566A*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Nomadic
 
 OUI:70B3D566B*
  ID_OUI_FROM_DATABASE=Innitive B.V.
@@ -77288,6 +78221,9 @@ OUI:70B3D58FE*
 OUI:70B3D58FF*
  ID_OUI_FROM_DATABASE=IMST GmbH
 
+OUI:70B3D5900*
+ ID_OUI_FROM_DATABASE=DCS Corp
+
 OUI:70B3D5901*
  ID_OUI_FROM_DATABASE=ATS-CONVERS,LLC
 
@@ -78201,7 +79137,7 @@ OUI:70B3D5A30*
  ID_OUI_FROM_DATABASE=SHEN ZHEN HUAWANG TECHNOLOGY CO; LTD
 
 OUI:70B3D5A31*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Wise Ally Holdings Limited
 
 OUI:70B3D5A32*
  ID_OUI_FROM_DATABASE=Toughdog Security Systems
@@ -80127,7 +81063,7 @@ OUI:70B3D5CB6*
  ID_OUI_FROM_DATABASE=Kuebrich Ingeniergesellschaft mbh & Co. KG
 
 OUI:70B3D5CB7*
- ID_OUI_FROM_DATABASE=HKC Limited
+ ID_OUI_FROM_DATABASE=HKC Security Ltd.
 
 OUI:70B3D5CB8*
  ID_OUI_FROM_DATABASE=Verti Tecnologia
@@ -81249,7 +82185,7 @@ OUI:70B3D5E2C*
  ID_OUI_FROM_DATABASE=Fourth Frontier Technologies Private Limited
 
 OUI:70B3D5E2D*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=BAE Systems Apllied Intelligence
 
 OUI:70B3D5E2E*
  ID_OUI_FROM_DATABASE=Merz s.r.o.
@@ -81975,7 +82911,7 @@ OUI:70B3D5F1E*
  ID_OUI_FROM_DATABASE=ATX NETWORKS LTD
 
 OUI:70B3D5F1F*
- ID_OUI_FROM_DATABASE=HKC Limited
+ ID_OUI_FROM_DATABASE=HKC Security Ltd.
 
 OUI:70B3D5F21*
  ID_OUI_FROM_DATABASE=dds
@@ -82658,6 +83594,9 @@ OUI:70B7AA*
 OUI:70B7E2*
  ID_OUI_FROM_DATABASE=Jiangsu Miter Technology Co.,Ltd.
 
+OUI:70B7E4*
+ ID_OUI_FROM_DATABASE=Broadcom Limited
+
 OUI:70B8F6*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -82700,6 +83639,9 @@ OUI:70C7F2*
 OUI:70C833*
  ID_OUI_FROM_DATABASE=Wirepas Oy
 
+OUI:70C932*
+ ID_OUI_FROM_DATABASE=Dreame Technology (Suzhou) Limited
+
 OUI:70C94E*
  ID_OUI_FROM_DATABASE=Liteon Technology Corporation
 
@@ -82961,9 +83903,15 @@ OUI:7404F0*
 OUI:7404F1*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:74057C*
+ ID_OUI_FROM_DATABASE=Qorvo International Pte. Ltd.
+
 OUI:7405A5*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
+OUI:7408DE*
+ ID_OUI_FROM_DATABASE=Fujian Landi Commercial Technology Co., Ltd.
+
 OUI:7409AC*
  ID_OUI_FROM_DATABASE=Quext, LLC
 
@@ -83003,6 +83951,9 @@ OUI:7415E2*
 OUI:741865*
  ID_OUI_FROM_DATABASE=Shanghai DareGlobal Technologies Co.,Ltd
 
+OUI:74190A*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:7419F80*
  ID_OUI_FROM_DATABASE=Marmitek
 
@@ -83117,6 +84068,9 @@ OUI:7422BB*
 OUI:742344*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:74249F*
+ ID_OUI_FROM_DATABASE=TIBRO Corp.
+
 OUI:74258A*
  ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
 
@@ -83162,6 +84116,9 @@ OUI:742F68*
 OUI:743170*
  ID_OUI_FROM_DATABASE=Arcadyan Technology Corporation
 
+OUI:743174*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:743256*
  ID_OUI_FROM_DATABASE=NT-ware Systemprg GmbH
 
@@ -83216,6 +84173,9 @@ OUI:743C18*
 OUI:743E2B*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
+OUI:743E39*
+ ID_OUI_FROM_DATABASE=YUSUR Technology Co., Ltd.
+
 OUI:743ECB*
  ID_OUI_FROM_DATABASE=Gentrice tech
 
@@ -83264,6 +84224,9 @@ OUI:744CA1*
 OUI:744D28*
  ID_OUI_FROM_DATABASE=Routerboard.com
 
+OUI:744D6D*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:744D79*
  ID_OUI_FROM_DATABASE=Arrive Systems Inc.
 
@@ -83294,6 +84257,9 @@ OUI:74563C*
 OUI:745798*
  ID_OUI_FROM_DATABASE=TRUMPF Laser GmbH + Co. KG
 
+OUI:745889*
+ ID_OUI_FROM_DATABASE=Multilaser Industrial S.A.
+
 OUI:7458F3*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -83597,6 +84563,9 @@ OUI:7491BD*
 OUI:7493A4*
  ID_OUI_FROM_DATABASE=Zebra Technologies Corp.
 
+OUI:7493DA*
+ ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
+
 OUI:74943D*
  ID_OUI_FROM_DATABASE=AgJunction
 
@@ -83723,6 +84692,9 @@ OUI:74B7B3*
 OUI:74B7E6*
  ID_OUI_FROM_DATABASE=Zegna-Daidong Limited
 
+OUI:74B839*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:74B91E*
  ID_OUI_FROM_DATABASE=Nanjing Bestway Automation System Co., Ltd
 
@@ -83828,6 +84800,9 @@ OUI:74D6CB*
 OUI:74D6EA*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:74D713*
+ ID_OUI_FROM_DATABASE=Huaqin Technology Co.,Ltd
+
 OUI:74D7CA*
  ID_OUI_FROM_DATABASE=Panasonic Corporation Automotive
 
@@ -83837,6 +84812,9 @@ OUI:74D83E*
 OUI:74D850*
  ID_OUI_FROM_DATABASE=Evrisko Systems
 
+OUI:74D873*
+ ID_OUI_FROM_DATABASE=GUANGDONG GENIUS TECHNOLOGY CO., LTD.
+
 OUI:74D9EB*
  ID_OUI_FROM_DATABASE=Petabit Scale, Inc.
 
@@ -84146,6 +85124,9 @@ OUI:78058C*
 OUI:7806C9*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:78071C*
+ ID_OUI_FROM_DATABASE=Green Energy Options Ltd
+
 OUI:780738*
  ID_OUI_FROM_DATABASE=Z.U.K. Elzab S.A.
 
@@ -84338,6 +85319,9 @@ OUI:78303B*
 OUI:7830E1*
  ID_OUI_FROM_DATABASE=UltraClenz, LLC
 
+OUI:7830F5*
+ ID_OUI_FROM_DATABASE=TBT Inc.
+
 OUI:78312B*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -84383,6 +85367,9 @@ OUI:783D5B*
 OUI:783E53*
  ID_OUI_FROM_DATABASE=SKY UK LIMITED
 
+OUI:783EA1*
+ ID_OUI_FROM_DATABASE=Nokia Shanghai Bell Co., Ltd.
+
 OUI:783F15*
  ID_OUI_FROM_DATABASE=EasySYNC Ltd.
 
@@ -84437,12 +85424,18 @@ OUI:784859*
 OUI:78491D*
  ID_OUI_FROM_DATABASE=The Will-Burt Company
 
+OUI:784946*
+ ID_OUI_FROM_DATABASE=Cambridge Mobile Telematics, Inc.
+
 OUI:784B08*
  ID_OUI_FROM_DATABASE=f.robotics acquisitions ltd
 
 OUI:784B87*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
+OUI:784F24*
+ ID_OUI_FROM_DATABASE=Taicang T&W Electronics
+
 OUI:784F43*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -84623,6 +85616,9 @@ OUI:786A89*
 OUI:786C1C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:786C84*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:786D94*
  ID_OUI_FROM_DATABASE=Palo Alto Networks
 
@@ -84800,6 +85796,9 @@ OUI:789682*
 OUI:789684*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:7896A3*
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
+
 OUI:7897C3*
  ID_OUI_FROM_DATABASE=DINGXIN INFORMATION TECHNOLOGY CO.,LTD
 
@@ -84977,6 +85976,9 @@ OUI:78BEBD*
 OUI:78C1A7*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:78C1AE*
+ ID_OUI_FROM_DATABASE=Hangzhou Ezviz Software Co.,Ltd.
+
 OUI:78C213*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -85040,6 +86042,9 @@ OUI:78C40E*
 OUI:78C4AB*
  ID_OUI_FROM_DATABASE=Shenzhen Runsil Technology Co.,Ltd
 
+OUI:78C57D*
+ ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
+
 OUI:78C5E5*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -85271,6 +86276,9 @@ OUI:78D800D*
 OUI:78D800E*
  ID_OUI_FROM_DATABASE=CL International
 
+OUI:78D840*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:78D99F*
  ID_OUI_FROM_DATABASE=NuCom HK Ltd.
 
@@ -85364,6 +86372,9 @@ OUI:78EF4C*
 OUI:78F09B*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:78F1C6*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:78F235*
  ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
 
@@ -85598,6 +86609,9 @@ OUI:7C2664*
 OUI:7C27BC*
  ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
 
+OUI:7C296F*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:7C2A31*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -85773,7 +86787,7 @@ OUI:7C5079*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
 OUI:7C50DA*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=E.J Ward
 
 OUI:7C5189*
  ID_OUI_FROM_DATABASE=SG Wireless Limited
@@ -85823,6 +86837,12 @@ OUI:7C6305*
 OUI:7C6456*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:7C646C*
+ ID_OUI_FROM_DATABASE=LG Electronics
+
+OUI:7C669A*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:7C669D*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -86096,6 +87116,9 @@ OUI:7C9122*
 OUI:7C942A*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:7C949F*
+ ID_OUI_FROM_DATABASE=Shenzhen iComm Semiconductor CO.,LTD
+
 OUI:7C94B2*
  ID_OUI_FROM_DATABASE=Philips Healthcare PCCI
 
@@ -86147,6 +87170,9 @@ OUI:7CA23E*
 OUI:7CA29B*
  ID_OUI_FROM_DATABASE=D.SignT GmbH & Co. KG
 
+OUI:7CA449*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:7CA61D*
  ID_OUI_FROM_DATABASE=MHL, LLC
 
@@ -86496,7 +87522,7 @@ OUI:7CDB98*
  ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
 
 OUI:7CDCCC*
- ID_OUI_FROM_DATABASE=Beijing Yixin Techology Co.,Ltd
+ ID_OUI_FROM_DATABASE=BEIJING STARBLAZE TECHNOLOGY CO.,LTD
 
 OUI:7CDD11*
  ID_OUI_FROM_DATABASE=Chongqing MAS SCI&TECH.Co.,Ltd
@@ -86540,6 +87566,9 @@ OUI:7CE524*
 OUI:7CE56B*
  ID_OUI_FROM_DATABASE=ESEN Optoelectronics Technology Co.,Ltd.
 
+OUI:7CE87F*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:7CE97C*
  ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
 
@@ -86858,6 +87887,9 @@ OUI:802511*
 OUI:802689*
  ID_OUI_FROM_DATABASE=D-Link International
 
+OUI:80276C*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:802994*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
@@ -86915,12 +87947,18 @@ OUI:803896*
 OUI:8038BC*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:8038D4*
+ ID_OUI_FROM_DATABASE=Fibercentury Network Technology Co.,Ltd.
+
 OUI:8038FB*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
 OUI:8038FD*
  ID_OUI_FROM_DATABASE=LeapFrog Enterprises, Inc.
 
+OUI:80398C*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:8039E5*
  ID_OUI_FROM_DATABASE=PATLITE CORPORATION
 
@@ -87017,6 +88055,12 @@ OUI:80549C*
 OUI:8054D9*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:8054E3*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
+OUI:80563C*
+ ID_OUI_FROM_DATABASE=ZF
+
 OUI:8056F2*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -87155,6 +88199,9 @@ OUI:80751F*
 OUI:807693*
  ID_OUI_FROM_DATABASE=Newag SA
 
+OUI:8076C2*
+ ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
+
 OUI:8077A4*
  ID_OUI_FROM_DATABASE=TECNO MOBILE LIMITED
 
@@ -87254,6 +88301,9 @@ OUI:808223*
 OUI:808287*
  ID_OUI_FROM_DATABASE=ATCOM Technology Co.Ltd.
 
+OUI:8082F5*
+ ID_OUI_FROM_DATABASE=STMicrolectronics International NV
+
 OUI:8084A9*
  ID_OUI_FROM_DATABASE=oshkosh Corporation
 
@@ -87354,7 +88404,7 @@ OUI:80A589*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
 OUI:80A796*
- ID_OUI_FROM_DATABASE=Neurotek LLC
+ ID_OUI_FROM_DATABASE=Neuralink Corp.
 
 OUI:80A85D*
  ID_OUI_FROM_DATABASE=Osterhout Design Group
@@ -87362,6 +88412,9 @@ OUI:80A85D*
 OUI:80AAA4*
  ID_OUI_FROM_DATABASE=USAG
 
+OUI:80AB4D*
+ ID_OUI_FROM_DATABASE=Nokia Solutions and Networks GmbH & Co. KG
+
 OUI:80AC7C*
  ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
 
@@ -87428,14 +88481,20 @@ OUI:80BAE6*
 OUI:80BBEB*
  ID_OUI_FROM_DATABASE=Satmap Systems Ltd
 
+OUI:80BC37*
+ ID_OUI_FROM_DATABASE=Ruckus Wireless
+
 OUI:80BE05*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:80BEAF*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:80C16E*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
 OUI:80C3BA*
- ID_OUI_FROM_DATABASE=Sennheiser Consumer Audio GmbH
+ ID_OUI_FROM_DATABASE=Sonova Consumer Hearing GmbH
 
 OUI:80C501*
  ID_OUI_FROM_DATABASE=OctoGate IT Security Systems GmbH
@@ -87545,9 +88604,15 @@ OUI:80DABC*
 OUI:80DAC2*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
+OUI:80DB17*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:80DB31*
  ID_OUI_FROM_DATABASE=Power Quotient International Co., Ltd.
 
+OUI:80DECC*
+ ID_OUI_FROM_DATABASE=HYBE Co.,LTD
+
 OUI:80E01D*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -87641,6 +88706,9 @@ OUI:80EE25*
 OUI:80EE73*
  ID_OUI_FROM_DATABASE=Shuttle Inc.
 
+OUI:80F1A4*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:80F1F1*
  ID_OUI_FROM_DATABASE=Tech4home, Lda
 
@@ -87662,6 +88730,9 @@ OUI:80F5B5*
 OUI:80F62E*
  ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
 
+OUI:80F7A6*
+ ID_OUI_FROM_DATABASE=Shenzhen C-Data Technology Co., Ltd.
+
 OUI:80F8EB*
  ID_OUI_FROM_DATABASE=RayTight
 
@@ -87680,6 +88751,9 @@ OUI:80FBF1*
 OUI:80FD7A*
  ID_OUI_FROM_DATABASE=BLU Products Inc
 
+OUI:80FD7B*
+ ID_OUI_FROM_DATABASE=BLU Products Inc
+
 OUI:80FFA8*
  ID_OUI_FROM_DATABASE=UNIDIS
 
@@ -87707,6 +88781,9 @@ OUI:8404D2*
 OUI:8406FA*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
+OUI:8407C4*
+ ID_OUI_FROM_DATABASE=Carrier Corporation
+
 OUI:840B2D*
  ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO MECHANICS CO., LTD.
 
@@ -87836,6 +88913,9 @@ OUI:8421F1*
 OUI:84225E*
  ID_OUI_FROM_DATABASE=SHENZHEN TECHNEWCHIP TECHNOLOGY CO.,LTD.
 
+OUI:842289*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:842388*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
@@ -87980,6 +89060,9 @@ OUI:843A5B*
 OUI:843B10*
  ID_OUI_FROM_DATABASE=LVSWITCHES INC.
 
+OUI:843C4C*
+ ID_OUI_FROM_DATABASE=Robert Bosch SRL
+
 OUI:843DC6*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -88068,7 +89151,7 @@ OUI:845F04*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
 OUI:846082*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Hyperloop Technologies, Inc dba Virgin Hyperloop
 
 OUI:8461A0*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
@@ -88325,6 +89408,9 @@ OUI:848D84*
 OUI:848DC7*
  ID_OUI_FROM_DATABASE=Cisco SPVTG
 
+OUI:848DCE*
+ ID_OUI_FROM_DATABASE=Ciena Corporation
+
 OUI:848E0C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -88433,6 +89519,9 @@ OUI:84A9EA*
 OUI:84AA9C*
  ID_OUI_FROM_DATABASE=MitraStar Technology Corp.
 
+OUI:84AAA4*
+ ID_OUI_FROM_DATABASE=SONoC Corp.
+
 OUI:84AB1A*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -88604,6 +89693,9 @@ OUI:84DB2F*
 OUI:84DB9E*
  ID_OUI_FROM_DATABASE=Pink Nectarine Health AB
 
+OUI:84DBA4*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:84DBAC*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -88691,6 +89783,9 @@ OUI:84E5D8*
 OUI:84E629*
  ID_OUI_FROM_DATABASE=Bluwan SA
 
+OUI:84E657*
+ ID_OUI_FROM_DATABASE=Sony Interactive Entertainment Inc.
+
 OUI:84E714*
  ID_OUI_FROM_DATABASE=Liang Herng Enterprise,Co.Ltd.
 
@@ -88724,6 +89819,9 @@ OUI:84ED33*
 OUI:84EF18*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:84F117*
+ ID_OUI_FROM_DATABASE=Newseason
+
 OUI:84F129*
  ID_OUI_FROM_DATABASE=Metrascale Inc.
 
@@ -88754,9 +89852,15 @@ OUI:84F703*
 OUI:84F883*
  ID_OUI_FROM_DATABASE=Luminar Technologies
 
+OUI:84FB43*
+ ID_OUI_FROM_DATABASE=Central Denshi Seigyo
+
 OUI:84FCAC*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:84FCE6*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:84FCFE*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -88856,6 +89960,9 @@ OUI:881C95*
 OUI:881DFC*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:881E5A*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:881FA1*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -88892,9 +89999,15 @@ OUI:88252C*
 OUI:882593*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
+OUI:88287D*
+ ID_OUI_FROM_DATABASE=AltoBeam (China) Inc.
+
 OUI:8828B3*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:8828FB*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:882949*
  ID_OUI_FROM_DATABASE=Renesas Electronics (Penang) Sdn. Bhd.
 
@@ -88961,6 +90074,54 @@ OUI:883B8B*
 OUI:883C1C*
  ID_OUI_FROM_DATABASE=MERCURY CORPORATION
 
+OUI:883C93*
+ ID_OUI_FROM_DATABASE=Alcatel-Lucent Enterprise
+
+OUI:883CC50*
+ ID_OUI_FROM_DATABASE=Chengdu Data Sky Technology Co., Ltd.
+
+OUI:883CC51*
+ ID_OUI_FROM_DATABASE=Hanwei Electronics Group Corporation
+
+OUI:883CC52*
+ ID_OUI_FROM_DATABASE=NETGEN HITECH SOLUTIONS LLP
+
+OUI:883CC53*
+ ID_OUI_FROM_DATABASE=shenzhen Feng Jing Sheng Electronics Technology Co.,Ltd
+
+OUI:883CC54*
+ ID_OUI_FROM_DATABASE=Swabian Instruments GmbH
+
+OUI:883CC55*
+ ID_OUI_FROM_DATABASE=Shanghai Ucan Automation Equipment Co., Ltd.
+
+OUI:883CC56*
+ ID_OUI_FROM_DATABASE=mfJebsen Electronics Ltd.
+
+OUI:883CC57*
+ ID_OUI_FROM_DATABASE=KMtronic ltd
+
+OUI:883CC58*
+ ID_OUI_FROM_DATABASE=Wuhan Guangying Intelligence Technology Co., Ltd
+
+OUI:883CC59*
+ ID_OUI_FROM_DATABASE=SERNET (SUZHOU) TECHNOLOGIES CORPORATION
+
+OUI:883CC5A*
+ ID_OUI_FROM_DATABASE=Corigine,Inc.
+
+OUI:883CC5B*
+ ID_OUI_FROM_DATABASE=Shenzhen shijia chuangxin Technology Co., Ltd
+
+OUI:883CC5C*
+ ID_OUI_FROM_DATABASE=HDL da Amazônia Industria Eletrônica Ltda
+
+OUI:883CC5D*
+ ID_OUI_FROM_DATABASE=Lenard Enterprises Inc
+
+OUI:883CC5E*
+ ID_OUI_FROM_DATABASE=myUpTech AB
+
 OUI:883D24*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
@@ -89127,7 +90288,7 @@ OUI:885D90E*
  ID_OUI_FROM_DATABASE=Unitac Technology Limited
 
 OUI:885D90F*
- ID_OUI_FROM_DATABASE=IEEE Registration Authority
+ ID_OUI_FROM_DATABASE=Private
 
 OUI:885DFB*
  ID_OUI_FROM_DATABASE=zte corporation
@@ -89387,6 +90548,9 @@ OUI:889B39*
 OUI:889CA6*
  ID_OUI_FROM_DATABASE=BTB Korea INC
 
+OUI:889CAD*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:889D98*
  ID_OUI_FROM_DATABASE=Allied-telesisK.K.
 
@@ -89510,6 +90674,9 @@ OUI:88AE1D*
 OUI:88AEDD*
  ID_OUI_FROM_DATABASE=EliteGroup Computer Systems Co., LTD
 
+OUI:88AF7B*
+ ID_OUI_FROM_DATABASE=Nanjing Powercore Tech Co.,Ltd
+
 OUI:88B111*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -89531,6 +90698,9 @@ OUI:88B436*
 OUI:88B4A6*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
+OUI:88B4BE*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:88B627*
  ID_OUI_FROM_DATABASE=Gembird Europe BV
 
@@ -89543,6 +90713,9 @@ OUI:88B6EE*
 OUI:88B863*
  ID_OUI_FROM_DATABASE=HISENSE VISUAL TECHNOLOGY CO.,LTD
 
+OUI:88B86F*
+ ID_OUI_FROM_DATABASE=Infinix mobility limited
+
 OUI:88B8D0*
  ID_OUI_FROM_DATABASE=Dongguan Koppo Electronic Co.,Ltd
 
@@ -89843,6 +91016,9 @@ OUI:8C04FF*
 OUI:8C0551*
  ID_OUI_FROM_DATABASE=Koubachi AG
 
+OUI:8C06CB*
+ ID_OUI_FROM_DATABASE=Toradex AG
+
 OUI:8C078C*
  ID_OUI_FROM_DATABASE=FLOW DATA INC
 
@@ -90071,6 +91247,12 @@ OUI:8C1F64000*
 OUI:8C1F64003*
  ID_OUI_FROM_DATABASE=Brighten Controls LLP
 
+OUI:8C1F64009*
+ ID_OUI_FROM_DATABASE=Converging Systems Inc.
+
+OUI:8C1F6400C*
+ ID_OUI_FROM_DATABASE=Guan Show Technologe Co., Ltd.
+
 OUI:8C1F64017*
  ID_OUI_FROM_DATABASE=Farmote Limited
 
@@ -90080,6 +91262,9 @@ OUI:8C1F6401A*
 OUI:8C1F6401E*
  ID_OUI_FROM_DATABASE=SCIREQ Scientific Respiratory Equipment  Inc
 
+OUI:8C1F6402F*
+ ID_OUI_FROM_DATABASE=SOLIDpower SpA
+
 OUI:8C1F64043*
  ID_OUI_FROM_DATABASE=AperNet, LLC
 
@@ -90116,6 +91301,9 @@ OUI:8C1F64086*
 OUI:8C1F6408B*
  ID_OUI_FROM_DATABASE=Shanghai Shenxu Technology Co., Ltd
 
+OUI:8C1F6408E*
+ ID_OUI_FROM_DATABASE=qiio AG
+
 OUI:8C1F6408F*
  ID_OUI_FROM_DATABASE=AixControl GmbH
 
@@ -90161,6 +91349,9 @@ OUI:8C1F640C0*
 OUI:8C1F640C5*
  ID_OUI_FROM_DATABASE=TechnipFMC
 
+OUI:8C1F640D5*
+ ID_OUI_FROM_DATABASE=RealD, Inc.
+
 OUI:8C1F640D6*
  ID_OUI_FROM_DATABASE=AVD INNOVATION LIMITED
 
@@ -90173,6 +91364,9 @@ OUI:8C1F640E6*
 OUI:8C1F640EA*
  ID_OUI_FROM_DATABASE=SmartSky Networks LLC
 
+OUI:8C1F640EE*
+ ID_OUI_FROM_DATABASE=Rich Source Precision IND., Co., LTD.
+
 OUI:8C1F640EF*
  ID_OUI_FROM_DATABASE=DAVE SRL
 
@@ -90194,6 +91388,9 @@ OUI:8C1F64111*
 OUI:8C1F64115*
  ID_OUI_FROM_DATABASE=Neuralog LP
 
+OUI:8C1F64117*
+ ID_OUI_FROM_DATABASE=Grossenbacher Systeme AG
+
 OUI:8C1F64118*
  ID_OUI_FROM_DATABASE=Automata GmbH & Co. KG
 
@@ -90206,15 +91403,27 @@ OUI:8C1F64128*
 OUI:8C1F6412B*
  ID_OUI_FROM_DATABASE=Beijing Tongtech Technology Co., Ltd.
 
+OUI:8C1F64133*
+ ID_OUI_FROM_DATABASE=Vtron Pty Ltd
+
 OUI:8C1F64135*
  ID_OUI_FROM_DATABASE=Yuval Fichman
 
 OUI:8C1F64144*
  ID_OUI_FROM_DATABASE=Langfang ENN lntelligent Technology Co.,Ltd.
 
+OUI:8C1F64145*
+ ID_OUI_FROM_DATABASE=Spectrum FiftyNine BV
+
+OUI:8C1F6414B*
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+
 OUI:8C1F64151*
  ID_OUI_FROM_DATABASE=Gogo Business Aviation
 
+OUI:8C1F6415C*
+ ID_OUI_FROM_DATABASE=TRON FUTURE TECH INC.
+
 OUI:8C1F6415E*
  ID_OUI_FROM_DATABASE=Dynomotion, Inc
 
@@ -90224,12 +91433,24 @@ OUI:8C1F64164*
 OUI:8C1F64166*
  ID_OUI_FROM_DATABASE=Hikari Alphax Inc.
 
+OUI:8C1F6416D*
+ ID_OUI_FROM_DATABASE=Xiamen Rgblink Science & Technology Co., Ltd.
+
 OUI:8C1F6416E*
  ID_OUI_FROM_DATABASE=Benchmark Electronics BV
 
 OUI:8C1F64177*
  ID_OUI_FROM_DATABASE=Emcom Systems
 
+OUI:8C1F64179*
+ ID_OUI_FROM_DATABASE=Agrowtek Inc.
+
+OUI:8C1F6417C*
+ ID_OUI_FROM_DATABASE=Zelp Ltd
+
+OUI:8C1F6417E*
+ ID_OUI_FROM_DATABASE=MI Inc.
+
 OUI:8C1F64193*
  ID_OUI_FROM_DATABASE=Sicon srl
 
@@ -90248,12 +91469,21 @@ OUI:8C1F6419C*
 OUI:8C1F641A5*
  ID_OUI_FROM_DATABASE=DIALTRONICS SYSTEMS PVT LTD
 
+OUI:8C1F641A7*
+ ID_OUI_FROM_DATABASE=aelettronica group srl
+
 OUI:8C1F641AF*
  ID_OUI_FROM_DATABASE=EnviroNode IoT Solutions
 
+OUI:8C1F641B5*
+ ID_OUI_FROM_DATABASE=Xicato
+
 OUI:8C1F641B6*
  ID_OUI_FROM_DATABASE=Red Sensors Limited
 
+OUI:8C1F641B7*
+ ID_OUI_FROM_DATABASE=Rax-Tech International
+
 OUI:8C1F641BB*
  ID_OUI_FROM_DATABASE=Renwei Electronics Technology (Shenzhen) Co.,LTD.
 
@@ -90263,6 +91493,9 @@ OUI:8C1F641BD*
 OUI:8C1F641BF*
  ID_OUI_FROM_DATABASE=Ossia Inc
 
+OUI:8C1F641C0*
+ ID_OUI_FROM_DATABASE=INVENTIA Sp. z o.o.
+
 OUI:8C1F641C2*
  ID_OUI_FROM_DATABASE=Solid Invent Ltda.
 
@@ -90290,6 +91523,9 @@ OUI:8C1F641F0*
 OUI:8C1F64204*
  ID_OUI_FROM_DATABASE=castcore
 
+OUI:8C1F64208*
+ ID_OUI_FROM_DATABASE=Sichuan AnSphere Technology Co. Ltd.
+
 OUI:8C1F64219*
  ID_OUI_FROM_DATABASE=Guangzhou Desam Audio Co.,Ltd
 
@@ -90305,9 +91541,18 @@ OUI:8C1F64227*
 OUI:8C1F6422E*
  ID_OUI_FROM_DATABASE=Jide Car Rastreamento e Monitoramento LTDA
 
+OUI:8C1F6423D*
+ ID_OUI_FROM_DATABASE=Mokila Networks Pvt Ltd
+
+OUI:8C1F64240*
+ ID_OUI_FROM_DATABASE=HuiTong intelligence Company
+
 OUI:8C1F64242*
  ID_OUI_FROM_DATABASE=GIORDANO CONTROLS SPA
 
+OUI:8C1F64252*
+ ID_OUI_FROM_DATABASE=TYT Electronics CO., LTD
+
 OUI:8C1F64254*
  ID_OUI_FROM_DATABASE=Zhuhai Yunzhou Intelligence Technology Ltd.
 
@@ -90326,6 +91571,9 @@ OUI:8C1F64264*
 OUI:8C1F64268*
  ID_OUI_FROM_DATABASE=Astro Machine Corporation
 
+OUI:8C1F6426E*
+ ID_OUI_FROM_DATABASE=Koizumi Lighting Technology Corp.
+
 OUI:8C1F64270*
  ID_OUI_FROM_DATABASE=Xi‘an Hangguang Satellite and Control Technology Co.,Ltd
 
@@ -90338,6 +91586,9 @@ OUI:8C1F6428A*
 OUI:8C1F6428C*
  ID_OUI_FROM_DATABASE=Sakura Seiki Co.,Ltd.
 
+OUI:8C1F6428D*
+ ID_OUI_FROM_DATABASE=AVA Monitoring AB
+
 OUI:8C1F64296*
  ID_OUI_FROM_DATABASE=Roog zhi tong Technology(Beijing) Co.,Ltd
 
@@ -90347,9 +91598,15 @@ OUI:8C1F64298*
 OUI:8C1F6429F*
  ID_OUI_FROM_DATABASE=NAGTECH LLC
 
+OUI:8C1F642A1*
+ ID_OUI_FROM_DATABASE=Pantherun Technologies Pvt Ltd
+
 OUI:8C1F642A5*
  ID_OUI_FROM_DATABASE=Nonet Inc
 
+OUI:8C1F642A9*
+ ID_OUI_FROM_DATABASE=Elbit Systems of America, LLC
+
 OUI:8C1F642B6*
  ID_OUI_FROM_DATABASE=Stercom Power Solutions GmbH
 
@@ -90362,9 +91619,15 @@ OUI:8C1F642C3*
 OUI:8C1F642C5*
  ID_OUI_FROM_DATABASE=SYSN
 
+OUI:8C1F642C6*
+ ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
+
 OUI:8C1F642C8*
  ID_OUI_FROM_DATABASE=BRS Sistemas Eletrônicos
 
+OUI:8C1F642E2*
+ ID_OUI_FROM_DATABASE=Mark Roberts Motion Control
+
 OUI:8C1F642E8*
  ID_OUI_FROM_DATABASE=Sonora Network Solutions
 
@@ -90374,9 +91637,15 @@ OUI:8C1F642EF*
 OUI:8C1F642F5*
  ID_OUI_FROM_DATABASE=Florida R&D Associates LLC
 
+OUI:8C1F642FB*
+ ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
+
 OUI:8C1F642FD*
  ID_OUI_FROM_DATABASE=Enestone Corporation
 
+OUI:8C1F642FE*
+ ID_OUI_FROM_DATABASE=VERSITRON, Inc.
+
 OUI:8C1F64300*
  ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
 
@@ -90387,41 +91656,71 @@ OUI:8C1F64304*
  ID_OUI_FROM_DATABASE=Jemac Sweden AB
 
 OUI:8C1F64306*
- ID_OUI_FROM_DATABASE=Corigine, Inc
+ ID_OUI_FROM_DATABASE=Corigine,Inc.
+
+OUI:8C1F64309*
+ ID_OUI_FROM_DATABASE=MECT SRL
 
 OUI:8C1F6430A*
  ID_OUI_FROM_DATABASE=XCOM Labs
 
+OUI:8C1F64314*
+ ID_OUI_FROM_DATABASE=Cedel BV
+
 OUI:8C1F64316*
  ID_OUI_FROM_DATABASE=Potter Electric Signal Company
 
 OUI:8C1F6431A*
  ID_OUI_FROM_DATABASE=Asiga Pty Ltd
 
+OUI:8C1F64324*
+ ID_OUI_FROM_DATABASE=Kinetic Technologies
+
 OUI:8C1F64328*
  ID_OUI_FROM_DATABASE=Com Video Security Systems Co., Ltd.
 
+OUI:8C1F6432F*
+ ID_OUI_FROM_DATABASE=DEUTA Controls GmbH
+
 OUI:8C1F64330*
  ID_OUI_FROM_DATABASE=Vision Systems Safety Tech
 
+OUI:8C1F6434D*
+ ID_OUI_FROM_DATABASE=biosilver .co.,ltd
+
+OUI:8C1F64354*
+ ID_OUI_FROM_DATABASE=Paul Tagliamonte
+
 OUI:8C1F6435C*
  ID_OUI_FROM_DATABASE=Opgal Optronic Industries ltd
 
 OUI:8C1F6435D*
  ID_OUI_FROM_DATABASE=Security&Best
 
+OUI:8C1F64365*
+ ID_OUI_FROM_DATABASE=VECTOR TECHNOLOGIES, LLC
+
+OUI:8C1F64366*
+ ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
+
 OUI:8C1F64370*
  ID_OUI_FROM_DATABASE=WOLF Advanced Technology
 
 OUI:8C1F64372*
  ID_OUI_FROM_DATABASE=WINK Streaming
 
+OUI:8C1F64376*
+ ID_OUI_FROM_DATABASE=DIAS Infrared GmbH
+
 OUI:8C1F64382*
  ID_OUI_FROM_DATABASE=Shenzhen ROLSTONE Technology Co., Ltd
 
 OUI:8C1F64385*
  ID_OUI_FROM_DATABASE=Multilane Inc
 
+OUI:8C1F64387*
+ ID_OUI_FROM_DATABASE=OMNIVISION
+
 OUI:8C1F6438B*
  ID_OUI_FROM_DATABASE=Borrell USA Corp
 
@@ -90440,6 +91739,12 @@ OUI:8C1F64397*
 OUI:8C1F64398*
  ID_OUI_FROM_DATABASE=Software Systems Plus
 
+OUI:8C1F6439A*
+ ID_OUI_FROM_DATABASE=Golding Audio Ltd
+
+OUI:8C1F6439E*
+ ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
+
 OUI:8C1F643A4*
  ID_OUI_FROM_DATABASE=QLM Technology Ltd
 
@@ -90449,12 +91754,18 @@ OUI:8C1F643AC*
 OUI:8C1F643AD*
  ID_OUI_FROM_DATABASE=TowerIQ
 
+OUI:8C1F643B0*
+ ID_OUI_FROM_DATABASE=Flextronics International Kft
+
 OUI:8C1F643B2*
  ID_OUI_FROM_DATABASE=Real Digital
 
 OUI:8C1F643B5*
  ID_OUI_FROM_DATABASE=SVMS
 
+OUI:8C1F643B6*
+ ID_OUI_FROM_DATABASE=TEX COMPUTER SRL
+
 OUI:8C1F643C4*
  ID_OUI_FROM_DATABASE=NavSys Technology Inc.
 
@@ -90464,6 +91775,9 @@ OUI:8C1F643C5*
 OUI:8C1F643C6*
  ID_OUI_FROM_DATABASE=Wavestream Corp
 
+OUI:8C1F643CD*
+ ID_OUI_FROM_DATABASE=Sejong security system Cor.
+
 OUI:8C1F643D1*
  ID_OUI_FROM_DATABASE=EMIT GmbH
 
@@ -90482,6 +91796,9 @@ OUI:8C1F643E8*
 OUI:8C1F643F4*
  ID_OUI_FROM_DATABASE=ACTELSER S.L.
 
+OUI:8C1F643FC*
+ ID_OUI_FROM_DATABASE=STV Electronic GmbH
+
 OUI:8C1F643FE*
  ID_OUI_FROM_DATABASE=Plum sp. z.o.o.
 
@@ -90518,9 +91835,18 @@ OUI:8C1F64438*
 OUI:8C1F64445*
  ID_OUI_FROM_DATABASE=Figment Design Laboratories
 
+OUI:8C1F6444E*
+ ID_OUI_FROM_DATABASE=GVA Lighting, Inc.
+
+OUI:8C1F6444F*
+ ID_OUI_FROM_DATABASE=RealD, Inc.
+
 OUI:8C1F64454*
  ID_OUI_FROM_DATABASE=KJ Klimateknik A/S
 
+OUI:8C1F6445B*
+ ID_OUI_FROM_DATABASE=Beijing Aoxing Technology Co.,Ltd
+
 OUI:8C1F6445D*
  ID_OUI_FROM_DATABASE=Fuzhou Tucsen Photonics Co.,Ltd
 
@@ -90530,9 +91856,15 @@ OUI:8C1F6445F*
 OUI:8C1F64460*
  ID_OUI_FROM_DATABASE=Solace Systems Inc.
 
+OUI:8C1F64462*
+ ID_OUI_FROM_DATABASE=REO AG
+
 OUI:8C1F64466*
  ID_OUI_FROM_DATABASE=Intamsys Technology Co.Ltd
 
+OUI:8C1F6446A*
+ ID_OUI_FROM_DATABASE=Pharsighted LLC
+
 OUI:8C1F64472*
  ID_OUI_FROM_DATABASE=Surge Networks, Inc.
 
@@ -90587,30 +91919,48 @@ OUI:8C1F644E0*
 OUI:8C1F644E5*
  ID_OUI_FROM_DATABASE=Renukas Castle Hard- and Software
 
+OUI:8C1F644E7*
+ ID_OUI_FROM_DATABASE=Circuit Solutions
+
 OUI:8C1F644EC*
  ID_OUI_FROM_DATABASE=XOR UK Corporation Limited
 
 OUI:8C1F644F0*
  ID_OUI_FROM_DATABASE=Tieline Research Pty Ltd
 
+OUI:8C1F644F9*
+ ID_OUI_FROM_DATABASE=Photonic Science and Engineering Ltd
+
 OUI:8C1F644FA*
  ID_OUI_FROM_DATABASE=Sanskruti
 
+OUI:8C1F644FB*
+ ID_OUI_FROM_DATABASE=MESA TECHNOLOGIES LLC
+
 OUI:8C1F64504*
  ID_OUI_FROM_DATABASE=EA Elektroautomatik GmbH & Co. KG
 
 OUI:8C1F6450A*
  ID_OUI_FROM_DATABASE=BELLCO TRADING COMPANY (PVT) LTD
 
+OUI:8C1F6450E*
+ ID_OUI_FROM_DATABASE=Panoramic Power
+
 OUI:8C1F64510*
  ID_OUI_FROM_DATABASE=Novanta Corp / Novanta IMS
 
+OUI:8C1F64511*
+ ID_OUI_FROM_DATABASE=Control Aut Tecnologia em Automação LTDA
+
 OUI:8C1F64512*
  ID_OUI_FROM_DATABASE=Blik Sensing B.V.
 
 OUI:8C1F64517*
  ID_OUI_FROM_DATABASE=Smart Radar System, Inc
 
+OUI:8C1F64518*
+ ID_OUI_FROM_DATABASE=Wagner Group GmbH
+
 OUI:8C1F64521*
  ID_OUI_FROM_DATABASE=MP-SENSOR GmbH
 
@@ -90662,18 +92012,30 @@ OUI:8C1F6454F*
 OUI:8C1F64552*
  ID_OUI_FROM_DATABASE=Proterra, Inc
 
+OUI:8C1F64553*
+ ID_OUI_FROM_DATABASE=ENIGMA SOI Sp. z o.o.
+
+OUI:8C1F64556*
+ ID_OUI_FROM_DATABASE=BAE Systems
+
 OUI:8C1F64557*
  ID_OUI_FROM_DATABASE=In-lite Design BV
 
 OUI:8C1F6455E*
  ID_OUI_FROM_DATABASE=HANATEKSYSTEM
 
+OUI:8C1F6456C*
+ ID_OUI_FROM_DATABASE=ELTEK SpA
+
 OUI:8C1F6456D*
  ID_OUI_FROM_DATABASE=ACOD
 
 OUI:8C1F64572*
  ID_OUI_FROM_DATABASE=ZMBIZI APP LLC
 
+OUI:8C1F64573*
+ ID_OUI_FROM_DATABASE=Ingenious Technology LLC
+
 OUI:8C1F64575*
  ID_OUI_FROM_DATABASE=Yu-Heng Electric Co., LTD
 
@@ -90689,6 +92051,9 @@ OUI:8C1F64581*
 OUI:8C1F6458C*
  ID_OUI_FROM_DATABASE=Ear Micro LLC
 
+OUI:8C1F6458E*
+ ID_OUI_FROM_DATABASE=Novanta IMS
+
 OUI:8C1F6459F*
  ID_OUI_FROM_DATABASE=Delta Computers LLC.
 
@@ -90710,9 +92075,18 @@ OUI:8C1F645CB*
 OUI:8C1F645D3*
  ID_OUI_FROM_DATABASE=Eloy Water
 
+OUI:8C1F645DB*
+ ID_OUI_FROM_DATABASE=GlobalInvacom
+
 OUI:8C1F645E5*
  ID_OUI_FROM_DATABASE=Telemetrics Inc.
 
+OUI:8C1F645EA*
+ ID_OUI_FROM_DATABASE=BTG Instruments AB
+
+OUI:8C1F645EB*
+ ID_OUI_FROM_DATABASE=TIAMA
+
 OUI:8C1F645F5*
  ID_OUI_FROM_DATABASE=HongSeok Ltd.
 
@@ -90731,6 +92105,9 @@ OUI:8C1F6460A*
 OUI:8C1F6460E*
  ID_OUI_FROM_DATABASE=ICT International
 
+OUI:8C1F64610*
+ ID_OUI_FROM_DATABASE=Beijing Zhongzhi Huida Technology Co., Ltd
+
 OUI:8C1F64611*
  ID_OUI_FROM_DATABASE=Siemens Industry Software Inc.
 
@@ -90746,6 +92123,9 @@ OUI:8C1F64622*
 OUI:8C1F64625*
  ID_OUI_FROM_DATABASE=Stresstech OY
 
+OUI:8C1F64626*
+ ID_OUI_FROM_DATABASE=CSIRO
+
 OUI:8C1F64634*
  ID_OUI_FROM_DATABASE=AML
 
@@ -90770,6 +92150,9 @@ OUI:8C1F64655*
 OUI:8C1F64656*
  ID_OUI_FROM_DATABASE=Optotune Switzerland AG
 
+OUI:8C1F6465D*
+ ID_OUI_FROM_DATABASE=Action Streamer LLC
+
 OUI:8C1F6465F*
  ID_OUI_FROM_DATABASE=Astrometric Instruments, Inc.
 
@@ -90785,15 +92168,24 @@ OUI:8C1F64663*
 OUI:8C1F6466C*
  ID_OUI_FROM_DATABASE=LINEAGE POWER PVT LTD.,
 
+OUI:8C1F6466F*
+ ID_OUI_FROM_DATABASE=Elix Systems SA
+
 OUI:8C1F64672*
  ID_OUI_FROM_DATABASE=Farmobile LLC
 
 OUI:8C1F64675*
  ID_OUI_FROM_DATABASE=Transit Solutions, LLC.
 
+OUI:8C1F64676*
+ ID_OUI_FROM_DATABASE=sdt.net AG
+
 OUI:8C1F6467A*
  ID_OUI_FROM_DATABASE=MG s.r.l.
 
+OUI:8C1F6467C*
+ ID_OUI_FROM_DATABASE=Ensto Protrol AB
+
 OUI:8C1F6467F*
  ID_OUI_FROM_DATABASE=Hamamatsu Photonics K.K.
 
@@ -90803,12 +92195,24 @@ OUI:8C1F64683*
 OUI:8C1F64685*
  ID_OUI_FROM_DATABASE=Sanchar Communication Systems
 
+OUI:8C1F64692*
+ ID_OUI_FROM_DATABASE=Nexilis Electronics India Pvt Ltd (PICSYS)
+
 OUI:8C1F64697*
  ID_OUI_FROM_DATABASE=Sontay Ltd.
 
+OUI:8C1F64698*
+ ID_OUI_FROM_DATABASE=Arcus-EDS GmbH
+
+OUI:8C1F64699*
+ ID_OUI_FROM_DATABASE=FIDICA GmbH & Co. KG
+
 OUI:8C1F6469E*
  ID_OUI_FROM_DATABASE=AT-Automation Technology GmbH
 
+OUI:8C1F646A0*
+ ID_OUI_FROM_DATABASE=Avionica
+
 OUI:8C1F646A8*
  ID_OUI_FROM_DATABASE=Bulwark
 
@@ -90848,6 +92252,9 @@ OUI:8C1F646E3*
 OUI:8C1F646EA*
  ID_OUI_FROM_DATABASE=KMtronic ltd
 
+OUI:8C1F646EC*
+ ID_OUI_FROM_DATABASE=Bit Trade One, Ltd.
+
 OUI:8C1F646F4*
  ID_OUI_FROM_DATABASE=Elsist Srl
 
@@ -90857,6 +92264,9 @@ OUI:8C1F646F9*
 OUI:8C1F646FC*
  ID_OUI_FROM_DATABASE=HM Systems A/S
 
+OUI:8C1F64700*
+ ID_OUI_FROM_DATABASE=QUANTAFLOW
+
 OUI:8C1F64702*
  ID_OUI_FROM_DATABASE=AIDirections
 
@@ -90887,9 +92297,15 @@ OUI:8C1F6472A*
 OUI:8C1F6472C*
  ID_OUI_FROM_DATABASE=Antai technology Co.,Ltd
 
+OUI:8C1F64731*
+ ID_OUI_FROM_DATABASE=ehoosys Co.,LTD.
+
 OUI:8C1F64737*
  ID_OUI_FROM_DATABASE=Vytahy-Vymyslicky s.r.o.
 
+OUI:8C1F64739*
+ ID_OUI_FROM_DATABASE=Monnit Corporation
+
 OUI:8C1F6473B*
  ID_OUI_FROM_DATABASE=Fink Zeitsysteme GmbH
 
@@ -90902,6 +92318,9 @@ OUI:8C1F6473D*
 OUI:8C1F6473F*
  ID_OUI_FROM_DATABASE=UBISCALE
 
+OUI:8C1F64740*
+ ID_OUI_FROM_DATABASE=Norvento Tecnología, S.L.
+
 OUI:8C1F64746*
  ID_OUI_FROM_DATABASE=Sensus Healthcare
 
@@ -90938,6 +92357,9 @@ OUI:8C1F64782*
 OUI:8C1F64787*
  ID_OUI_FROM_DATABASE=Tabology
 
+OUI:8C1F6479B*
+ ID_OUI_FROM_DATABASE=Foerster-Technik GmbH
+
 OUI:8C1F6479D*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
@@ -90947,6 +92369,9 @@ OUI:8C1F6479E*
 OUI:8C1F647A1*
  ID_OUI_FROM_DATABASE=Guardian Controls International Ltd
 
+OUI:8C1F647A4*
+ ID_OUI_FROM_DATABASE=Hirotech inc.
+
 OUI:8C1F647A6*
  ID_OUI_FROM_DATABASE=OTMetric
 
@@ -90959,6 +92384,12 @@ OUI:8C1F647AA*
 OUI:8C1F647AF*
  ID_OUI_FROM_DATABASE=E VISION INDIA PVT LTD
 
+OUI:8C1F647B5*
+ ID_OUI_FROM_DATABASE=Guan Show Technologe Co., Ltd.
+
+OUI:8C1F647B6*
+ ID_OUI_FROM_DATABASE=KEYLINE S.P.A.
+
 OUI:8C1F647B7*
  ID_OUI_FROM_DATABASE=Weidmann Tecnologia Electrica de Mexico
 
@@ -90989,15 +92420,30 @@ OUI:8C1F647D6*
 OUI:8C1F647D8*
  ID_OUI_FROM_DATABASE=HIROSAWA ELECTRIC Co.,Ltd.
 
+OUI:8C1F647D9*
+ ID_OUI_FROM_DATABASE=Noisewave Corporation
+
 OUI:8C1F647DD*
  ID_OUI_FROM_DATABASE=TAKASAKI KYODO COMPUTING CENTER Co.,LTD.
 
 OUI:8C1F647DE*
  ID_OUI_FROM_DATABASE=SOCNOC AI Inc
 
+OUI:8C1F647E0*
+ ID_OUI_FROM_DATABASE=Colombo Sales & Engineering, Inc.
+
+OUI:8C1F647E2*
+ ID_OUI_FROM_DATABASE=Aaronn Electronic GmbH
+
+OUI:8C1F647E7*
+ ID_OUI_FROM_DATABASE=robert juliat
+
 OUI:8C1F647EC*
  ID_OUI_FROM_DATABASE=Methods2Business B.V.
 
+OUI:8C1F647EE*
+ ID_OUI_FROM_DATABASE=Orange Precision Measurement LLC
+
 OUI:8C1F647F1*
  ID_OUI_FROM_DATABASE=AEM Singapore Pte Ltd
 
@@ -91016,6 +92462,9 @@ OUI:8C1F6481A*
 OUI:8C1F64820*
  ID_OUI_FROM_DATABASE=TIAMA
 
+OUI:8C1F64825*
+ ID_OUI_FROM_DATABASE=MTU Aero Engines AG
+
 OUI:8C1F64837*
  ID_OUI_FROM_DATABASE=Rumble, Inc
 
@@ -91025,6 +92474,9 @@ OUI:8C1F6483A*
 OUI:8C1F6483C*
  ID_OUI_FROM_DATABASE=Xtend Technologies Pvt Ltd
 
+OUI:8C1F6483E*
+ ID_OUI_FROM_DATABASE=Sicon srl
+
 OUI:8C1F64848*
  ID_OUI_FROM_DATABASE=Jena-Optronik GmbH
 
@@ -91043,6 +92495,9 @@ OUI:8C1F64856*
 OUI:8C1F6485B*
  ID_OUI_FROM_DATABASE=Atlantic Pumps Ltd
 
+OUI:8C1F64867*
+ ID_OUI_FROM_DATABASE=Forever Engineering Systems Pvt. Ltd.
+
 OUI:8C1F64878*
  ID_OUI_FROM_DATABASE=Green Access Ltd
 
@@ -91082,6 +92537,9 @@ OUI:8C1F648AF*
 OUI:8C1F648B5*
  ID_OUI_FROM_DATABASE=Ashton Bentley Collaboration Spaces
 
+OUI:8C1F648B9*
+ ID_OUI_FROM_DATABASE=Zynex Monitoring Solutions
+
 OUI:8C1F648C2*
  ID_OUI_FROM_DATABASE=Cirrus Systems, Inc.
 
@@ -91109,12 +92567,18 @@ OUI:8C1F648D9*
 OUI:8C1F648E2*
  ID_OUI_FROM_DATABASE=ALPHA Corporation
 
+OUI:8C1F648E5*
+ ID_OUI_FROM_DATABASE=Druck Ltd.
+
 OUI:8C1F648E9*
  ID_OUI_FROM_DATABASE=Vesperix Corporation
 
 OUI:8C1F648EE*
  ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
 
+OUI:8C1F648F4*
+ ID_OUI_FROM_DATABASE=Loadrite (Auckland) Limited
+
 OUI:8C1F648F8*
  ID_OUI_FROM_DATABASE=HIGHVOLT Prüftechnik
 
@@ -91127,6 +92591,9 @@ OUI:8C1F64905*
 OUI:8C1F64909*
  ID_OUI_FROM_DATABASE=MATELEX
 
+OUI:8C1F6490D*
+ ID_OUI_FROM_DATABASE=Algodue Elettronica Srl
+
 OUI:8C1F6490E*
  ID_OUI_FROM_DATABASE=Xacti Corporation
 
@@ -91139,6 +92606,12 @@ OUI:8C1F64911*
 OUI:8C1F64918*
  ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
 
+OUI:8C1F6491A*
+ ID_OUI_FROM_DATABASE=Profcon AB
+
+OUI:8C1F6491D*
+ ID_OUI_FROM_DATABASE=enlighten
+
 OUI:8C1F64923*
  ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
 
@@ -91181,6 +92654,9 @@ OUI:8C1F6495A*
 OUI:8C1F64967*
  ID_OUI_FROM_DATABASE=DAVE SRL
 
+OUI:8C1F64968*
+ ID_OUI_FROM_DATABASE=IAV ENGINEERING SARL
+
 OUI:8C1F64971*
  ID_OUI_FROM_DATABASE=INFRASAFE/ ADVANTOR SYSTEMS
 
@@ -91190,6 +92666,9 @@ OUI:8C1F64973*
 OUI:8C1F6497C*
  ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
 
+OUI:8C1F6497D*
+ ID_OUI_FROM_DATABASE=KSE GmbH
+
 OUI:8C1F64984*
  ID_OUI_FROM_DATABASE=Abacus Peripherals Pvt Ltd
 
@@ -91202,9 +92681,21 @@ OUI:8C1F64991*
 OUI:8C1F64998*
  ID_OUI_FROM_DATABASE=EVLO Stockage Énergie
 
+OUI:8C1F649A4*
+ ID_OUI_FROM_DATABASE=LabLogic Systems
+
 OUI:8C1F649A6*
  ID_OUI_FROM_DATABASE=INSTITUTO DE GESTÃO, REDES TECNOLÓGICAS E NERGIAS
 
+OUI:8C1F649B2*
+ ID_OUI_FROM_DATABASE=Emerson Rosemount Analytical
+
+OUI:8C1F649B3*
+ ID_OUI_FROM_DATABASE=Böckelt GmbH
+
+OUI:8C1F649B6*
+ ID_OUI_FROM_DATABASE=GS Elektromedizinsiche Geräte G. Stemple GmbH
+
 OUI:8C1F649BA*
  ID_OUI_FROM_DATABASE=WINTUS SYSTEM
 
@@ -91250,12 +92741,18 @@ OUI:8C1F649FE*
 OUI:8C1F649FF*
  ID_OUI_FROM_DATABASE=Satelles Inc
 
+OUI:8C1F64A00*
+ ID_OUI_FROM_DATABASE=BITECHNIK GmbH
+
 OUI:8C1F64A01*
  ID_OUI_FROM_DATABASE=Guan Show Technologe Co., Ltd.
 
 OUI:8C1F64A07*
  ID_OUI_FROM_DATABASE=GJD Manufacturing
 
+OUI:8C1F64A0A*
+ ID_OUI_FROM_DATABASE=Shanghai Wise-Tech Intelligent Technology Co.,Ltd.
+
 OUI:8C1F64A1B*
  ID_OUI_FROM_DATABASE=Zilica Limited
 
@@ -91286,6 +92783,9 @@ OUI:8C1F64A4C*
 OUI:8C1F64A4E*
  ID_OUI_FROM_DATABASE=Syscom Instruments SA
 
+OUI:8C1F64A51*
+ ID_OUI_FROM_DATABASE=BABTEL
+
 OUI:8C1F64A57*
  ID_OUI_FROM_DATABASE=EkspertStroyProekt
 
@@ -91295,6 +92795,9 @@ OUI:8C1F64A5C*
 OUI:8C1F64A5D*
  ID_OUI_FROM_DATABASE=Shenzhen zhushida Technology lnformation Co.,Ltd
 
+OUI:8C1F64A60*
+ ID_OUI_FROM_DATABASE=Active Optical Systems, LLC
+
 OUI:8C1F64A6A*
  ID_OUI_FROM_DATABASE=Sphere Com Services Pvt Ltd
 
@@ -91316,9 +92819,15 @@ OUI:8C1F64A97*
 OUI:8C1F64A9A*
  ID_OUI_FROM_DATABASE=Signasystems Elektronik San. ve Tic. Ltd. Sti.
 
+OUI:8C1F64A9E*
+ ID_OUI_FROM_DATABASE=Optimum Instruments Inc.
+
 OUI:8C1F64AA4*
  ID_OUI_FROM_DATABASE=HEINEN ELEKTRONIK GmbH
 
+OUI:8C1F64AA8*
+ ID_OUI_FROM_DATABASE=axelife
+
 OUI:8C1F64AAB*
  ID_OUI_FROM_DATABASE=BlueSword Intelligent Technology Co., Ltd.
 
@@ -91328,6 +92837,9 @@ OUI:8C1F64AB4*
 OUI:8C1F64AB5*
  ID_OUI_FROM_DATABASE=JUSTMORPH PTE. LTD.
 
+OUI:8C1F64AB7*
+ ID_OUI_FROM_DATABASE=MClavis Co.,Ltd.
+
 OUI:8C1F64AC0*
  ID_OUI_FROM_DATABASE=AIQuatro
 
@@ -91352,6 +92864,9 @@ OUI:8C1F64AED*
 OUI:8C1F64AEF*
  ID_OUI_FROM_DATABASE=Scenario Automation
 
+OUI:8C1F64AF0*
+ ID_OUI_FROM_DATABASE=MinebeaMitsumi Inc.
+
 OUI:8C1F64AF7*
  ID_OUI_FROM_DATABASE=ard sa
 
@@ -91361,9 +92876,15 @@ OUI:8C1F64B01*
 OUI:8C1F64B03*
  ID_OUI_FROM_DATABASE=Shenzhen Pisoftware Technology Co.,Ltd.
 
+OUI:8C1F64B08*
+ ID_OUI_FROM_DATABASE=Cronus Electronics
+
 OUI:8C1F64B0C*
  ID_OUI_FROM_DATABASE=Barkodes Bilgisayar Sistemleri Bilgi Iletisim ve Y
 
+OUI:8C1F64B0F*
+ ID_OUI_FROM_DATABASE=HKC Security Ltd.
+
 OUI:8C1F64B10*
  ID_OUI_FROM_DATABASE=MTU Aero Engines AG
 
@@ -91388,12 +92909,18 @@ OUI:8C1F64B46*
 OUI:8C1F64B4C*
  ID_OUI_FROM_DATABASE=Picocom Technology Ltd
 
+OUI:8C1F64B55*
+ ID_OUI_FROM_DATABASE=Sanchar Telesystems limited
+
 OUI:8C1F64B56*
  ID_OUI_FROM_DATABASE=Arcvideo
 
 OUI:8C1F64B64*
  ID_OUI_FROM_DATABASE=GSP Sprachtechnologie GmbH
 
+OUI:8C1F64B67*
+ ID_OUI_FROM_DATABASE=M2M craft Co., Ltd.
+
 OUI:8C1F64B73*
  ID_OUI_FROM_DATABASE=Comm-ence, Inc.
 
@@ -91424,6 +92951,9 @@ OUI:8C1F64B97*
 OUI:8C1F64B9A*
  ID_OUI_FROM_DATABASE=QUERCUS TECHNOLOGIES, S.L.
 
+OUI:8C1F64B9E*
+ ID_OUI_FROM_DATABASE=Power Electronics Espana, S.L.
+
 OUI:8C1F64BA3*
  ID_OUI_FROM_DATABASE=DEUTA-WERKE GmbH
 
@@ -91436,9 +92966,18 @@ OUI:8C1F64BC0*
 OUI:8C1F64BC2*
  ID_OUI_FROM_DATABASE=Huz Electronics Ltd
 
+OUI:8C1F64BC3*
+ ID_OUI_FROM_DATABASE=FoxIoT OÜ
+
 OUI:8C1F64BC6*
  ID_OUI_FROM_DATABASE=Chengdu ZiChen Time&Frequency Technology Co.,Ltd
 
+OUI:8C1F64BCB*
+ ID_OUI_FROM_DATABASE=A&T Corporation
+
+OUI:8C1F64BCC*
+ ID_OUI_FROM_DATABASE=Sound Health Systems
+
 OUI:8C1F64BD3*
  ID_OUI_FROM_DATABASE=IO Master Technology
 
@@ -91448,12 +92987,18 @@ OUI:8C1F64BD6*
 OUI:8C1F64BD7*
  ID_OUI_FROM_DATABASE=Union Electronic.
 
+OUI:8C1F64BE8*
+ ID_OUI_FROM_DATABASE=TECHNOLOGIES BACMOVE INC.
+
 OUI:8C1F64BEE*
  ID_OUI_FROM_DATABASE=Sirius LLC
 
 OUI:8C1F64BF0*
  ID_OUI_FROM_DATABASE=Newtec A/S
 
+OUI:8C1F64BF3*
+ ID_OUI_FROM_DATABASE=Alphatek AS
+
 OUI:8C1F64BF4*
  ID_OUI_FROM_DATABASE=Fluid Components Intl
 
@@ -91466,6 +93011,15 @@ OUI:8C1F64C01*
 OUI:8C1F64C03*
  ID_OUI_FROM_DATABASE=Abiman Engineering
 
+OUI:8C1F64C04*
+ ID_OUI_FROM_DATABASE=SANWA CORPORATION
+
+OUI:8C1F64C05*
+ ID_OUI_FROM_DATABASE=SkyCell AG
+
+OUI:8C1F64C07*
+ ID_OUI_FROM_DATABASE=HYOSUNG Heavy Industries Corporation
+
 OUI:8C1F64C0C*
  ID_OUI_FROM_DATABASE=GIORDANO CONTROLS SPA
 
@@ -91502,6 +93056,9 @@ OUI:8C1F64C40*
 OUI:8C1F64C41*
  ID_OUI_FROM_DATABASE=Katronic AG & Co. KG
 
+OUI:8C1F64C44*
+ ID_OUI_FROM_DATABASE=Sypris Electronics
+
 OUI:8C1F64C4C*
  ID_OUI_FROM_DATABASE=Lumiplan Duhamel
 
@@ -91514,6 +93071,9 @@ OUI:8C1F64C54*
 OUI:8C1F64C57*
  ID_OUI_FROM_DATABASE=Strategic Robotic Systems
 
+OUI:8C1F64C61*
+ ID_OUI_FROM_DATABASE=Beijing Ceresdate Technology Co.,LTD
+
 OUI:8C1F64C68*
  ID_OUI_FROM_DATABASE=FIBERME COMMUNICATIONS LLC
 
@@ -91529,6 +93089,9 @@ OUI:8C1F64C80*
 OUI:8C1F64C8F*
  ID_OUI_FROM_DATABASE=JW Froehlich Maschinenfabrik GmbH
 
+OUI:8C1F64C91*
+ ID_OUI_FROM_DATABASE=Soehnle Industrial Solutions GmbH
+
 OUI:8C1F64C97*
  ID_OUI_FROM_DATABASE=Magnet-Physik Dr. Steingroever GmbH
 
@@ -91544,9 +93107,15 @@ OUI:8C1F64CAD*
 OUI:8C1F64CAF*
  ID_OUI_FROM_DATABASE=BRS Sistemas Eletrônicos
 
+OUI:8C1F64CB2*
+ ID_OUI_FROM_DATABASE=Dyncir Soluções Tecnológicas Ltda
+
 OUI:8C1F64CBE*
  ID_OUI_FROM_DATABASE=Circa Enterprises Inc
 
+OUI:8C1F64CC1*
+ ID_OUI_FROM_DATABASE=VITREA Smart Home Technologies Ltd.
+
 OUI:8C1F64CC6*
  ID_OUI_FROM_DATABASE=Genius Vision Digital Private Limited
 
@@ -91574,6 +93143,9 @@ OUI:8C1F64CDF*
 OUI:8C1F64CE3*
  ID_OUI_FROM_DATABASE=Pixel Design & Manufacturing Sdn. Bhd.
 
+OUI:8C1F64CEB*
+ ID_OUI_FROM_DATABASE=EUREKA FOR SMART PROPERTIES CO. W.L.L
+
 OUI:8C1F64CEE*
  ID_OUI_FROM_DATABASE=DISPLAX S.A.
 
@@ -91589,6 +93161,9 @@ OUI:8C1F64CF3*
 OUI:8C1F64CF4*
  ID_OUI_FROM_DATABASE=NT
 
+OUI:8C1F64CF7*
+ ID_OUI_FROM_DATABASE=BusPas
+
 OUI:8C1F64D02*
  ID_OUI_FROM_DATABASE=Flextronics International Kft
 
@@ -91601,9 +93176,18 @@ OUI:8C1F64D0E*
 OUI:8C1F64D13*
  ID_OUI_FROM_DATABASE=EYatsko Individual
 
+OUI:8C1F64D20*
+ ID_OUI_FROM_DATABASE=NAS Engineering PRO
+
 OUI:8C1F64D29*
  ID_OUI_FROM_DATABASE=Secure Bits
 
+OUI:8C1F64D2A*
+ ID_OUI_FROM_DATABASE=Anteus Kft.
+
+OUI:8C1F64D3A*
+ ID_OUI_FROM_DATABASE=Applied Materials
+
 OUI:8C1F64D3C*
  ID_OUI_FROM_DATABASE=KIB Energo LLC
 
@@ -91619,12 +93203,18 @@ OUI:8C1F64D4A*
 OUI:8C1F64D52*
  ID_OUI_FROM_DATABASE=Critical Software SA
 
+OUI:8C1F64D53*
+ ID_OUI_FROM_DATABASE=Gridnt
+
 OUI:8C1F64D54*
  ID_OUI_FROM_DATABASE=Grupo Epelsa S.L.
 
 OUI:8C1F64D56*
  ID_OUI_FROM_DATABASE=Wisdom Audio
 
+OUI:8C1F64D5B*
+ ID_OUI_FROM_DATABASE=Local Security
+
 OUI:8C1F64D5E*
  ID_OUI_FROM_DATABASE=Integer.pl S.A.
 
@@ -91655,6 +93245,9 @@ OUI:8C1F64DAA*
 OUI:8C1F64DAE*
  ID_OUI_FROM_DATABASE=Mainco automotion s.l.
 
+OUI:8C1F64DAF*
+ ID_OUI_FROM_DATABASE=Zhuhai Lonl electric Co.,Ltd
+
 OUI:8C1F64DB5*
  ID_OUI_FROM_DATABASE=victtron
 
@@ -91700,6 +93293,9 @@ OUI:8C1F64E0E*
 OUI:8C1F64E21*
  ID_OUI_FROM_DATABASE=LG-LHT Aircraft Solutions GmbH
 
+OUI:8C1F64E2D*
+ ID_OUI_FROM_DATABASE=Private
+
 OUI:8C1F64E30*
  ID_OUI_FROM_DATABASE=VMukti Solutions Private Limited
 
@@ -91709,6 +93305,9 @@ OUI:8C1F64E41*
 OUI:8C1F64E43*
  ID_OUI_FROM_DATABASE=Daedalean AG
 
+OUI:8C1F64E46*
+ ID_OUI_FROM_DATABASE=Nautel LTD
+
 OUI:8C1F64E49*
  ID_OUI_FROM_DATABASE=Samwell International Inc
 
@@ -91730,6 +93329,9 @@ OUI:8C1F64E5E*
 OUI:8C1F64E61*
  ID_OUI_FROM_DATABASE=Stange Elektronik GmbH
 
+OUI:8C1F64E62*
+ ID_OUI_FROM_DATABASE=Axcend
+
 OUI:8C1F64E64*
  ID_OUI_FROM_DATABASE=Indefac company
 
@@ -91748,6 +93350,9 @@ OUI:8C1F64E7C*
 OUI:8C1F64E90*
  ID_OUI_FROM_DATABASE=MHE Electronics
 
+OUI:8C1F64E94*
+ ID_OUI_FROM_DATABASE=ZIN TECHNOLOGIES
+
 OUI:8C1F64E98*
  ID_OUI_FROM_DATABASE=Luxshare Electronic Technology (Kunshan) LTD
 
@@ -91799,12 +93404,27 @@ OUI:8C1F64EEF*
 OUI:8C1F64EF1*
  ID_OUI_FROM_DATABASE=BIOTAGE GB LTD
 
+OUI:8C1F64EF8*
+ ID_OUI_FROM_DATABASE=Northwest Central Indiana Community Partnerships Inc dba Wabash Heartland Innovation Network (WHIN)
+
 OUI:8C1F64EFB*
  ID_OUI_FROM_DATABASE=WARECUBE,INC
 
 OUI:8C1F64F04*
  ID_OUI_FROM_DATABASE=IoTSecure, LLC
 
+OUI:8C1F64F10*
+ ID_OUI_FROM_DATABASE=GSP Sprachtechnologie GmbH
+
+OUI:8C1F64F12*
+ ID_OUI_FROM_DATABASE=CAITRON GmbH
+
+OUI:8C1F64F22*
+ ID_OUI_FROM_DATABASE=Voyage Audio LLC
+
+OUI:8C1F64F23*
+ ID_OUI_FROM_DATABASE=IDEX India Pvt Ltd
+
 OUI:8C1F64F25*
  ID_OUI_FROM_DATABASE=Misaka Network, Inc.
 
@@ -91814,21 +93434,39 @@ OUI:8C1F64F27*
 OUI:8C1F64F2C*
  ID_OUI_FROM_DATABASE=Tunstall A/S
 
+OUI:8C1F64F2D*
+ ID_OUI_FROM_DATABASE=HUERNER Schweisstechnik GmbH
+
+OUI:8C1F64F2F*
+ ID_OUI_FROM_DATABASE=Quantum Technologies Inc
+
 OUI:8C1F64F31*
  ID_OUI_FROM_DATABASE=International Water Treatment Maritime AS
 
 OUI:8C1F64F32*
  ID_OUI_FROM_DATABASE=Shenzhen INVT Electric Co.,Ltd
 
+OUI:8C1F64F39*
+ ID_OUI_FROM_DATABASE=Weinan Wins Future Technology Co.,Ltd
+
+OUI:8C1F64F3B*
+ ID_OUI_FROM_DATABASE=??????????
+
 OUI:8C1F64F3C*
  ID_OUI_FROM_DATABASE=Microlynx Systems Ltd
 
+OUI:8C1F64F3D*
+ ID_OUI_FROM_DATABASE=Byte Lab Grupa d.o.o.
+
 OUI:8C1F64F3F*
  ID_OUI_FROM_DATABASE=Industrial Laser Machines, LLC
 
 OUI:8C1F64F41*
  ID_OUI_FROM_DATABASE=AUTOMATIZACION Y CONECTIVIDAD SA DE CV
 
+OUI:8C1F64F43*
+ ID_OUI_FROM_DATABASE=wtec GmbH
+
 OUI:8C1F64F45*
  ID_OUI_FROM_DATABASE=JBF
 
@@ -91838,18 +93476,30 @@ OUI:8C1F64F4E*
 OUI:8C1F64F52*
  ID_OUI_FROM_DATABASE=AMF Medical SA
 
+OUI:8C1F64F56*
+ ID_OUI_FROM_DATABASE=KC5 International Sdn Bhd
+
+OUI:8C1F64F57*
+ ID_OUI_FROM_DATABASE=EA Elektro-Automatik
+
 OUI:8C1F64F59*
  ID_OUI_FROM_DATABASE=Inovonics Inc.
 
 OUI:8C1F64F5A*
  ID_OUI_FROM_DATABASE=Telco Antennas Pty Ltd
 
+OUI:8C1F64F5B*
+ ID_OUI_FROM_DATABASE=SemaConnect, Inc
+
 OUI:8C1F64F5C*
  ID_OUI_FROM_DATABASE=Flextronics International Kft
 
 OUI:8C1F64F65*
  ID_OUI_FROM_DATABASE=Talleres de Escoriaza SA
 
+OUI:8C1F64F70*
+ ID_OUI_FROM_DATABASE=Vision Systems Safety Tech
+
 OUI:8C1F64F72*
  ID_OUI_FROM_DATABASE=Contrader
 
@@ -91889,6 +93539,9 @@ OUI:8C1F64FB0*
 OUI:8C1F64FB1*
  ID_OUI_FROM_DATABASE=ABB
 
+OUI:8C1F64FB4*
+ ID_OUI_FROM_DATABASE=Thales Nederland BV
+
 OUI:8C1F64FB5*
  ID_OUI_FROM_DATABASE=Bavaria Digital Technik GmbH
 
@@ -91901,6 +93554,12 @@ OUI:8C1F64FBA*
 OUI:8C1F64FBD*
  ID_OUI_FROM_DATABASE=SAN-AI Electronic Industries Co.,Ltd.
 
+OUI:8C1F64FC2*
+ ID_OUI_FROM_DATABASE=I/O Controls
+
+OUI:8C1F64FCC*
+ ID_OUI_FROM_DATABASE=GREDMANN TAIWAN LTD.
+
 OUI:8C1F64FCD*
  ID_OUI_FROM_DATABASE=elbit systems - EW and sigint - Elisra
 
@@ -91928,6 +93587,9 @@ OUI:8C1F64FF4*
 OUI:8C1F64FF6*
  ID_OUI_FROM_DATABASE=Ascon Tecnologic S.r.l.
 
+OUI:8C1F64FFC*
+ ID_OUI_FROM_DATABASE=Invendis Technologies India Pvt Ltd
+
 OUI:8C1F94*
  ID_OUI_FROM_DATABASE=RF Surgical System Inc.
 
@@ -91982,6 +93644,9 @@ OUI:8C34FD*
 OUI:8C3579*
  ID_OUI_FROM_DATABASE=QDIQO Sp. z o.o.
 
+OUI:8C3592*
+ ID_OUI_FROM_DATABASE=Guangzhou Shiyuan Electronic Technology Company Limited
+
 OUI:8C367A*
  ID_OUI_FROM_DATABASE=Palo Alto Networks
 
@@ -92327,6 +93992,9 @@ OUI:8C6878*
 OUI:8C68C8*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:8C6A3B*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:8C6A8D*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
@@ -92438,6 +94106,9 @@ OUI:8C83FC*
 OUI:8C8401*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:8C8442*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:8C8580*
  ID_OUI_FROM_DATABASE=Smart Innovation LLC
 
@@ -92480,6 +94151,9 @@ OUI:8C8CAA*
 OUI:8C8D28*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:8C8E0D*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:8C8E76*
  ID_OUI_FROM_DATABASE=taskit GmbH
 
@@ -92510,6 +94184,9 @@ OUI:8C9351*
 OUI:8C941F*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:8C946A*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:8C94CC*
  ID_OUI_FROM_DATABASE=SFR
 
@@ -92525,6 +94202,9 @@ OUI:8C97EA*
 OUI:8C9806*
  ID_OUI_FROM_DATABASE=SHENZHEN SEI ROBOTICS CO.,LTD
 
+OUI:8C986B*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:8C99E6*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
@@ -92706,7 +94386,7 @@ OUI:8CC8F46*
  ID_OUI_FROM_DATABASE=SHENZHEN D-light Technolgy Limited
 
 OUI:8CC8F47*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=TableSafe
 
 OUI:8CC8F48*
  ID_OUI_FROM_DATABASE=Strongbyte Solutions Limited
@@ -92894,6 +94574,9 @@ OUI:8CF9C9*
 OUI:8CFABA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:8CFADD*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:8CFCA0*
  ID_OUI_FROM_DATABASE=Shenzhen Smart Device Technology Co., LTD.
 
@@ -92924,6 +94607,9 @@ OUI:90004E*
 OUI:9000DB*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:900117*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:90013B*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -92957,6 +94643,9 @@ OUI:900917*
 OUI:9009D0*
  ID_OUI_FROM_DATABASE=Synology Incorporated
 
+OUI:9009DF*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:900A1A*
  ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 
@@ -93089,6 +94778,9 @@ OUI:90272B*
 OUI:902759*
  ID_OUI_FROM_DATABASE=Nanjing Jiahao Technology Co., Ltd.
 
+OUI:902778*
+ ID_OUI_FROM_DATABASE=Open Infrastructure
+
 OUI:9027E4*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -93140,6 +94832,9 @@ OUI:90380C*
 OUI:9038DF*
  ID_OUI_FROM_DATABASE=Changzhou Tiannengbo System Co. Ltd.
 
+OUI:90395E*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:903A72*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
@@ -93197,6 +94892,9 @@ OUI:904716*
 OUI:90473C*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
+OUI:904846*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:90486C*
  ID_OUI_FROM_DATABASE=Ring LLC
 
@@ -93341,6 +95039,9 @@ OUI:90633B*
 OUI:906560*
  ID_OUI_FROM_DATABASE=EM Microelectronic
 
+OUI:906584*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:906717*
  ID_OUI_FROM_DATABASE=Alphion India Private Limited
 
@@ -93437,6 +95138,9 @@ OUI:907A58*
 OUI:907AF1*
  ID_OUI_FROM_DATABASE=Wally
 
+OUI:907BC6*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:907E30*
  ID_OUI_FROM_DATABASE=LARS
 
@@ -93557,6 +95261,9 @@ OUI:909838*
 OUI:909864*
  ID_OUI_FROM_DATABASE=Impex-Sat GmbH&Co KG
 
+OUI:909877*
+ ID_OUI_FROM_DATABASE=Vestel Elektronik San ve Tic. A.S.
+
 OUI:909916*
  ID_OUI_FROM_DATABASE=ELVEES NeoTek OJSC
 
@@ -93657,7 +95364,7 @@ OUI:90B21F*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
 OUI:90B4DD*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=ZPT R&D
 
 OUI:90B57F*
  ID_OUI_FROM_DATABASE=Shenzhen iComm Semiconductor CO.,LTD
@@ -93815,6 +95522,9 @@ OUI:90DA4E*
 OUI:90DA6A*
  ID_OUI_FROM_DATABASE=FOCUS H&S Co., Ltd.
 
+OUI:90DAF9*
+ ID_OUI_FROM_DATABASE=Siemens Rail Automation SAU
+
 OUI:90DB46*
  ID_OUI_FROM_DATABASE=E-LEAD ELECTRONIC CO., LTD
 
@@ -93965,6 +95675,9 @@ OUI:90F72F*
 OUI:90F7B2*
  ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
 
+OUI:90F82E*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:90F891*
  ID_OUI_FROM_DATABASE=Kaonmedia CO., LTD.
 
@@ -94145,6 +95858,9 @@ OUI:941D1C*
 OUI:941F3A*
  ID_OUI_FROM_DATABASE=Ambiq
 
+OUI:941FA2*
+ ID_OUI_FROM_DATABASE=Wuhan YuXin Semiconductor Co., Ltd.
+
 OUI:942053*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
@@ -94238,6 +95954,9 @@ OUI:943BB0*
 OUI:943BB1*
  ID_OUI_FROM_DATABASE=Kaonmedia CO., LTD.
 
+OUI:943C96*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:943CC6*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -94406,6 +96125,12 @@ OUI:9476B7*
 OUI:94772B*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:947806*
+ ID_OUI_FROM_DATABASE=NINGBO SUNVOT TECHNOLOGY CO.,LTD
+
+OUI:947BAE*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:947BBE*
  ID_OUI_FROM_DATABASE=Ubicquia LLC
 
@@ -94589,6 +96314,9 @@ OUI:94ABFE*
 OUI:94ACCA*
  ID_OUI_FROM_DATABASE=trivum technologies GmbH
 
+OUI:94AD23*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:94AE61*
  ID_OUI_FROM_DATABASE=Alcatel Lucent
 
@@ -94643,6 +96371,9 @@ OUI:94BA56*
 OUI:94BBAE*
  ID_OUI_FROM_DATABASE=Husqvarna AB
 
+OUI:94BE09*
+ ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
+
 OUI:94BE46*
  ID_OUI_FROM_DATABASE=Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
 
@@ -94835,6 +96566,9 @@ OUI:94D469*
 OUI:94D505*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
+OUI:94D54D*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:94D60E*
  ID_OUI_FROM_DATABASE=shenzhen yunmao information technologies co., ltd
 
@@ -94850,6 +96584,9 @@ OUI:94D771*
 OUI:94D859*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
+OUI:94D86B*
+ ID_OUI_FROM_DATABASE=nass magnet Hungária Kft.
+
 OUI:94D93C*
  ID_OUI_FROM_DATABASE=ENELPS
 
@@ -94979,6 +96716,9 @@ OUI:94F278*
 OUI:94F2BB*
  ID_OUI_FROM_DATABASE=Valeo Vision Systems
 
+OUI:94F392*
+ ID_OUI_FROM_DATABASE=Fortinet, Inc.
+
 OUI:94F551*
  ID_OUI_FROM_DATABASE=Cadi Scientific Pte Ltd
 
@@ -95142,7 +96882,7 @@ OUI:9802D8E*
  ID_OUI_FROM_DATABASE=Private
 
 OUI:9802D8F*
- ID_OUI_FROM_DATABASE=IEEE Registration Authority
+ ID_OUI_FROM_DATABASE=Private
 
 OUI:98039B*
  ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
@@ -95225,6 +96965,9 @@ OUI:980D51*
 OUI:980D67*
  ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
 
+OUI:980D6F*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:980E24*
  ID_OUI_FROM_DATABASE=Phytium Technology Co.,Ltd.
 
@@ -95273,9 +97016,15 @@ OUI:981E19*
 OUI:981FB1*
  ID_OUI_FROM_DATABASE=Shenzhen Lemon Network Technology Co.,Ltd
 
+OUI:982044*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:98208E*
  ID_OUI_FROM_DATABASE=Definium Technologies
 
+OUI:98226E*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:9822EF*
  ID_OUI_FROM_DATABASE=Liteon Technology Corporation
 
@@ -95372,6 +97121,9 @@ OUI:983000*
 OUI:983071*
  ID_OUI_FROM_DATABASE=DAIKYUNG VASCOM
 
+OUI:98348C*
+ ID_OUI_FROM_DATABASE=Teleepoch Ltd
+
 OUI:98349D*
  ID_OUI_FROM_DATABASE=Krauss Maffei Technologies GmbH
 
@@ -95780,6 +97532,9 @@ OUI:9886B1*
 OUI:988744*
  ID_OUI_FROM_DATABASE=Wuxi Hongda Science and Technology Co.,LTD
 
+OUI:988924*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:9889ED*
  ID_OUI_FROM_DATABASE=Anadem Information Inc.
 
@@ -95888,6 +97643,9 @@ OUI:989C57*
 OUI:989D5D*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
+OUI:989DE5*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:989E63*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -96062,6 +97820,12 @@ OUI:98CBA4*
 OUI:98CC4D*
  ID_OUI_FROM_DATABASE=Shenzhen mantunsci co., LTD
 
+OUI:98CCD9*
+ ID_OUI_FROM_DATABASE=Shenzhen SuperElectron Technology Co.,Ltd.
+
+OUI:98CCE4*
+ ID_OUI_FROM_DATABASE=Shenzhen Mindray Animal Medical Technology Co.,LTD
+
 OUI:98CDAC*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -96482,6 +98246,9 @@ OUI:9C2A83*
 OUI:9C2BA6*
  ID_OUI_FROM_DATABASE=Ruijie Networks Co.,LTD
 
+OUI:9C2DCD*
+ ID_OUI_FROM_DATABASE=LCFC(Hefei) Electronics Technology Co., Ltd
+
 OUI:9C2DCF*
  ID_OUI_FROM_DATABASE=Shishi Tongyun Technology(Chengdu)Co.,Ltd.
 
@@ -96660,7 +98427,10 @@ OUI:9C541C*
  ID_OUI_FROM_DATABASE=Shenzhen My-power Technology Co.,Ltd
 
 OUI:9C5440*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=ChengDu TD Tech
+
+OUI:9C5467*
+ ID_OUI_FROM_DATABASE=Nokia
 
 OUI:9C54C2*
  ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
@@ -96671,6 +98441,9 @@ OUI:9C54CA*
 OUI:9C54DA*
  ID_OUI_FROM_DATABASE=SkyBell Technologies Inc.
 
+OUI:9C558F*
+ ID_OUI_FROM_DATABASE=Lockin Technology(Beijing) Co.,Ltd.
+
 OUI:9C55B4*
  ID_OUI_FROM_DATABASE=I.S.E. S.r.l.
 
@@ -96731,6 +98504,9 @@ OUI:9C6121*
 OUI:9C62AB*
  ID_OUI_FROM_DATABASE=Sumavision Technologies Co.,Ltd
 
+OUI:9C635B*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:9C63ED*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -96902,6 +98678,9 @@ OUI:9C8566*
 OUI:9C86DA*
  ID_OUI_FROM_DATABASE=Phoenix Geophysics Ltd.
 
+OUI:9C8824*
+ ID_OUI_FROM_DATABASE=PetroCloud LLC
+
 OUI:9C8888*
  ID_OUI_FROM_DATABASE=Simac Techniek NV
 
@@ -97071,7 +98850,7 @@ OUI:9CB008*
  ID_OUI_FROM_DATABASE=Ubiquitous Computing Technology Corporation
 
 OUI:9CB206*
- ID_OUI_FROM_DATABASE=PROCENTEC
+ ID_OUI_FROM_DATABASE=HMS Industrial Networks
 
 OUI:9CB2B2*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@@ -97133,6 +98912,9 @@ OUI:9CC7A6*
 OUI:9CC7D1*
  ID_OUI_FROM_DATABASE=SHARP Corporation
 
+OUI:9CC893*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:9CC8AE*
  ID_OUI_FROM_DATABASE=Becton, Dickinson  and Company
 
@@ -97178,6 +98960,9 @@ OUI:9CD57D*
 OUI:9CD643*
  ID_OUI_FROM_DATABASE=D-Link International
 
+OUI:9CD8E3*
+ ID_OUI_FROM_DATABASE=Wuhan Huazhong Numerical Control Co., Ltd
+
 OUI:9CD917*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
@@ -97188,7 +98973,7 @@ OUI:9CDA3E*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
 OUI:9CDB07*
- ID_OUI_FROM_DATABASE=Thum+Mahr GmbH
+ ID_OUI_FROM_DATABASE=Yellowtec GmbH
 
 OUI:9CDBCB*
  ID_OUI_FROM_DATABASE=Wuhan Funshion Online Technologies Co.,Ltd
@@ -97199,6 +98984,9 @@ OUI:9CDC71*
 OUI:9CDD1F*
  ID_OUI_FROM_DATABASE=Intelligent Steward Co.,Ltd
 
+OUI:9CDE4D*
+ ID_OUI_FROM_DATABASE=ML vision Co.,LTD
+
 OUI:9CDF03*
  ID_OUI_FROM_DATABASE=Harman/Becker Automotive Systems GmbH
 
@@ -97383,7 +99171,7 @@ OUI:A0024A4*
  ID_OUI_FROM_DATABASE=Argos Solutions AS
 
 OUI:A0024A5*
- ID_OUI_FROM_DATABASE=Donguan Amsamotion Automation Technology Co., Ltd
+ ID_OUI_FROM_DATABASE=Dongguan Amsamotion Automation Technology Co., Ltd
 
 OUI:A0024A6*
  ID_OUI_FROM_DATABASE=Xiaojie Technology (Shenzhen) Co., Ltd
@@ -97475,6 +99263,9 @@ OUI:A0143D*
 OUI:A0165C*
  ID_OUI_FROM_DATABASE=Triteka LTD
 
+OUI:A017F1*
+ ID_OUI_FROM_DATABASE=Allwinner Technology Co., Ltd
+
 OUI:A01828*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -97553,6 +99344,9 @@ OUI:A01E0B*
 OUI:A020A6*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:A0218B*
+ ID_OUI_FROM_DATABASE=ACE Antenna Co., ltd
+
 OUI:A02195*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -97613,6 +99407,9 @@ OUI:A0231B*
 OUI:A0239F*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:A024F9*
+ ID_OUI_FROM_DATABASE=Chengdu InnovaTest Technology Co., Ltd
+
 OUI:A027B6*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -97715,6 +99512,9 @@ OUI:A036FA*
 OUI:A038F8*
  ID_OUI_FROM_DATABASE=OURA Health Oy
 
+OUI:A03975*
+ ID_OUI_FROM_DATABASE=Leo Bodnar Electronics Ltd
+
 OUI:A039EE*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -97838,6 +99638,9 @@ OUI:A04466*
 OUI:A044F3*
  ID_OUI_FROM_DATABASE=RafaelMicro
 
+OUI:A0465A*
+ ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
+
 OUI:A047D7*
  ID_OUI_FROM_DATABASE=Best IT World (India) Pvt Ltd
 
@@ -98123,6 +99926,9 @@ OUI:A0946A*
 OUI:A0950C*
  ID_OUI_FROM_DATABASE=China Mobile IOT Company Limited
 
+OUI:A0957F*
+ ID_OUI_FROM_DATABASE=SERNET (SUZHOU) TECHNOLOGIES CORPORATION
+
 OUI:A09805*
  ID_OUI_FROM_DATABASE=OpenVox Communication Co Ltd
 
@@ -98162,6 +99968,9 @@ OUI:A09F10*
 OUI:A09F7A*
  ID_OUI_FROM_DATABASE=D-Link Middle East FZCO
 
+OUI:A0A001*
+ ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
+
 OUI:A0A0DC*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -98528,6 +100337,9 @@ OUI:A0EC80*
 OUI:A0ECF9*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:A0ED6D*
+ ID_OUI_FROM_DATABASE=Ubee Interactive Co., Limited
+
 OUI:A0EDCD*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -98588,6 +100400,9 @@ OUI:A0FE61*
 OUI:A0FE91*
  ID_OUI_FROM_DATABASE=AVAT Automation GmbH
 
+OUI:A0FF0C*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:A0FF22*
  ID_OUI_FROM_DATABASE=SHENZHEN APICAL TECHNOLOGY CO., LTD
 
@@ -98648,6 +100463,9 @@ OUI:A40DBC*
 OUI:A40E2B*
  ID_OUI_FROM_DATABASE=Facebook Inc
 
+OUI:A40E75*
+ ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
+
 OUI:A40F98*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -98705,6 +100523,9 @@ OUI:A41163E*
 OUI:A41194*
  ID_OUI_FROM_DATABASE=Lenovo
 
+OUI:A411BB*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:A41232*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -98753,6 +100574,9 @@ OUI:A41B34*
 OUI:A41BC0*
  ID_OUI_FROM_DATABASE=Fastec Imaging Corporation
 
+OUI:A41CB4*
+ ID_OUI_FROM_DATABASE=DFI Inc
+
 OUI:A41EE1*
  ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 
@@ -99029,6 +100853,9 @@ OUI:A45055*
 OUI:A45129*
  ID_OUI_FROM_DATABASE=XAG
 
+OUI:A4515E*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:A4516F*
  ID_OUI_FROM_DATABASE=Microsoft Mobile Oy
 
@@ -99191,6 +101018,9 @@ OUI:A468BC*
 OUI:A46BB6*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:A46C24*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:A46C2A*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -99233,6 +101063,9 @@ OUI:A47806*
 OUI:A47886*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
+OUI:A47952*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:A479E4*
  ID_OUI_FROM_DATABASE=KLINFO Corp
 
@@ -99380,6 +101213,9 @@ OUI:A49BF5*
 OUI:A49D49*
  ID_OUI_FROM_DATABASE=Ketra, Inc.
 
+OUI:A49DDD*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:A49E69*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
@@ -99536,6 +101372,9 @@ OUI:A4C64F*
 OUI:A4C69A*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:A4C6F0*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:A4C74B*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -99725,6 +101564,9 @@ OUI:A4E731*
 OUI:A4E7E4*
  ID_OUI_FROM_DATABASE=Connex GmbH
 
+OUI:A4E8A3*
+ ID_OUI_FROM_DATABASE=Fujian Newland Auto-ID Tech Co.,Ltd.
+
 OUI:A4E975*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -99863,6 +101705,9 @@ OUI:A80577*
 OUI:A80600*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:A80C03*
+ ID_OUI_FROM_DATABASE=Florawise
+
 OUI:A80C0D*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -99893,6 +101738,9 @@ OUI:A81559*
 OUI:A815D6*
  ID_OUI_FROM_DATABASE=Shenzhen Meione Technology CO., LTD
 
+OUI:A8169D*
+ ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
+
 OUI:A816B2*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
@@ -99995,6 +101843,9 @@ OUI:A83A48*
 OUI:A83B5C*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:A83B76*
+ ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
+
 OUI:A83CCB*
  ID_OUI_FROM_DATABASE=ROSSMA
 
@@ -100046,6 +101897,9 @@ OUI:A83FA1D*
 OUI:A83FA1E*
  ID_OUI_FROM_DATABASE=Guangzhou Navigateworx Technologies Co., Limited
 
+OUI:A8400B*
+ ID_OUI_FROM_DATABASE=Visteon Corporation
+
 OUI:A84025*
  ID_OUI_FROM_DATABASE=Oxide Computer Company
 
@@ -100322,6 +102176,9 @@ OUI:A87B39*
 OUI:A87C01*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:A87CF8*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:A87D12*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -100382,6 +102239,9 @@ OUI:A88D7B*
 OUI:A88E24*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:A88FD9*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:A89008*
  ID_OUI_FROM_DATABASE=Beijing Yuecheng Technology Co. Ltd.
 
@@ -100691,6 +102551,9 @@ OUI:A8EF26*
 OUI:A8F038*
  ID_OUI_FROM_DATABASE=SHEN ZHEN SHI JIN HUA TAI ELECTRONICS CO.,LTD
 
+OUI:A8F1B2*
+ ID_OUI_FROM_DATABASE=Allwinner Technology Co., Ltd
+
 OUI:A8F266*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -101021,6 +102884,9 @@ OUI:AC3D05*
 OUI:AC3D75*
  ID_OUI_FROM_DATABASE=HANGZHOU ZHIWAY TECHNOLOGIES CO.,LTD.
 
+OUI:AC3EB1*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:AC3FA4*
  ID_OUI_FROM_DATABASE=TAIYO YUDEN CO.,LTD
 
@@ -101066,6 +102932,9 @@ OUI:AC4B1E*
 OUI:AC4BC8*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:AC4CA5*
+ ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
+
 OUI:AC4D16*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -101435,6 +103304,9 @@ OUI:AC9403*
 OUI:AC9572*
  ID_OUI_FROM_DATABASE=Jovision Technology Co., Ltd.
 
+OUI:AC965B*
+ ID_OUI_FROM_DATABASE=Lucid Motors
+
 OUI:AC976C*
  ID_OUI_FROM_DATABASE=Greenliant
 
@@ -101504,6 +103376,9 @@ OUI:ACABBF*
 OUI:ACACE2*
  ID_OUI_FROM_DATABASE=CHANGHONG (HONGKONG) TRADING LIMITED
 
+OUI:ACAD4B*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:ACAE19*
  ID_OUI_FROM_DATABASE=Roku, Inc
 
@@ -101579,6 +103454,9 @@ OUI:ACC33A*
 OUI:ACC358*
  ID_OUI_FROM_DATABASE=Continental Automotive Czech Republic s.r.o.
 
+OUI:ACC4A9*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:ACC4BD*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -101597,6 +103475,9 @@ OUI:ACC698*
 OUI:ACC73F*
  ID_OUI_FROM_DATABASE=VITSMO CO., LTD.
 
+OUI:ACC906*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:ACC935*
  ID_OUI_FROM_DATABASE=Ness Corporation
 
@@ -101615,6 +103496,9 @@ OUI:ACCABA*
 OUI:ACCB09*
  ID_OUI_FROM_DATABASE=Hefcom Metering (Pty) Ltd
 
+OUI:ACCB36*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:ACCB51*
  ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 
@@ -101633,6 +103517,9 @@ OUI:ACCF23*
 OUI:ACCF5C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:ACCF7B*
+ ID_OUI_FROM_DATABASE=INGRAM MICRO SERVICES
+
 OUI:ACCF85*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -101750,6 +103637,9 @@ OUI:ACED5C*
 OUI:ACEE3B*
  ID_OUI_FROM_DATABASE=6harmonics Inc
 
+OUI:ACEE64*
+ ID_OUI_FROM_DATABASE=Shenzhen SuperElectron Technology Co.,Ltd.
+
 OUI:ACEE70*
  ID_OUI_FROM_DATABASE=Fontem Ventures BV
 
@@ -102182,6 +104072,9 @@ OUI:B06971*
 OUI:B06A41*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
+OUI:B06BB3*
+ ID_OUI_FROM_DATABASE=GRT
+
 OUI:B06CBF*
  ID_OUI_FROM_DATABASE=3ality Digital Systems GmbH
 
@@ -102266,6 +104159,9 @@ OUI:B07FB9*
 OUI:B0808C*
  ID_OUI_FROM_DATABASE=Laser Light Engines
 
+OUI:B08101*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
 OUI:B081D8*
  ID_OUI_FROM_DATABASE=I-sys Corp
 
@@ -102293,6 +104189,9 @@ OUI:B089C2*
 OUI:B08B92*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:B08BBE*
+ ID_OUI_FROM_DATABASE=ABL GmbH
+
 OUI:B08BCF*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -102509,6 +104408,9 @@ OUI:B0BB8B*
 OUI:B0BBE5*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:B0BC7A*
+ ID_OUI_FROM_DATABASE=Harman/Becker Automotive Systems GmbH
+
 OUI:B0BD1B*
  ID_OUI_FROM_DATABASE=Dongguan Liesheng Electronic Co., Ltd.
 
@@ -102716,6 +104618,9 @@ OUI:B0E50E*
 OUI:B0E5ED*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:B0E5EF*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:B0E5F9*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -102743,6 +104648,9 @@ OUI:B0EABC*
 OUI:B0EB57*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:B0EB7F*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:B0EC71*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -102866,6 +104774,9 @@ OUI:B40216*
 OUI:B40418*
  ID_OUI_FROM_DATABASE=Smartchip Integrated Inc.
 
+OUI:B40421*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:B4055D*
  ID_OUI_FROM_DATABASE=Inspur Electronic Information Industry Co.,Ltd.
 
@@ -103028,6 +104939,9 @@ OUI:B431B8*
 OUI:B4346C*
  ID_OUI_FROM_DATABASE=MATSUNICHI DIGITAL TECHNOLOGY (HONG KONG) LIMITED
 
+OUI:B43522*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:B43564*
  ID_OUI_FROM_DATABASE=Fujian Tian Cheng Electron Science & Technical Development Co.,Ltd.
 
@@ -103235,6 +105149,9 @@ OUI:B456B9*
 OUI:B456E3*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:B457E6*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:B45861*
  ID_OUI_FROM_DATABASE=CRemote, LLC
 
@@ -103256,6 +105173,9 @@ OUI:B4608C*
 OUI:B460ED*
  ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
 
+OUI:B46142*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:B461FF*
  ID_OUI_FROM_DATABASE=Lumigon A/S
 
@@ -103292,6 +105212,9 @@ OUI:B46D35*
 OUI:B46D83*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:B46DC2*
+ ID_OUI_FROM_DATABASE=SHENZHEN BILIAN ELECTRONIC CO.，LTD
+
 OUI:B46E08*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -103424,6 +105347,9 @@ OUI:B49D0B*
 OUI:B49DB4*
  ID_OUI_FROM_DATABASE=Axion Technologies Inc.
 
+OUI:B49DFD*
+ ID_OUI_FROM_DATABASE=Shenzhen SDMC Technology CO.,Ltd.
+
 OUI:B49E80*
  ID_OUI_FROM_DATABASE=Sichuan Changhong Electric Ltd.
 
@@ -103709,6 +105635,9 @@ OUI:B4D8A9*
 OUI:B4D8DE*
  ID_OUI_FROM_DATABASE=iota Computing, Inc.
 
+OUI:B4DB91*
+ ID_OUI_FROM_DATABASE=CELESTICA INC.
+
 OUI:B4DC09*
  ID_OUI_FROM_DATABASE=Guangzhou Dawei Communication Co.,Ltd
 
@@ -103746,7 +105675,7 @@ OUI:B4E1EB*
  ID_OUI_FROM_DATABASE=Private
 
 OUI:B4E265*
- ID_OUI_FROM_DATABASE=Shenzhen SDMC Technology Co.,LTD
+ ID_OUI_FROM_DATABASE=Shenzhen SDMC Technology CO.,Ltd.
 
 OUI:B4E3F9*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
@@ -103754,6 +105683,9 @@ OUI:B4E3F9*
 OUI:B4E454*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
+OUI:B4E46B*
+ ID_OUI_FROM_DATABASE=China Mobile IOT Company Limited
+
 OUI:B4E62A*
  ID_OUI_FROM_DATABASE=LG Innotek
 
@@ -103916,6 +105848,9 @@ OUI:B813E9*
 OUI:B81413*
  ID_OUI_FROM_DATABASE=Keen High Holding(HK) Ltd.
 
+OUI:B8144D*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:B8145C*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -103925,6 +105860,9 @@ OUI:B814DB*
 OUI:B81619*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:B8165F*
+ ID_OUI_FROM_DATABASE=LG Innotek
+
 OUI:B816DB*
  ID_OUI_FROM_DATABASE=CHANT SINCERE CO.,LTD
 
@@ -104054,6 +105992,9 @@ OUI:B83BCC*
 OUI:B83D4E*
  ID_OUI_FROM_DATABASE=Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch
 
+OUI:B83DFB*
+ ID_OUI_FROM_DATABASE=Bouffalo Lab (Nanjing) Co., Ltd.
+
 OUI:B83E59*
  ID_OUI_FROM_DATABASE=Roku, Inc.
 
@@ -104150,6 +106091,9 @@ OUI:B85D0A*
 OUI:B85DC3*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:B85E71*
+ ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
+
 OUI:B85E7B*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -104243,6 +106187,9 @@ OUI:B87BC5*
 OUI:B87C6F*
  ID_OUI_FROM_DATABASE=NXP (China) Management Ltd.
 
+OUI:B87CD0*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:B87CF2*
  ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
@@ -104429,6 +106376,9 @@ OUI:B8A58D*
 OUI:B8A8AF*
  ID_OUI_FROM_DATABASE=Logic S.p.A.
 
+OUI:B8AB62*
+ ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
+
 OUI:B8AC6F*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -104456,6 +106406,9 @@ OUI:B8B1C7*
 OUI:B8B2EB*
  ID_OUI_FROM_DATABASE=Googol Technology (HK) Limited
 
+OUI:B8B2F7*
+ ID_OUI_FROM_DATABASE=DRIMAES INC.
+
 OUI:B8B2F8*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -104582,6 +106535,9 @@ OUI:B8CEF6*
 OUI:B8D06F*
  ID_OUI_FROM_DATABASE=GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE
 
+OUI:B8D0F0*
+ ID_OUI_FROM_DATABASE=FCNT LMITED
+
 OUI:B8D309*
  ID_OUI_FROM_DATABASE=Cox Communications, Inc
 
@@ -104591,6 +106547,9 @@ OUI:B8D43E*
 OUI:B8D49D*
  ID_OUI_FROM_DATABASE=M Seven System Ltd.
 
+OUI:B8D4BC*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:B8D4E7*
  ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
 
@@ -104658,7 +106617,7 @@ OUI:B8D812E*
  ID_OUI_FROM_DATABASE=ZheJiang FangTai Electirc Co., Ltd
 
 OUI:B8D812F*
- ID_OUI_FROM_DATABASE=IEEE Registration Authority
+ ID_OUI_FROM_DATABASE=Private
 
 OUI:B8D94D*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
@@ -104735,6 +106694,9 @@ OUI:B8EF8B*
 OUI:B8F009*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:B8F015*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:B8F080*
  ID_OUI_FROM_DATABASE=SPS, INC.
 
@@ -104810,6 +106772,9 @@ OUI:BC0200*
 OUI:BC024A*
  ID_OUI_FROM_DATABASE=HMD Global Oy
 
+OUI:BC026E*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:BC0358*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -104843,6 +106808,9 @@ OUI:BC0F9A*
 OUI:BC0FA7*
  ID_OUI_FROM_DATABASE=Ouster
 
+OUI:BC107B*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:BC125E*
  ID_OUI_FROM_DATABASE=Beijing  WisVideo  INC.
 
@@ -105101,6 +107069,9 @@ OUI:BC452E*
 OUI:BC455B*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:BC458C*
+ ID_OUI_FROM_DATABASE=Shenzhen Topwise Communication Co.,Ltd
+
 OUI:BC4699*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -105131,6 +107102,9 @@ OUI:BC4E5D*
 OUI:BC51FE*
  ID_OUI_FROM_DATABASE=Swann communications Pty Ltd
 
+OUI:BC5274*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:BC52B4*
  ID_OUI_FROM_DATABASE=Nokia
 
@@ -105167,6 +107141,9 @@ OUI:BC5C4C*
 OUI:BC5DA3*
  ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
 
+OUI:BC5E33*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:BC5EA1*
  ID_OUI_FROM_DATABASE=PsiKick, Inc.
 
@@ -105386,6 +107363,9 @@ OUI:BC8893*
 OUI:BC88C3*
  ID_OUI_FROM_DATABASE=Ningbo Dooya Mechanic & Electronic Technology Co., Ltd
 
+OUI:BC89A7*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:BC8AA3*
  ID_OUI_FROM_DATABASE=NHN Entertainment
 
@@ -105503,6 +107483,9 @@ OUI:BC9D42*
 OUI:BC9DA5*
  ID_OUI_FROM_DATABASE=DASCOM Europe GmbH
 
+OUI:BC9EBB*
+ ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
+
 OUI:BC9FE4*
  ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
 
@@ -105581,6 +107564,9 @@ OUI:BCB852*
 OUI:BCB863*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:BCB923*
+ ID_OUI_FROM_DATABASE=Alta Networks
+
 OUI:BCBAC2*
  ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 
@@ -105593,6 +107579,9 @@ OUI:BCBBC9*
 OUI:BCBC46*
  ID_OUI_FROM_DATABASE=SKS Welding Systems GmbH
 
+OUI:BCBD84*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:BCBD9E*
  ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
 
@@ -105647,6 +107636,9 @@ OUI:BCCFCC*
 OUI:BCD074*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:BCD0EB*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:BCD11F*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -105695,6 +107687,9 @@ OUI:BCDDC2*
 OUI:BCDF58*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
+OUI:BCE001*
+ ID_OUI_FROM_DATABASE=SHENZHEN NETIS TECHNOLOGY CO.,LTD
+
 OUI:BCE09D*
  ID_OUI_FROM_DATABASE=Eoslink
 
@@ -105948,7 +107943,7 @@ OUI:C02E25*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
 OUI:C02E26*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=iRhythm Technologies, Inc.
 
 OUI:C02FF1*
  ID_OUI_FROM_DATABASE=Volta Networks
@@ -106079,6 +108074,12 @@ OUI:C04DF7*
 OUI:C04E30*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:C04E8A*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
+OUI:C0515C*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:C0517E*
  ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 
@@ -106286,6 +108287,9 @@ OUI:C0847D*
 OUI:C08488*
  ID_OUI_FROM_DATABASE=Finis Inc
 
+OUI:C084E0*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:C0854C*
  ID_OUI_FROM_DATABASE=Ragentek Technology Group
 
@@ -106337,6 +108341,9 @@ OUI:C09132*
 OUI:C09134*
  ID_OUI_FROM_DATABASE=ProCurve Networking by HP
 
+OUI:C091B9*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:C09296*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -106472,6 +108479,9 @@ OUI:C0A53E*
 OUI:C0A5DD*
  ID_OUI_FROM_DATABASE=SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
 
+OUI:C0A5E8*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:C0A600*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -106550,6 +108560,9 @@ OUI:C0BDD1*
 OUI:C0BFA7*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:C0BFAC*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:C0BFC0*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -106895,6 +108908,9 @@ OUI:C40415*
 OUI:C4047B*
  ID_OUI_FROM_DATABASE=Shenzhen YOUHUA Technology Co., Ltd
 
+OUI:C404D8*
+ ID_OUI_FROM_DATABASE=Aviva Links Inc.
+
 OUI:C40528*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -107069,6 +109085,9 @@ OUI:C4345B*
 OUI:C4346B*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
+OUI:C435D9*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:C43655*
  ID_OUI_FROM_DATABASE=Shenzhen Fenglian Technology Co., Ltd.
 
@@ -107228,6 +109247,9 @@ OUI:C45976*
 OUI:C45A86*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:C45AB1*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:C45BBE*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -107249,6 +109271,9 @@ OUI:C46044*
 OUI:C4618B*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:C461C7*
+ ID_OUI_FROM_DATABASE=Microsoft Corporation
+
 OUI:C4626B*
  ID_OUI_FROM_DATABASE=ZPT Vigantice
 
@@ -107357,9 +109382,15 @@ OUI:C477AF*
 OUI:C478A2*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:C47905*
+ ID_OUI_FROM_DATABASE=Zhejiang Uniview Technologies Co.,Ltd.
+
 OUI:C47B2F*
  ID_OUI_FROM_DATABASE=Beijing JoinHope Image Technology Ltd.
 
+OUI:C47B80*
+ ID_OUI_FROM_DATABASE=Protempis, LLC
+
 OUI:C47BA3*
  ID_OUI_FROM_DATABASE=NAVIS Inc.
 
@@ -107441,6 +109472,51 @@ OUI:C4824E*
 OUI:C4836F*
  ID_OUI_FROM_DATABASE=Ciena Corporation
 
+OUI:C483720*
+ ID_OUI_FROM_DATABASE=Compumedics Germany GmbH
+
+OUI:C483721*
+ ID_OUI_FROM_DATABASE=Shenzhen King Will Technology Co., LTD
+
+OUI:C483722*
+ ID_OUI_FROM_DATABASE=AI-RIDER CORPORATION
+
+OUI:C483723*
+ ID_OUI_FROM_DATABASE=NextSilicon
+
+OUI:C483724*
+ ID_OUI_FROM_DATABASE=Transact Technologies Inc
+
+OUI:C483725*
+ ID_OUI_FROM_DATABASE=Wuhan Da Ta Technologies Co.,Ltd.
+
+OUI:C483726*
+ ID_OUI_FROM_DATABASE=Netplus Co., Ltd.
+
+OUI:C483727*
+ ID_OUI_FROM_DATABASE=clk2.inc
+
+OUI:C483728*
+ ID_OUI_FROM_DATABASE=ACCELECOM LTD.
+
+OUI:C483729*
+ ID_OUI_FROM_DATABASE=Biwave Technologies, Inc.
+
+OUI:C48372A*
+ ID_OUI_FROM_DATABASE=VIE STYLE,INC,
+
+OUI:C48372B*
+ ID_OUI_FROM_DATABASE=care.ai
+
+OUI:C48372C*
+ ID_OUI_FROM_DATABASE=Acenew technology(shenzhen) limited company
+
+OUI:C48372D*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:C48372E*
+ ID_OUI_FROM_DATABASE=Suzhou LZY technology Co.,Ltd
+
 OUI:C48466*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -107561,6 +109637,51 @@ OUI:C49880*
 OUI:C49886*
  ID_OUI_FROM_DATABASE=Qorvo International Pte. Ltd.
 
+OUI:C498940*
+ ID_OUI_FROM_DATABASE=Shenzhen Megmeet Drive Technology Co.,Ltd.
+
+OUI:C498941*
+ ID_OUI_FROM_DATABASE=SEAVIEW TELECOM
+
+OUI:C498942*
+ ID_OUI_FROM_DATABASE=Metasphere Ltd
+
+OUI:C498943*
+ ID_OUI_FROM_DATABASE=BTL Industries JSC
+
+OUI:C498944*
+ ID_OUI_FROM_DATABASE=Alpine Electronics Marketing, Inc.
+
+OUI:C498945*
+ ID_OUI_FROM_DATABASE=shenzhen lanodo technology Co., Ltd
+
+OUI:C498946*
+ ID_OUI_FROM_DATABASE=Aetina Corporation
+
+OUI:C498947*
+ ID_OUI_FROM_DATABASE=Shenzhen C & D Electronics Co., Ltd.
+
+OUI:C498948*
+ ID_OUI_FROM_DATABASE=Pliem (Shanghai) Intelligent Technology Co., Ltd
+
+OUI:C498949*
+ ID_OUI_FROM_DATABASE=Shenzhen  Hexin Automation Technology Co.,Ltd.
+
+OUI:C49894A*
+ ID_OUI_FROM_DATABASE=Neron Informatics Pvt Ltd
+
+OUI:C49894B*
+ ID_OUI_FROM_DATABASE=Shanghai YVR Technology Co., Ltd.
+
+OUI:C49894C*
+ ID_OUI_FROM_DATABASE=Zhejiang Rexense loT Technology Co., Ltd
+
+OUI:C49894D*
+ ID_OUI_FROM_DATABASE=Jiangsu AIDriving Co.,Ltd.
+
+OUI:C49894E*
+ ID_OUI_FROM_DATABASE=Hans Sasserath GmbH & Co. KG
+
 OUI:C49A02*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
@@ -107577,7 +109698,7 @@ OUI:C49FF3*
  ID_OUI_FROM_DATABASE=Mciao Technologies, Inc.
 
 OUI:C4A10E0*
- ID_OUI_FROM_DATABASE=HYOSUNG HEAVY INDUSTRIES
+ ID_OUI_FROM_DATABASE=HYOSUNG Heavy Industries Corporation
 
 OUI:C4A10E1*
  ID_OUI_FROM_DATABASE=BARTEC PIXAVI AS
@@ -107639,12 +109760,18 @@ OUI:C4A81D*
 OUI:C4AAA1*
  ID_OUI_FROM_DATABASE=SUMMIT DEVELOPMENT, spol.s r.o.
 
+OUI:C4AAC4*
+ ID_OUI_FROM_DATABASE=Zhejiang Dahua Technology Co., Ltd.
+
 OUI:C4ABB2*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
 OUI:C4AC59*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
+OUI:C4ACAA*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:C4AD21*
  ID_OUI_FROM_DATABASE=MEDIAEDGE Corporation
 
@@ -107759,12 +109886,18 @@ OUI:C4D0E3*
 OUI:C4D197*
  ID_OUI_FROM_DATABASE=Ventia Utility Services
 
+OUI:C4D36A*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:C4D438*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
 OUI:C4D489*
  ID_OUI_FROM_DATABASE=JiangSu Joyque Information Industry Co.,Ltd
 
+OUI:C4D496*
+ ID_OUI_FROM_DATABASE=Shenzhen Excelsecu Data Technology Co.,Ltd
+
 OUI:C4D655*
  ID_OUI_FROM_DATABASE=Tercel technology co.,ltd
 
@@ -107825,6 +109958,9 @@ OUI:C4E510*
 OUI:C4E532*
  ID_OUI_FROM_DATABASE=Arcadyan Corporation
 
+OUI:C4E5B1*
+ ID_OUI_FROM_DATABASE=Suzhou PanKore Integrated Circuit Technology Co. Ltd.
+
 OUI:C4E7BE*
  ID_OUI_FROM_DATABASE=SCSpro Co.,Ltd
 
@@ -107843,6 +109979,15 @@ OUI:C4EA1D*
 OUI:C4EB39*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:C4EB41*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
+OUI:C4EB42*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
+OUI:C4EB43*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:C4EBE3*
  ID_OUI_FROM_DATABASE=RRCN SAS
 
@@ -108107,6 +110252,9 @@ OUI:C8292A*
 OUI:C82A14*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:C82ADD*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:C82AF1*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
@@ -108233,6 +110381,9 @@ OUI:C83FB4*
 OUI:C84029*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
+OUI:C84052*
+ ID_OUI_FROM_DATABASE=PAX Computer Technology(Shenzhen) Ltd.
+
 OUI:C8418A*
  ID_OUI_FROM_DATABASE=Samsung Electronics.,LTD
 
@@ -108254,6 +110405,9 @@ OUI:C8478C*
 OUI:C848F5*
  ID_OUI_FROM_DATABASE=MEDISON Xray Co., Ltd
 
+OUI:C84AA0*
+ ID_OUI_FROM_DATABASE=Sony Interactive Entertainment Inc.
+
 OUI:C84BD6*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -108419,6 +110573,9 @@ OUI:C86CB6*
 OUI:C86F1D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:C870D4*
+ ID_OUI_FROM_DATABASE=IBO Technology Co,Ltd
+
 OUI:C87125*
  ID_OUI_FROM_DATABASE=Johnson Outdoors Marine Electronics d/b/a Minnkota
 
@@ -108458,6 +110615,9 @@ OUI:C87E75*
 OUI:C87EA1*
  ID_OUI_FROM_DATABASE=TCL MOKA International Limited
 
+OUI:C87F54*
+ ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
+
 OUI:C88314*
  ID_OUI_FROM_DATABASE=Tempo Communications
 
@@ -108557,6 +110717,9 @@ OUI:C88F26*
 OUI:C8903E*
  ID_OUI_FROM_DATABASE=Pakton Technologies
 
+OUI:C8908A*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:C891F9*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -108575,6 +110738,9 @@ OUI:C894BB*
 OUI:C894D2*
  ID_OUI_FROM_DATABASE=Jiangsu Datang  Electronic Products Co., Ltd
 
+OUI:C8965A*
+ ID_OUI_FROM_DATABASE=SKY UK LIMITED
+
 OUI:C89665*
  ID_OUI_FROM_DATABASE=Microsoft Corporation
 
@@ -108851,6 +111017,9 @@ OUI:C8DB26*
 OUI:C8DDC9*
  ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd.
 
+OUI:C8DE41*
+ ID_OUI_FROM_DATABASE=SKY UK LIMITED
+
 OUI:C8DE51*
  ID_OUI_FROM_DATABASE=IntegraOptics
 
@@ -108875,6 +111044,9 @@ OUI:C8E1A7*
 OUI:C8E265*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:C8E306*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:C8E42F*
  ID_OUI_FROM_DATABASE=Technical Research Design and Development
 
@@ -108908,12 +111080,18 @@ OUI:C8EEA6*
 OUI:C8EF2E*
  ID_OUI_FROM_DATABASE=Beijing Gefei Tech. Co., Ltd
 
+OUI:C8EFBC*
+ ID_OUI_FROM_DATABASE=Inspur Communication Technology Co.,Ltd.
+
 OUI:C8F09E*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
 OUI:C8F230*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
+OUI:C8F2B4*
+ ID_OUI_FROM_DATABASE=Guizhou Huaxin Information Technology Co., Ltd.
+
 OUI:C8F319*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
@@ -109064,6 +111242,9 @@ OUI:CC07AB*
 OUI:CC07E4*
  ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd.
 
+OUI:CC087B*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:CC088D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -109157,6 +111338,9 @@ OUI:CC1BE0E*
 OUI:CC1BE0F*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:CC1E97*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:CC1EFF*
  ID_OUI_FROM_DATABASE=Metrological Group BV
 
@@ -109238,6 +111422,9 @@ OUI:CC29F5*
 OUI:CC2A80*
  ID_OUI_FROM_DATABASE=Micro-Biz intelligence solutions Co.,Ltd
 
+OUI:CC2AAC*
+ ID_OUI_FROM_DATABASE=Yunjing lntelligent Technology(Dongguan).,Ltd
+
 OUI:CC2C83*
  ID_OUI_FROM_DATABASE=DarkMatter L.L.C
 
@@ -109319,6 +111506,9 @@ OUI:CC3C3F*
 OUI:CC3D82*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:CC3DD1*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:CC3E5F*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
@@ -109568,6 +111758,9 @@ OUI:CC75E2*
 OUI:CC7669*
  ID_OUI_FROM_DATABASE=SEETECH
 
+OUI:CC77C9*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:CC785F*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -109580,6 +111773,9 @@ OUI:CC794A*
 OUI:CC79CF*
  ID_OUI_FROM_DATABASE=SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
 
+OUI:CC79D7*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:CC7A30*
  ID_OUI_FROM_DATABASE=CMAX Wireless Co., Ltd.
 
@@ -109649,6 +111845,9 @@ OUI:CC8CDA*
 OUI:CC8CE3*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:CC8DB5*
+ ID_OUI_FROM_DATABASE=Shenzhen SuperElectron Technology Co.,Ltd.
+
 OUI:CC8E71*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -109721,6 +111920,9 @@ OUI:CCA0E5*
 OUI:CCA12B*
  ID_OUI_FROM_DATABASE=TCL King Electrical Appliances (Huizhou) Co., Ltd
 
+OUI:CCA174*
+ ID_OUI_FROM_DATABASE=Facebook Technologies, LLC
+
 OUI:CCA219*
  ID_OUI_FROM_DATABASE=SHENZHEN ALONG INVESTMENT CO.,LTD
 
@@ -109784,6 +111986,9 @@ OUI:CCB5D1*
 OUI:CCB691*
  ID_OUI_FROM_DATABASE=NECMagnusCommunications
 
+OUI:CCB7C4*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:CCB888*
  ID_OUI_FROM_DATABASE=AnB Securite s.a.
 
@@ -109895,6 +112100,9 @@ OUI:CCC95D*
 OUI:CCCC4E*
  ID_OUI_FROM_DATABASE=Sun Fountainhead USA. Corp
 
+OUI:CCCC77*
+ ID_OUI_FROM_DATABASE=Zaram Technology. Inc.
+
 OUI:CCCC81*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -110075,6 +112283,9 @@ OUI:CCE1D5*
 OUI:CCE236*
  ID_OUI_FROM_DATABASE=Hangzhou Yaguan Technology Co. LTD
 
+OUI:CCE686*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:CCE798*
  ID_OUI_FROM_DATABASE=My Social Stuff
 
@@ -110201,12 +112412,18 @@ OUI:D0052A*
 OUI:D005E4*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:D0066A*
+ ID_OUI_FROM_DATABASE=Cornelis Networks, Inc.
+
 OUI:D00790*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
 OUI:D007CA*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:D009C8*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:D00AAB*
  ID_OUI_FROM_DATABASE=Yokogawa Digital Computer Corporation
 
@@ -110423,6 +112640,9 @@ OUI:D03745*
 OUI:D03761*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:D03957*
+ ID_OUI_FROM_DATABASE=Liteon Technology Corporation
+
 OUI:D03972*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -110453,6 +112673,9 @@ OUI:D03F27*
 OUI:D03FAA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:D040BE*
+ ID_OUI_FROM_DATABASE=NPO RPS LLC
+
 OUI:D040EF*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
@@ -110489,6 +112712,9 @@ OUI:D04DC6*
 OUI:D04E50*
  ID_OUI_FROM_DATABASE=Mobiwire Mobiles (NingBo) Co., LTD
 
+OUI:D04E99*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:D04F7E*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -110771,6 +112997,9 @@ OUI:D07D33*
 OUI:D07DE5*
  ID_OUI_FROM_DATABASE=Forward Pay Systems, Inc.
 
+OUI:D07E01*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:D07E28*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
@@ -110840,6 +113069,51 @@ OUI:D09466*
 OUI:D095C7*
  ID_OUI_FROM_DATABASE=Pantech Co., Ltd.
 
+OUI:D096860*
+ ID_OUI_FROM_DATABASE=SERNET (SUZHOU) TECHNOLOGIES CORPORATION
+
+OUI:D096861*
+ ID_OUI_FROM_DATABASE=PROVCOM LTD
+
+OUI:D096862*
+ ID_OUI_FROM_DATABASE=TMLake Technology Ltd.,
+
+OUI:D096863*
+ ID_OUI_FROM_DATABASE=EPHI B.V.
+
+OUI:D096864*
+ ID_OUI_FROM_DATABASE=Houston Radar LLC
+
+OUI:D096865*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:D096866*
+ ID_OUI_FROM_DATABASE=Shenzhen Ntmer Technology Co., Ltd.
+
+OUI:D096867*
+ ID_OUI_FROM_DATABASE=Private
+
+OUI:D096868*
+ ID_OUI_FROM_DATABASE=Energiekonzepte Deutschland GmbH
+
+OUI:D096869*
+ ID_OUI_FROM_DATABASE=Camfil
+
+OUI:D09686A*
+ ID_OUI_FROM_DATABASE=Hero Health Inc.
+
+OUI:D09686B*
+ ID_OUI_FROM_DATABASE=Changsha keruijie lnformation Technology Co.,Ltd
+
+OUI:D09686C*
+ ID_OUI_FROM_DATABASE=ECS s.r.l.
+
+OUI:D09686D*
+ ID_OUI_FROM_DATABASE=CertusNet Information Technology Co.,LTD
+
+OUI:D09686E*
+ ID_OUI_FROM_DATABASE=withnetworks
+
 OUI:D096FB*
  ID_OUI_FROM_DATABASE=DASAN Network Solutions
 
@@ -111092,6 +113366,9 @@ OUI:D0C857E*
 OUI:D0CDE1*
  ID_OUI_FROM_DATABASE=Scientech Electronics
 
+OUI:D0CF0E*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:D0CF5E*
  ID_OUI_FROM_DATABASE=Energy Micro AS
 
@@ -111182,6 +113459,9 @@ OUI:D0D94FD*
 OUI:D0D94FE*
  ID_OUI_FROM_DATABASE=APPOTRONICS CO., LTD
 
+OUI:D0DAD7*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:D0DB32*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
@@ -111251,6 +113531,9 @@ OUI:D0F27F*
 OUI:D0F3F5*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:D0F4F7*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:D0F520*
  ID_OUI_FROM_DATABASE=KYOCERA Corporation
 
@@ -111377,6 +113660,45 @@ OUI:D41E35*
 OUI:D41F0C*
  ID_OUI_FROM_DATABASE=JAI Manufacturing
 
+OUI:D420000*
+ ID_OUI_FROM_DATABASE=Wattsense
+
+OUI:D420001*
+ ID_OUI_FROM_DATABASE=Zelus(HuangZhou) Technology Ltd.
+
+OUI:D420002*
+ ID_OUI_FROM_DATABASE=Shenzhen AI Develop & Manufacture Co.,LTD.
+
+OUI:D420003*
+ ID_OUI_FROM_DATABASE=Arbe Robotics Ltd.
+
+OUI:D420004*
+ ID_OUI_FROM_DATABASE=EVOC VIN Technology Co.,Ltd
+
+OUI:D420005*
+ ID_OUI_FROM_DATABASE=Monolith Electric?Changzhou?Co.,Ltd.
+
+OUI:D420006*
+ ID_OUI_FROM_DATABASE=HiAR Information Technology Co.,Ltd
+
+OUI:D420007*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:D420008*
+ ID_OUI_FROM_DATABASE=Dalian Baishengyuan Technology Co.,Ltd
+
+OUI:D42000B*
+ ID_OUI_FROM_DATABASE=Shenzhen Volt IoT technology co.,ltd.
+
+OUI:D42000C*
+ ID_OUI_FROM_DATABASE=Gentec Systems  Co.
+
+OUI:D42000D*
+ ID_OUI_FROM_DATABASE=ZUUM
+
+OUI:D42000E*
+ ID_OUI_FROM_DATABASE=RPUSI Communication Technology  Co.,Ltd.
+
 OUI:D4206D*
  ID_OUI_FROM_DATABASE=HTC Corporation
 
@@ -111509,6 +113831,9 @@ OUI:D4389C*
 OUI:D439B8*
  ID_OUI_FROM_DATABASE=Ciena Corporation
 
+OUI:D43A2C*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:D43A2E*
  ID_OUI_FROM_DATABASE=SHENZHEN MTC CO LTD
 
@@ -111671,6 +113996,48 @@ OUI:D4612E*
 OUI:D46132*
  ID_OUI_FROM_DATABASE=Pro Concept Manufacturer Co.,Ltd.
 
+OUI:D461370*
+ ID_OUI_FROM_DATABASE=Wistron Corporation
+
+OUI:D461371*
+ ID_OUI_FROM_DATABASE=Shenzhen smart-core technology co.,ltd.
+
+OUI:D461372*
+ ID_OUI_FROM_DATABASE=Robert Bosch Elektronikai Kft.
+
+OUI:D461373*
+ ID_OUI_FROM_DATABASE=APPOTRONICS CO., LTD
+
+OUI:D461374*
+ ID_OUI_FROM_DATABASE=Beijing TAIXINYUN Technology Co.,Ltd
+
+OUI:D461375*
+ ID_OUI_FROM_DATABASE=Estelle AB
+
+OUI:D461376*
+ ID_OUI_FROM_DATABASE=Securus CCTV India
+
+OUI:D461377*
+ ID_OUI_FROM_DATABASE=Beijing Shudun Information Technology Co., Ltd
+
+OUI:D461378*
+ ID_OUI_FROM_DATABASE=Beijing Digital China Yunke Technology Limited
+
+OUI:D461379*
+ ID_OUI_FROM_DATABASE=Private
+
+OUI:D46137A*
+ ID_OUI_FROM_DATABASE=Shenzhen Xunjie International Trade Co., LTD
+
+OUI:D46137C*
+ ID_OUI_FROM_DATABASE=MUSASHI ENGINEERING,INC.
+
+OUI:D46137D*
+ ID_OUI_FROM_DATABASE=IPTECHVIEW
+
+OUI:D46137E*
+ ID_OUI_FROM_DATABASE=UAB Brolis sensor technology
+
 OUI:D4619D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -111938,6 +114305,12 @@ OUI:D491AF*
 OUI:D49234*
  ID_OUI_FROM_DATABASE=NEC Corporation
 
+OUI:D4925E*
+ ID_OUI_FROM_DATABASE=Technicolor Delivery Technologies Belgium NV
+
+OUI:D492B9*
+ ID_OUI_FROM_DATABASE=ORION NOVA, S.L.
+
 OUI:D49390*
  ID_OUI_FROM_DATABASE=CLEVO CO.
 
@@ -112046,6 +114419,9 @@ OUI:D4ABCD*
 OUI:D4AC4E*
  ID_OUI_FROM_DATABASE=BODi rS, LLC
 
+OUI:D4AD20*
+ ID_OUI_FROM_DATABASE=Jinan USR IOT Technology Limited
+
 OUI:D4AD2D*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
@@ -112056,7 +114432,7 @@ OUI:D4ADBD*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
 OUI:D4ADFC*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Shenzhen Intellirocks Tech co.,ltd
 
 OUI:D4AE05*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@@ -112094,6 +114470,51 @@ OUI:D4B8FF*
 OUI:D4B92F*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
+OUI:D4BABA0*
+ ID_OUI_FROM_DATABASE=SHENZHEN ACTION TECHNOLOGIES CO., LTD.
+
+OUI:D4BABA1*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:D4BABA2*
+ ID_OUI_FROM_DATABASE=GuangZhou Ostec Electronic Technology Co.,Limited
+
+OUI:D4BABA3*
+ ID_OUI_FROM_DATABASE=Shenzhen Pu Ying Innovation Technology Corporation Limited
+
+OUI:D4BABA4*
+ ID_OUI_FROM_DATABASE=Beijing Yuanxin Junsheng Technology Co.,ltd
+
+OUI:D4BABA5*
+ ID_OUI_FROM_DATABASE=ReeR SpA
+
+OUI:D4BABA6*
+ ID_OUI_FROM_DATABASE=Shenzhen Yueer Innovation Technology Co., Ltd
+
+OUI:D4BABA7*
+ ID_OUI_FROM_DATABASE=Shenzhen Double Better Technology Co., Ltd
+
+OUI:D4BABA8*
+ ID_OUI_FROM_DATABASE=Chengdu Ba SAN SI YI Information Technology Co., LTD
+
+OUI:D4BABA9*
+ ID_OUI_FROM_DATABASE=Shenzhen Chuangyou Acoustic Technology Co., Ltd.
+
+OUI:D4BABAA*
+ ID_OUI_FROM_DATABASE=Actiontec Electronics Inc.
+
+OUI:D4BABAB*
+ ID_OUI_FROM_DATABASE=Qingdao Vzense Technology Co., Ltd.
+
+OUI:D4BABAC*
+ ID_OUI_FROM_DATABASE=Rusatom Automated Control Systems, Joint-Stock Company
+
+OUI:D4BABAD*
+ ID_OUI_FROM_DATABASE=AADONA Communication Pvt Ltd
+
+OUI:D4BABAE*
+ ID_OUI_FROM_DATABASE=Camozzi Automation SpA
+
 OUI:D4BBC8*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -112178,6 +114599,9 @@ OUI:D4D2D6*
 OUI:D4D2E5*
  ID_OUI_FROM_DATABASE=BKAV Corporation
 
+OUI:D4D4DA*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:D4D50D*
  ID_OUI_FROM_DATABASE=Southwest Microwave, Inc
 
@@ -112202,6 +114626,9 @@ OUI:D4D898*
 OUI:D4D919*
  ID_OUI_FROM_DATABASE=GoPro
 
+OUI:D4DA21*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
+
 OUI:D4DACD*
  ID_OUI_FROM_DATABASE=SKY UK LIMITED
 
@@ -112247,6 +114674,9 @@ OUI:D4E8B2*
 OUI:D4E90B*
  ID_OUI_FROM_DATABASE=CVT CO.,LTD
 
+OUI:D4E98A*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:D4EA0E*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
@@ -112277,6 +114707,9 @@ OUI:D4F057*
 OUI:D4F0B4*
  ID_OUI_FROM_DATABASE=Napco Security Technologies
 
+OUI:D4F0C9*
+ ID_OUI_FROM_DATABASE=KYOCERA Document Solutions Inc.
+
 OUI:D4F0EA*
  ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
 
@@ -112286,6 +114719,9 @@ OUI:D4F143*
 OUI:D4F207*
  ID_OUI_FROM_DATABASE=DIAODIAO(Beijing)Technology CO.,Ltd
 
+OUI:D4F242*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:D4F337*
  ID_OUI_FROM_DATABASE=Xunison Ltd.
 
@@ -112376,6 +114812,9 @@ OUI:D80D17*
 OUI:D80DE3*
  ID_OUI_FROM_DATABASE=FXI TECHNOLOGIES AS
 
+OUI:D80E29*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:D80F99*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -112499,6 +114938,9 @@ OUI:D82FE6*
 OUI:D83062*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:D8312C*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:D83134*
  ID_OUI_FROM_DATABASE=Roku, Inc
 
@@ -112520,6 +114962,9 @@ OUI:D8337F*
 OUI:D833B7*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:D834D1*
+ ID_OUI_FROM_DATABASE=Shenzhen Orange Digital Technology Co.,Ltd
+
 OUI:D834EE*
  ID_OUI_FROM_DATABASE=SHURE INCORPORATED
 
@@ -112682,6 +115127,9 @@ OUI:D86194*
 OUI:D862DB*
  ID_OUI_FROM_DATABASE=Eno Inc.
 
+OUI:D8630D*
+ ID_OUI_FROM_DATABASE=Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
+
 OUI:D86375*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -112790,6 +115238,9 @@ OUI:D880DC*
 OUI:D881CE*
  ID_OUI_FROM_DATABASE=AHN INC.
 
+OUI:D88332*
+ ID_OUI_FROM_DATABASE=TaiXin Semiconductor Co., Ltd
+
 OUI:D88466*
  ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
@@ -112952,6 +115403,9 @@ OUI:D8A011*
 OUI:D8A01D*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:D8A0E8*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:D8A105*
  ID_OUI_FROM_DATABASE=Syslane, Co., Ltd.
 
@@ -112988,6 +115442,9 @@ OUI:D8A98B*
 OUI:D8AA59*
  ID_OUI_FROM_DATABASE=Tonly Technology Co. Ltd
 
+OUI:D8AD49*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
 OUI:D8ADDD*
  ID_OUI_FROM_DATABASE=Sonavation, Inc.
 
@@ -113333,6 +115790,9 @@ OUI:DC0575*
 OUI:DC05ED*
  ID_OUI_FROM_DATABASE=Nabtesco  Corporation
 
+OUI:DC0682*
+ ID_OUI_FROM_DATABASE=Accessia Technology Ltd.
+
 OUI:DC07C1*
  ID_OUI_FROM_DATABASE=HangZhou QiYang Technology Co.,Ltd.
 
@@ -113792,6 +116252,9 @@ OUI:DC680C*
 OUI:DC68EB*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
+OUI:DC6AE7*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:DC6AEA*
  ID_OUI_FROM_DATABASE=Infinix mobility limited
 
@@ -114128,6 +116591,9 @@ OUI:DCD255*
 OUI:DCD2FC*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:DCD2FD*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:DCD321*
  ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
 
@@ -114170,6 +116636,9 @@ OUI:DCDB70*
 OUI:DCDC07*
  ID_OUI_FROM_DATABASE=TRP Systems BV
 
+OUI:DCDCC3*
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
+
 OUI:DCDCE2*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -114353,6 +116822,9 @@ OUI:DCFE23*
 OUI:E00084*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:E001A6*
+ ID_OUI_FROM_DATABASE=Edgecore Networks Corporation
+
 OUI:E002A5*
  ID_OUI_FROM_DATABASE=ABB Robotics
 
@@ -114572,6 +117044,30 @@ OUI:E03717*
 OUI:E037BF*
  ID_OUI_FROM_DATABASE=Wistron Neweb Corporation
 
+OUI:E0382D4*
+ ID_OUI_FROM_DATABASE=Qingdao Unovo Technologies Co., Ltd
+
+OUI:E0382D5*
+ ID_OUI_FROM_DATABASE=Weishi Intelligent Information Technology (Guangzhou) Co., LTD
+
+OUI:E0382D7*
+ ID_OUI_FROM_DATABASE=Famar Fueguina S.A.
+
+OUI:E0382D9*
+ ID_OUI_FROM_DATABASE=Velvac Incorporated
+
+OUI:E0382DA*
+ ID_OUI_FROM_DATABASE=4D Photonics GmbH
+
+OUI:E0382DB*
+ ID_OUI_FROM_DATABASE=SERCOMM PHILIPPINES INC
+
+OUI:E0382DC*
+ ID_OUI_FROM_DATABASE=SiLAND Chengdu Technology Co., Ltd
+
+OUI:E0382DD*
+ ID_OUI_FROM_DATABASE=KEPLER COMMUNICATIONS INC.
+
 OUI:E0383F*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -114632,6 +117128,9 @@ OUI:E048D8*
 OUI:E049ED*
  ID_OUI_FROM_DATABASE=Audeze LLC
 
+OUI:E04B41*
+ ID_OUI_FROM_DATABASE=Hangzhou Beilian Low Carbon Technology Co., Ltd.
+
 OUI:E04B45*
  ID_OUI_FROM_DATABASE=Hi-P Electronics Pte Ltd
 
@@ -114812,6 +117311,9 @@ OUI:E0735F*
 OUI:E0750A*
  ID_OUI_FROM_DATABASE=ALPSALPINE CO,.LTD
 
+OUI:E07526*
+ ID_OUI_FROM_DATABASE=China Dragon Technology Limited
+
 OUI:E0757D*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
@@ -114950,6 +117452,9 @@ OUI:E09F2A*
 OUI:E0A198*
  ID_OUI_FROM_DATABASE=NOJA Power Switchgear Pty Ltd
 
+OUI:E0A1CE*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:E0A1D7*
  ID_OUI_FROM_DATABASE=SFR
 
@@ -115028,6 +117533,9 @@ OUI:E0B55F*
 OUI:E0B655*
  ID_OUI_FROM_DATABASE=Beijing Xiaomi Electronics Co., Ltd.
 
+OUI:E0B668*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:E0B6F50*
  ID_OUI_FROM_DATABASE=BeSTAR Corporation
 
@@ -115085,6 +117593,9 @@ OUI:E0B7B1*
 OUI:E0B94D*
  ID_OUI_FROM_DATABASE=SHENZHEN BILIAN ELECTRONIC CO.，LTD
 
+OUI:E0B98A*
+ ID_OUI_FROM_DATABASE=Shenzhen Taike industrial automation company,Ltd
+
 OUI:E0B9A5*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
@@ -115115,6 +117626,9 @@ OUI:E0BE03*
 OUI:E0C0D1*
  ID_OUI_FROM_DATABASE=CK Telecom (Shenzhen) Limited
 
+OUI:E0C264*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:E0C286*
  ID_OUI_FROM_DATABASE=Aisai Communication Technology Co., Ltd.
 
@@ -115151,6 +117665,9 @@ OUI:E0C922*
 OUI:E0C97A*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:E0CA3C*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:E0CA4D*
  ID_OUI_FROM_DATABASE=Shenzhen Unistar Communication Co.,LTD
 
@@ -115158,7 +117675,7 @@ OUI:E0CA94*
  ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
 
 OUI:E0CB1D*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
 OUI:E0CB4E*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
@@ -115385,6 +117902,9 @@ OUI:E408E7*
 OUI:E40CFD*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
+OUI:E40D36*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:E40EEE*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -115565,6 +118085,9 @@ OUI:E435FB*
 OUI:E437D7*
  ID_OUI_FROM_DATABASE=HENRI DEPAEPE S.A.S.
 
+OUI:E4387E*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:E43883*
  ID_OUI_FROM_DATABASE=Ubiquiti Networks Inc.
 
@@ -115709,6 +118232,9 @@ OUI:E4509A*
 OUI:E450EB*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:E4521E*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:E454E8*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -115760,6 +118286,9 @@ OUI:E45E37*
 OUI:E45F01*
  ID_OUI_FROM_DATABASE=Raspberry Pi Trading Ltd
 
+OUI:E46017*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:E46059*
  ID_OUI_FROM_DATABASE=Pingtek Co., Ltd.
 
@@ -115772,6 +118301,9 @@ OUI:E46449*
 OUI:E46564*
  ID_OUI_FROM_DATABASE=SHENZHEN KTC TECHNOLOGY CO.,LTD
 
+OUI:E466AB*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:E4671E*
  ID_OUI_FROM_DATABASE=SHEN ZHEN NUO XIN CHENG TECHNOLOGY co., Ltd.
 
@@ -115790,6 +118322,9 @@ OUI:E46A35*
 OUI:E46C21*
  ID_OUI_FROM_DATABASE=messMa GmbH
 
+OUI:E46D7F*
+ ID_OUI_FROM_DATABASE=Ciena Corporation
+
 OUI:E46F13*
  ID_OUI_FROM_DATABASE=D-Link International
 
@@ -115889,9 +118424,15 @@ OUI:E48B7F*
 OUI:E48C0F*
  ID_OUI_FROM_DATABASE=Discovery Insure
 
+OUI:E48C73*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:E48D8C*
  ID_OUI_FROM_DATABASE=Routerboard.com
 
+OUI:E48E10*
+ ID_OUI_FROM_DATABASE=CIG SHANGHAI CO LTD
+
 OUI:E48F1D*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -115994,6 +118535,9 @@ OUI:E49A79*
 OUI:E49ADC*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:E49C67*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:E49E12*
  ID_OUI_FROM_DATABASE=FREEBOX SAS
 
@@ -116163,7 +118707,7 @@ OUI:E4D373*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
 OUI:E4D3AA*
- ID_OUI_FROM_DATABASE=FUJITSU CONNECTED TECHNOLOGIES LIMITED
+ ID_OUI_FROM_DATABASE=FCNT LMITED
 
 OUI:E4D3F1*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@@ -116219,6 +118763,9 @@ OUI:E4EA83*
 OUI:E4EC10*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
+OUI:E4ECE8*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:E4EEFD*
  ID_OUI_FROM_DATABASE=MR&D Manufacturing
 
@@ -116471,8 +119018,11 @@ OUI:E820E2*
 OUI:E82689*
  ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
 
+OUI:E8268D*
+ ID_OUI_FROM_DATABASE=Shenzhen SuperElectron Technology Co.,Ltd.
+
 OUI:E826B6*
- ID_OUI_FROM_DATABASE=Inside Biometrics International Limited
+ ID_OUI_FROM_DATABASE=Companies House to GlucoRx Technologies Ltd.
 
 OUI:E82877*
  ID_OUI_FROM_DATABASE=TMY Co., Ltd.
@@ -116555,6 +119105,9 @@ OUI:E84040*
 OUI:E840F2*
  ID_OUI_FROM_DATABASE=PEGATRON CORPORATION
 
+OUI:E84368*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:E843B6*
  ID_OUI_FROM_DATABASE=QNAP Systems, Inc.
 
@@ -116564,6 +119117,9 @@ OUI:E8447E*
 OUI:E84727*
  ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co.,Ltd.
 
+OUI:E8473A*
+ ID_OUI_FROM_DATABASE=Hon Hai Precision Industry Co.,LTD
+
 OUI:E8481F*
  ID_OUI_FROM_DATABASE=Advanced Automotive Antennas
 
@@ -116675,6 +119231,9 @@ OUI:E861BE*
 OUI:E86549*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:E8655F*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:E865D4*
  ID_OUI_FROM_DATABASE=Tenda Technology Co.,Ltd.Dongguan branch
 
@@ -116712,7 +119271,7 @@ OUI:E86CC76*
  ID_OUI_FROM_DATABASE=KLAB
 
 OUI:E86CC77*
- ID_OUI_FROM_DATABASE=Huaqin Technology Co.,Ltd
+ ID_OUI_FROM_DATABASE=Huaqin Technology Co.,Ltd.
 
 OUI:E86CC78*
  ID_OUI_FROM_DATABASE=Lighthouse EIP
@@ -116811,7 +119370,7 @@ OUI:E87829A*
  ID_OUI_FROM_DATABASE=METZ CONNECT GmbH
 
 OUI:E87829B*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Ampner Ltd
 
 OUI:E87829C*
  ID_OUI_FROM_DATABASE=FairPhone B.V.
@@ -116885,6 +119444,9 @@ OUI:E88DF5*
 OUI:E88E60*
  ID_OUI_FROM_DATABASE=NSD Corporation
 
+OUI:E88F6F*
+ ID_OUI_FROM_DATABASE=TCT mobile ltd
+
 OUI:E8910F*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
@@ -116963,6 +119525,9 @@ OUI:E89FEC*
 OUI:E8A0CD*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
+OUI:E8A0ED*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:E8A1F8*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -116996,6 +119561,9 @@ OUI:E8A788*
 OUI:E8A7F2*
  ID_OUI_FROM_DATABASE=sTraffic
 
+OUI:E8AACB*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:E8ABF3*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -117092,6 +119660,9 @@ OUI:E8B748*
 OUI:E8BA70*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:E8BAE2*
+ ID_OUI_FROM_DATABASE=Xplora Technologies AS
+
 OUI:E8BB3D*
  ID_OUI_FROM_DATABASE=Sino Prime-Tech Limited
 
@@ -117104,6 +119675,9 @@ OUI:E8BDD1*
 OUI:E8BE81*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:E8BFDB*
+ ID_OUI_FROM_DATABASE=Inodesign Group
+
 OUI:E8C1B8*
  ID_OUI_FROM_DATABASE=Nanjing Bangzhong Electronic Commerce Limited
 
@@ -117311,6 +119885,9 @@ OUI:E8EECC*
 OUI:E8EF05*
  ID_OUI_FROM_DATABASE=MIND TECH INTERNATIONAL LIMITED
 
+OUI:E8EF22*
+ ID_OUI_FROM_DATABASE=Siemens Numerical Control Ltd., Nanjing
+
 OUI:E8EF89*
  ID_OUI_FROM_DATABASE=OPMEX Tech.
 
@@ -117380,6 +119957,9 @@ OUI:E8FDE8*
 OUI:E8FDF8*
  ID_OUI_FROM_DATABASE=Shanghai High-Flying Electronics  Technology Co., Ltd
 
+OUI:E8FF98*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:EC0133*
  ID_OUI_FROM_DATABASE=TRINUS SYSTEMS INC.
 
@@ -117446,6 +120026,9 @@ OUI:EC172F*
 OUI:EC1766*
  ID_OUI_FROM_DATABASE=Research Centre Module
 
+OUI:EC1A02*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:EC1A59*
  ID_OUI_FROM_DATABASE=Belkin International Inc.
 
@@ -117503,6 +120086,9 @@ OUI:EC26CA*
 OUI:EC26FB*
  ID_OUI_FROM_DATABASE=TECC CO.,LTD.
 
+OUI:EC28D3*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:EC2A72*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -117737,6 +120323,9 @@ OUI:EC7097*
 OUI:EC71DB*
  ID_OUI_FROM_DATABASE=Reolink Innovation Limited
 
+OUI:EC7427*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:EC74BA*
  ID_OUI_FROM_DATABASE=Hirschmann Automation and Control GmbH
 
@@ -117797,6 +120386,9 @@ OUI:EC8350*
 OUI:EC836C*
  ID_OUI_FROM_DATABASE=RM Tech Co., Ltd.
 
+OUI:EC83B7*
+ ID_OUI_FROM_DATABASE=PUWELL CLOUD TECH LIMITED
+
 OUI:EC83D5*
  ID_OUI_FROM_DATABASE=GIRD Systems Inc
 
@@ -117869,6 +120461,9 @@ OUI:EC94D5*
 OUI:EC9681*
  ID_OUI_FROM_DATABASE=2276427 Ontario Inc
 
+OUI:EC96BF*
+ ID_OUI_FROM_DATABASE=eSystems MTG GmbH
+
 OUI:EC97B2*
  ID_OUI_FROM_DATABASE=SUMEC Machinery & Electric Co.,Ltd.
 
@@ -118109,6 +120704,9 @@ OUI:ECD950*
 OUI:ECD9D1*
  ID_OUI_FROM_DATABASE=Shenzhen TG-NET Botone Technology Co.,Ltd.
 
+OUI:ECDA3B*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:ECDA59*
  ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
 
@@ -118121,6 +120719,9 @@ OUI:ECDE3D*
 OUI:ECDF3A*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:ECDFC9*
+ ID_OUI_FROM_DATABASE=Hangzhou Microimage Software Co., Ltd
+
 OUI:ECE09B*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -118292,6 +120893,9 @@ OUI:F0182B*
 OUI:F01898*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:F01AA0*
+ ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
+
 OUI:F01B6C*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -118322,6 +120926,51 @@ OUI:F0219D*
 OUI:F021E0*
  ID_OUI_FROM_DATABASE=eero inc.
 
+OUI:F0221D0*
+ ID_OUI_FROM_DATABASE=THANHBINH COMPANY - E111 FACTORY
+
+OUI:F0221D1*
+ ID_OUI_FROM_DATABASE=Dr. Eberl MBE Komponenten GmbH
+
+OUI:F0221D2*
+ ID_OUI_FROM_DATABASE=Chonel Industry?shanghai?Co., Ltd.
+
+OUI:F0221D3*
+ ID_OUI_FROM_DATABASE=ShenZhen Shizao Electronic Technology
+
+OUI:F0221D4*
+ ID_OUI_FROM_DATABASE=Synergies Intelligent Systems Inc.
+
+OUI:F0221D5*
+ ID_OUI_FROM_DATABASE=Shenzhen SuyuVisonTechnology Co.,Ltd
+
+OUI:F0221D6*
+ ID_OUI_FROM_DATABASE=Vcognition Technologies Inc.
+
+OUI:F0221D7*
+ ID_OUI_FROM_DATABASE=Bulat Co., Limited
+
+OUI:F0221D8*
+ ID_OUI_FROM_DATABASE=Shenzhen Glazero Technology Co., Ltd.
+
+OUI:F0221D9*
+ ID_OUI_FROM_DATABASE=Shanghai Gfanxvision Intelligent Technology Co.Ltd
+
+OUI:F0221DA*
+ ID_OUI_FROM_DATABASE=Hangzhou Gold Electronic Equipment Co., Ltd
+
+OUI:F0221DB*
+ ID_OUI_FROM_DATABASE=LK Systems AB
+
+OUI:F0221DC*
+ ID_OUI_FROM_DATABASE=Estone Technology LTD
+
+OUI:F0221DD*
+ ID_OUI_FROM_DATABASE=Schleissheimer Soft- und Hardwareentwicklung GmbH
+
+OUI:F0221DE*
+ ID_OUI_FROM_DATABASE=oToBrite Electronics, Inc.
+
 OUI:F0224E*
  ID_OUI_FROM_DATABASE=Esan electronic co.
 
@@ -118400,6 +121049,9 @@ OUI:F02624*
 OUI:F0264C*
  ID_OUI_FROM_DATABASE=Sigrist-Photometer AG
 
+OUI:F026F8*
+ ID_OUI_FROM_DATABASE=Worldcns Co.,Ltd.
+
 OUI:F0272D*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -118595,6 +121247,9 @@ OUI:F04A02*
 OUI:F04A2B*
  ID_OUI_FROM_DATABASE=PYRAMID Computer GmbH
 
+OUI:F04A3D*
+ ID_OUI_FROM_DATABASE=Bosch Thermotechnik GmbH
+
 OUI:F04B3A*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -118796,6 +121451,9 @@ OUI:F081AF*
 OUI:F08261*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:F082C0*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:F0842F*
  ID_OUI_FROM_DATABASE=ADB Broadband Italia
 
@@ -119084,6 +121742,12 @@ OUI:F0C42F*
 OUI:F0C478*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:F0C725*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
+OUI:F0C745*
+ ID_OUI_FROM_DATABASE=TECNO MOBILE LIMITED
+
 OUI:F0C77F*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -119105,6 +121769,9 @@ OUI:F0C9D1*
 OUI:F0CBA1*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:F0CCE0*
+ ID_OUI_FROM_DATABASE=Shenzhen All-Smartlink Technology Co.,Ltd.
+
 OUI:F0CD31*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -119252,6 +121919,9 @@ OUI:F0EC39*
 OUI:F0ED1E*
  ID_OUI_FROM_DATABASE=Bilkon Bilgisayar Kontrollu Cih. Im.Ltd.
 
+OUI:F0EDB8*
+ ID_OUI_FROM_DATABASE=SERVERCOM (INDIA) PRIVATE LIMITED
+
 OUI:F0EE10*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -119300,6 +121970,9 @@ OUI:F0F644*
 OUI:F0F669*
  ID_OUI_FROM_DATABASE=Motion Analysis Corporation
 
+OUI:F0F69C*
+ ID_OUI_FROM_DATABASE=NIO Co., Ltd.
+
 OUI:F0F6C1*
  ID_OUI_FROM_DATABASE=Sonos, Inc.
 
@@ -119363,6 +122036,9 @@ OUI:F40343*
 OUI:F4044C*
  ID_OUI_FROM_DATABASE=ValenceTech Limited
 
+OUI:F40595*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:F40616*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -119474,6 +122150,9 @@ OUI:F417B8*
 OUI:F419E2*
  ID_OUI_FROM_DATABASE=Volterra
 
+OUI:F41A9C*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:F41AB0*
  ID_OUI_FROM_DATABASE=Shenzhen Xingguodu Technology Co., Ltd.
 
@@ -119510,6 +122189,9 @@ OUI:F42012*
 OUI:F421AE*
  ID_OUI_FROM_DATABASE=Shanghai Xiaodu Technology Limited
 
+OUI:F421CA*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:F4227A*
  ID_OUI_FROM_DATABASE=Guangdong Seneasy Intelligent Technology Co., Ltd.
 
@@ -119651,6 +122333,9 @@ OUI:F44D17*
 OUI:F44D30*
  ID_OUI_FROM_DATABASE=Elitegroup Computer Systems Co.,Ltd.
 
+OUI:F44DAD*
+ ID_OUI_FROM_DATABASE=Cable Matters Inc.
+
 OUI:F44E05*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -119732,6 +122417,9 @@ OUI:F46349*
 OUI:F463E7*
  ID_OUI_FROM_DATABASE=Nanjing Maxon O.E. Tech. Co., LTD
 
+OUI:F463FC*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:F4645D*
  ID_OUI_FROM_DATABASE=Toshiba
 
@@ -119994,7 +122682,7 @@ OUI:F490CB9*
  ID_OUI_FROM_DATABASE=Fractyl Labs
 
 OUI:F490CBA*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Fend Incorporated
 
 OUI:F490CBB*
  ID_OUI_FROM_DATABASE=A-dec Inc.
@@ -120374,6 +123062,9 @@ OUI:F4E6D7*
 OUI:F4E926*
  ID_OUI_FROM_DATABASE=Tianjin Zanpu Technology Inc.
 
+OUI:F4E975*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:F4E9D4*
  ID_OUI_FROM_DATABASE=QLogic Corporation
 
@@ -120410,6 +123101,9 @@ OUI:F4F15A*
 OUI:F4F197*
  ID_OUI_FROM_DATABASE=EMTAKE Inc
 
+OUI:F4F19E*
+ ID_OUI_FROM_DATABASE=Wistron InforComm (Zhongshan) Corporation
+
 OUI:F4F1E1*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
@@ -120464,6 +123158,9 @@ OUI:F4FD2B*
 OUI:F4FEFB*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:F8009D*
+ ID_OUI_FROM_DATABASE=INTRACOM DEFENSE S.A.
+
 OUI:F800A1*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -120530,6 +123227,9 @@ OUI:F8042E*
 OUI:F8051C*
  ID_OUI_FROM_DATABASE=DRS Imaging and Targeting Solutions
 
+OUI:F8075D*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:F8084F*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -120692,6 +123392,9 @@ OUI:F823B2*
 OUI:F82441*
  ID_OUI_FROM_DATABASE=Yeelink
 
+OUI:F824E4*
+ ID_OUI_FROM_DATABASE=Beyonics Technology Electronic (Changshu) Co., Ltd
+
 OUI:F82551*
  ID_OUI_FROM_DATABASE=Seiko Epson Corporation
 
@@ -120770,6 +123473,9 @@ OUI:F83376*
 OUI:F83441*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:F8345A*
+ ID_OUI_FROM_DATABASE=Hitron Technologies. Inc
+
 OUI:F83553*
  ID_OUI_FROM_DATABASE=Magenta Research Ltd.
 
@@ -120914,6 +123620,9 @@ OUI:F85A00*
 OUI:F85B3B*
  ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
 
+OUI:F85B6E*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:F85B9C*
  ID_OUI_FROM_DATABASE=SB SYSTEMS Co.,Ltd
 
@@ -120929,6 +123638,9 @@ OUI:F85C4D*
 OUI:F85C7D*
  ID_OUI_FROM_DATABASE=Shenzhen Honesty Electronics Co.,Ltd.
 
+OUI:F85C7E*
+ ID_OUI_FROM_DATABASE=Shenzhen Honesty Electronics Co.,Ltd.
+
 OUI:F85E0B*
  ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
 
@@ -121004,6 +123716,9 @@ OUI:F86FC1*
 OUI:F86FDE*
  ID_OUI_FROM_DATABASE=Shenzhen Goodix Technology Co.,Ltd.
 
+OUI:F8710C*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:F871FE*
  ID_OUI_FROM_DATABASE=The Goldman Sachs Group, Inc.
 
@@ -121028,9 +123743,15 @@ OUI:F8769B*
 OUI:F877B8*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:F87907*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:F8790A*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:F87999*
+ ID_OUI_FROM_DATABASE=Guangdong Jiuzhi Technology Co.,Ltd
+
 OUI:F87A41*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -121049,6 +123770,9 @@ OUI:F87B7A*
 OUI:F87B8C*
  ID_OUI_FROM_DATABASE=Amped Wireless
 
+OUI:F87D76*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:F87FA5*
  ID_OUI_FROM_DATABASE=GREATEK
 
@@ -121202,9 +123926,15 @@ OUI:F89910*
 OUI:F89955*
  ID_OUI_FROM_DATABASE=Fortress Technology Inc
 
+OUI:F89A25*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:F89A78*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:F89B6E*
+ ID_OUI_FROM_DATABASE=Nokia Solutions and Networks GmbH & Co. KG
+
 OUI:F89D0D*
  ID_OUI_FROM_DATABASE=Control Technology Inc.
 
@@ -121244,6 +123974,12 @@ OUI:F8A34F*
 OUI:F8A45F*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:F8A475*
+ ID_OUI_FROM_DATABASE=PT Indoreka Jaya Wutama
+
+OUI:F8A4FB*
+ ID_OUI_FROM_DATABASE=Nanjing Decowell Automation Co.,LTD
+
 OUI:F8A5C5*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -121271,6 +124007,9 @@ OUI:F8AA3F*
 OUI:F8AA8A*
  ID_OUI_FROM_DATABASE=Axview Technology (Shenzhen) Co.,Ltd
 
+OUI:F8AAB3*
+ ID_OUI_FROM_DATABASE=DESSMANN (China) Machinery & Electronic  Co., Ltd
+
 OUI:F8AB05*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -121413,7 +124152,7 @@ OUI:F8C120*
  ID_OUI_FROM_DATABASE=Xi'an Link-Science Technology Co.,Ltd
 
 OUI:F8C249*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=AMPERE COMPUTING LLC
 
 OUI:F8C288*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@@ -121472,6 +124211,9 @@ OUI:F8D0BD*
 OUI:F8D111*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
+OUI:F8D2AC*
+ ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
+
 OUI:F8D3A9*
  ID_OUI_FROM_DATABASE=AXAN Networks
 
@@ -121514,6 +124256,9 @@ OUI:F8DB88*
 OUI:F8DC7A*
  ID_OUI_FROM_DATABASE=Variscite LTD
 
+OUI:F8DE73*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:F8DF15*
  ID_OUI_FROM_DATABASE=Sunitec Enterprise Co.,Ltd
 
@@ -121592,6 +124337,9 @@ OUI:F8F014*
 OUI:F8F082*
  ID_OUI_FROM_DATABASE=NAGTECH LLC
 
+OUI:F8F0C5*
+ ID_OUI_FROM_DATABASE=Suzhou Kuhan Information Technologies Co.,Ltd.
+
 OUI:F8F1B6*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
@@ -121709,6 +124457,9 @@ OUI:FC10BD*
 OUI:FC10C6*
  ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 
+OUI:FC1165*
+ ID_OUI_FROM_DATABASE=Cambium Networks Limited
+
 OUI:FC1186*
  ID_OUI_FROM_DATABASE=Logic3 plc
 
@@ -121739,6 +124490,9 @@ OUI:FC1607*
 OUI:FC1794*
  ID_OUI_FROM_DATABASE=InterCreative Co., Ltd
 
+OUI:FC1803*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:FC183C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -121790,6 +124544,12 @@ OUI:FC1FC0*
 OUI:FC229C*
  ID_OUI_FROM_DATABASE=Han Kyung I Net Co.,Ltd.
 
+OUI:FC22D3*
+ ID_OUI_FROM_DATABASE=FDSYS
+
+OUI:FC22F4*
+ ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
+
 OUI:FC2325*
  ID_OUI_FROM_DATABASE=EosTek (Shenzhen) Co., Ltd.
 
@@ -121841,6 +124601,9 @@ OUI:FC3288*
 OUI:FC3342*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:FC3357*
+ ID_OUI_FROM_DATABASE=KAGA FEI Co., Ltd.
+
 OUI:FC335F*
  ID_OUI_FROM_DATABASE=Polyera
 
@@ -121874,6 +124637,9 @@ OUI:FC3DA5*
 OUI:FC3F7C*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:FC3FA6*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:FC3FAB*
  ID_OUI_FROM_DATABASE=Henan Lanxin Technology Co., Ltd
 
@@ -122066,6 +124832,9 @@ OUI:FC65DE*
 OUI:FC66CF*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:FC671F*
+ ID_OUI_FROM_DATABASE=Tuya Smart Inc.
+
 OUI:FC683E*
  ID_OUI_FROM_DATABASE=Directed Perception, Inc
 
@@ -122183,6 +124952,9 @@ OUI:FC90FA*
 OUI:FC9114*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
+OUI:FC9189*
+ ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
+
 OUI:FC923B*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
@@ -122231,6 +125003,9 @@ OUI:FC9FAE*
 OUI:FC9FE1*
  ID_OUI_FROM_DATABASE=CONWIN.Tech. Ltd
 
+OUI:FC9FFD*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:FCA05A*
  ID_OUI_FROM_DATABASE=Oray.com co., LTD.
 
@@ -122532,7 +125307,7 @@ OUI:FCD4F6*
  ID_OUI_FROM_DATABASE=Messana Air.Ray Conditioning s.r.l.
 
 OUI:FCD5D9*
- ID_OUI_FROM_DATABASE=Shenzhen SDMC Technology Co., Ltd.
+ ID_OUI_FROM_DATABASE=Shenzhen SDMC Technology CO.,Ltd.
 
 OUI:FCD6BD*
  ID_OUI_FROM_DATABASE=Robert Bosch GmbH
@@ -122567,6 +125342,9 @@ OUI:FCDD55*
 OUI:FCDE90*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:FCDF00*
+ ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
+
 OUI:FCE14F*
  ID_OUI_FROM_DATABASE=BRK Brands, Inc.
 
@@ -122606,6 +125384,9 @@ OUI:FCE892*
 OUI:FCE998*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:FCE9D8*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:FCEA50*
  ID_OUI_FROM_DATABASE=Integrated Device Technology (Malaysia) Sdn. Bhd.
 

diff --git a/hwdb.d/20-acpi-vendor.hwdb b/hwdb.d/20-acpi-vendor.hwdb
index e23dbbbc959238764ad7f3ad498e110c10f26ccf..36572d0cbc7bc7bf76918c94afb3d2116649a0be 100644 (file)
--- a/hwdb.d/20-acpi-vendor.hwdb
+++ b/hwdb.d/20-acpi-vendor.hwdb
@@ -123,6 +123,9 @@ acpi:GHSW*:
 acpi:GOOG*:
  ID_VENDOR_FROM_DATABASE=Google, Inc.
 
+acpi:GOUP*:
+ ID_VENDOR_FROM_DATABASE=GoUp Co.,Ltd
+
 acpi:GTCH*:
  ID_VENDOR_FROM_DATABASE=G2touch Co., LTD
 
@@ -2523,6 +2526,9 @@ acpi:ETC*:
 acpi:ETD*:
  ID_VENDOR_FROM_DATABASE=ELAN MICROELECTRONICS CORPORATION
 
+acpi:ETG*:
+ ID_VENDOR_FROM_DATABASE=Eizo Technologies GmbH
+
 acpi:ETH*:
  ID_VENDOR_FROM_DATABASE=Etherboot Project
 
@@ -3018,6 +3024,9 @@ acpi:GTT*:
 acpi:GUD*:
  ID_VENDOR_FROM_DATABASE=Guntermann & Drunck GmbH
 
+acpi:GUP*:
+ ID_VENDOR_FROM_DATABASE=GoUp Co.,Ltd
+
 acpi:GUZ*:
  ID_VENDOR_FROM_DATABASE=Guzik Technical Enterprises
 
@@ -3027,6 +3036,9 @@ acpi:GVC*:
 acpi:GVL*:
  ID_VENDOR_FROM_DATABASE=Global Village Communication
 
+acpi:GVS*:
+ ID_VENDOR_FROM_DATABASE=G.VISION
+
 acpi:GWI*:
  ID_VENDOR_FROM_DATABASE=GW Instruments
 
@@ -3036,6 +3048,9 @@ acpi:GWK*:
 acpi:GWY*:
  ID_VENDOR_FROM_DATABASE=Gateway 2000
 
+acpi:GXL*:
+ ID_VENDOR_FROM_DATABASE=Galaxy Microsystems Ltd.
+
 acpi:GZE*:
  ID_VENDOR_FROM_DATABASE=GUNZE Limited
 
@@ -3498,6 +3513,9 @@ acpi:IMP*:
 acpi:IMT*:
  ID_VENDOR_FROM_DATABASE=Inmax Technology Corporation
 
+acpi:IMX*:
+ ID_VENDOR_FROM_DATABASE=arpara Technology Co., Ltd.
+
 acpi:IMS*:
  ID_VENDOR_FROM_DATABASE=Integrated Micro Solution Inc.
 
@@ -4647,6 +4665,9 @@ acpi:MRC*:
 acpi:MRD*:
  ID_VENDOR_FROM_DATABASE=MicroDisplay Corporation
 
+acpi:MRG*:
+ ID_VENDOR_FROM_DATABASE=Nreal
+
 acpi:MRK*:
  ID_VENDOR_FROM_DATABASE=Maruko & Company Ltd
 
@@ -5079,6 +5100,9 @@ acpi:NVL*:
 acpi:NVO*:
  ID_VENDOR_FROM_DATABASE=Netvio Ltd.
 
+acpi:NVR*:
+ ID_VENDOR_FROM_DATABASE=NOLO CO., LTD.
+
 acpi:NVT*:
  ID_VENDOR_FROM_DATABASE=Navatek Engineering Corporation
 
@@ -5286,6 +5310,9 @@ acpi:OYO*:
 acpi:OZC*:
  ID_VENDOR_FROM_DATABASE=OZ Corporation
 
+acpi:OZD*:
+ ID_VENDOR_FROM_DATABASE=OZO Co.Ltd
+
 acpi:OZO*:
  ID_VENDOR_FROM_DATABASE=Tribe Computer Works Inc
 
@@ -5805,6 +5832,9 @@ acpi:RCO*:
 acpi:RDI*:
  ID_VENDOR_FROM_DATABASE=Rainbow Displays, Inc.
 
+acpi:RDL*:
+ ID_VENDOR_FROM_DATABASE=Riedel Communications Canada Inc.
+
 acpi:RDM*:
  ID_VENDOR_FROM_DATABASE=Tremon Enterprises Company Ltd
 
@@ -7482,6 +7512,9 @@ acpi:VMW*:
 acpi:VNC*:
  ID_VENDOR_FROM_DATABASE=Vinca Corporation
 
+acpi:VNX*:
+ ID_VENDOR_FROM_DATABASE=Venetex Corporation
+
 acpi:VOB*:
  ID_VENDOR_FROM_DATABASE=MaxData Computer AG
 

diff --git a/hwdb.d/20-acpi-vendor.hwdb.patch b/hwdb.d/20-acpi-vendor.hwdb.patch
index f884cd8240c233e817febe86e5d1626d19ae0d79..677b64748c0316b5f2cfa6d643e1d199c8595199 100644 (file)
--- a/hwdb.d/20-acpi-vendor.hwdb.patch
+++ b/hwdb.d/20-acpi-vendor.hwdb.patch
@@ -1,5 +1,5 @@
---- 20-acpi-vendor.hwdb.base   2022-05-21 12:43:45.053612968 +0100
-+++ 20-acpi-vendor.hwdb        2022-05-21 12:43:45.057613062 +0100
+--- 20-acpi-vendor.hwdb.base   2022-09-19 12:01:58.910566591 +0200
++++ 20-acpi-vendor.hwdb        2022-09-19 12:01:58.929573275 +0200
 @@ -3,6 +3,8 @@
  # Data imported from:
  #     https://uefi.org/uefi-pnp-export
@@ -19,7 +19,7 @@
  acpi:AMDI*:
   ID_VENDOR_FROM_DATABASE=AMD
  
-@@ -334,6 +333,9 @@
+@@ -337,6 +336,9 @@
  acpi:AAA*:
   ID_VENDOR_FROM_DATABASE=Avolites Ltd
  
@@ -29,7 +29,7 @@
  acpi:AAE*:
   ID_VENDOR_FROM_DATABASE=Anatek Electronics Inc.
  
-@@ -361,6 +363,9 @@
+@@ -364,6 +366,9 @@
  acpi:ABO*:
   ID_VENDOR_FROM_DATABASE=D-Link Systems Inc
  
@@ -39,7 +39,7 @@
  acpi:ABS*:
   ID_VENDOR_FROM_DATABASE=Abaco Systems, Inc.
  
-@@ -406,7 +411,7 @@
+@@ -409,7 +414,7 @@
  acpi:ACO*:
   ID_VENDOR_FROM_DATABASE=Allion Computer Inc.
  
@@ -48,7 +48,7 @@
   ID_VENDOR_FROM_DATABASE=Aspen Tech Inc
  
  acpi:ACR*:
-@@ -682,6 +687,9 @@
+@@ -685,6 +690,9 @@
  acpi:AMT*:
   ID_VENDOR_FROM_DATABASE=AMT International Industry
  
@@ -58,7 +58,7 @@
  acpi:AMX*:
   ID_VENDOR_FROM_DATABASE=AMX LLC
  
-@@ -730,6 +738,9 @@
+@@ -733,6 +741,9 @@
  acpi:AOA*:
   ID_VENDOR_FROM_DATABASE=AOpen Inc.
  
@@ -68,7 +68,7 @@
  acpi:AOE*:
   ID_VENDOR_FROM_DATABASE=Advanced Optics Electronics, Inc.
  
-@@ -739,6 +750,9 @@
+@@ -742,6 +753,9 @@
  acpi:AOT*:
   ID_VENDOR_FROM_DATABASE=Alcatel
  
@@ -78,7 +78,7 @@
  acpi:APC*:
   ID_VENDOR_FROM_DATABASE=American Power Conversion
  
-@@ -917,7 +931,7 @@
+@@ -920,7 +934,7 @@
   ID_VENDOR_FROM_DATABASE=ALPS ALPINE CO., LTD.
  
  acpi:AUO*:
@@ -87,7 +87,7 @@
  
  acpi:AUR*:
   ID_VENDOR_FROM_DATABASE=Aureal Semiconductor
-@@ -997,6 +1011,9 @@
+@@ -1000,6 +1014,9 @@
  acpi:AXE*:
   ID_VENDOR_FROM_DATABASE=Axell Corporation
  
@@ -97,7 +97,7 @@
  acpi:AXI*:
   ID_VENDOR_FROM_DATABASE=American Magnetics
  
-@@ -1147,6 +1164,9 @@
+@@ -1150,6 +1167,9 @@
  acpi:BML*:
   ID_VENDOR_FROM_DATABASE=BIOMED Lab
  
@@ -107,7 +107,7 @@
  acpi:BMS*:
   ID_VENDOR_FROM_DATABASE=BIOMEDISYS
  
-@@ -1159,6 +1179,9 @@
+@@ -1162,6 +1182,9 @@
  acpi:BNO*:
   ID_VENDOR_FROM_DATABASE=Bang & Olufsen
  
@@ -117,7 +117,7 @@
  acpi:BNS*:
   ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
  
-@@ -1402,6 +1425,9 @@
+@@ -1405,6 +1428,9 @@
  acpi:CHA*:
   ID_VENDOR_FROM_DATABASE=Chase Research PLC
  
@@ -127,7 +127,7 @@
  acpi:CHD*:
   ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
  
-@@ -1564,6 +1590,9 @@
+@@ -1567,6 +1593,9 @@
  acpi:COD*:
   ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
  
@@ -137,7 +137,7 @@
  acpi:COI*:
   ID_VENDOR_FROM_DATABASE=Codec Inc.
  
-@@ -1973,7 +2002,7 @@
+@@ -1976,7 +2005,7 @@
   ID_VENDOR_FROM_DATABASE=Dragon Information Technology
  
  acpi:DJE*:
@@ -146,7 +146,7 @@
  
  acpi:DJP*:
   ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2311,6 +2340,9 @@
+@@ -2314,6 +2343,9 @@
  acpi:EIN*:
   ID_VENDOR_FROM_DATABASE=Elegant Invention
  
@@ -156,7 +156,7 @@
  acpi:EKA*:
   ID_VENDOR_FROM_DATABASE=MagTek Inc.
  
-@@ -2575,6 +2607,9 @@
+@@ -2581,6 +2613,9 @@
  acpi:FCG*:
   ID_VENDOR_FROM_DATABASE=First International Computer Ltd
  
@@ -166,7 +166,7 @@
  acpi:FCS*:
   ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
  
-@@ -2951,7 +2986,7 @@
+@@ -2957,7 +2992,7 @@
   ID_VENDOR_FROM_DATABASE=General Standards Corporation
  
  acpi:GSM*:
@@ -175,7 +175,7 @@
  
  acpi:GSN*:
   ID_VENDOR_FROM_DATABASE=Grandstream Networks, Inc.
-@@ -3052,6 +3087,9 @@
+@@ -3067,6 +3102,9 @@
  acpi:HEC*:
   ID_VENDOR_FROM_DATABASE=Hisense Electric Co., Ltd.
  
@@ -185,7 +185,7 @@
  acpi:HEL*:
   ID_VENDOR_FROM_DATABASE=Hitachi Micro Systems Europe Ltd
  
-@@ -3184,6 +3222,9 @@
+@@ -3199,6 +3237,9 @@
  acpi:HSD*:
   ID_VENDOR_FROM_DATABASE=HannStar Display Corp
  
@@ -195,7 +195,7 @@
  acpi:HSM*:
   ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
  
-@@ -3310,6 +3351,9 @@
+@@ -3325,6 +3366,9 @@
  acpi:ICI*:
   ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
  
@@ -205,7 +205,7 @@
  acpi:ICM*:
   ID_VENDOR_FROM_DATABASE=Intracom SA
  
-@@ -3406,6 +3450,9 @@
+@@ -3421,6 +3465,9 @@
  acpi:IKE*:
   ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
  
@@ -215,9 +215,9 @@
  acpi:IKS*:
   ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
  
-@@ -3451,6 +3498,9 @@
- acpi:IMT*:
-  ID_VENDOR_FROM_DATABASE=Inmax Technology Corporation
+@@ -3469,6 +3516,9 @@
+ acpi:IMX*:
+  ID_VENDOR_FROM_DATABASE=arpara Technology Co., Ltd.
  
 +acpi:IMS*:
 + ID_VENDOR_FROM_DATABASE=Integrated Micro Solution Inc.
@@ -225,7 +225,7 @@
  acpi:INA*:
   ID_VENDOR_FROM_DATABASE=Inventec Corporation
  
-@@ -3967,6 +4017,9 @@
+@@ -3985,6 +4035,9 @@
  acpi:LAN*:
   ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
  
@@ -235,7 +235,7 @@
  acpi:LAS*:
   ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
  
-@@ -4015,6 +4068,9 @@
+@@ -4033,6 +4086,9 @@
  acpi:LED*:
   ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
  
@@ -245,7 +245,7 @@
  acpi:LEG*:
   ID_VENDOR_FROM_DATABASE=Legerity, Inc
  
-@@ -4030,6 +4086,9 @@
+@@ -4048,6 +4104,9 @@
  acpi:LGC*:
   ID_VENDOR_FROM_DATABASE=Logic Ltd
  
@@ -255,7 +255,7 @@
  acpi:LGI*:
   ID_VENDOR_FROM_DATABASE=Logitech Inc
  
-@@ -4087,6 +4146,9 @@
+@@ -4105,6 +4164,9 @@
  acpi:LND*:
   ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
  
@@ -265,7 +265,7 @@
  acpi:LNK*:
   ID_VENDOR_FROM_DATABASE=Link Tech Inc
  
-@@ -4121,7 +4183,7 @@
+@@ -4139,7 +4201,7 @@
   ID_VENDOR_FROM_DATABASE=Design Technology
  
  acpi:LPL*:
@@ -274,7 +274,7 @@
  
  acpi:LSC*:
   ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4297,6 +4359,9 @@
+@@ -4315,6 +4377,9 @@
  acpi:MCX*:
   ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
  
@@ -284,7 +284,7 @@
  acpi:MDA*:
   ID_VENDOR_FROM_DATABASE=Media4 Inc
  
-@@ -4537,6 +4602,9 @@
+@@ -4555,6 +4620,9 @@
  acpi:MOM*:
   ID_VENDOR_FROM_DATABASE=Momentum Data Systems
  
@@ -294,7 +294,7 @@
  acpi:MOS*:
   ID_VENDOR_FROM_DATABASE=Moses Corporation
  
-@@ -4771,6 +4839,9 @@
+@@ -4792,6 +4860,9 @@
  acpi:NAL*:
   ID_VENDOR_FROM_DATABASE=Network Alchemy
  
@@ -304,7 +304,7 @@
  acpi:NAT*:
   ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
  
-@@ -5293,6 +5364,9 @@
+@@ -5320,6 +5391,9 @@
  acpi:PCX*:
   ID_VENDOR_FROM_DATABASE=PC Xperten
  
@@ -314,7 +314,7 @@
  acpi:PDM*:
   ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
  
-@@ -5356,9 +5430,6 @@
+@@ -5383,9 +5457,6 @@
  acpi:PHE*:
   ID_VENDOR_FROM_DATABASE=Philips Medical Systems Boeblingen GmbH
  
@@ -324,7 +324,7 @@
  acpi:PHL*:
   ID_VENDOR_FROM_DATABASE=Philips Consumer Electronics Company
  
-@@ -5449,9 +5520,6 @@
+@@ -5476,9 +5547,6 @@
  acpi:PNL*:
   ID_VENDOR_FROM_DATABASE=Panelview, Inc.
  
@@ -334,7 +334,7 @@
  acpi:PNR*:
   ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
  
-@@ -5587,15 +5655,9 @@
+@@ -5614,15 +5682,9 @@
  acpi:PTS*:
   ID_VENDOR_FROM_DATABASE=Plain Tree Systems Inc
  
@@ -350,7 +350,7 @@
  acpi:PVG*:
   ID_VENDOR_FROM_DATABASE=Proview Global Co., Ltd
  
-@@ -5911,9 +5973,6 @@
+@@ -5941,9 +6003,6 @@
  acpi:RTI*:
   ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
  
@@ -360,7 +360,7 @@
  acpi:RTL*:
   ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
  
-@@ -6085,9 +6144,6 @@
+@@ -6115,9 +6174,6 @@
  acpi:SEE*:
   ID_VENDOR_FROM_DATABASE=SeeColor Corporation
  
@@ -370,7 +370,7 @@
  acpi:SEI*:
   ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
  
-@@ -6559,6 +6615,9 @@
+@@ -6589,6 +6645,9 @@
  acpi:SVD*:
   ID_VENDOR_FROM_DATABASE=SVD Computer
  
@@ -380,7 +380,7 @@
  acpi:SVI*:
   ID_VENDOR_FROM_DATABASE=Sun Microsystems
  
-@@ -6643,6 +6702,9 @@
+@@ -6673,6 +6732,9 @@
  acpi:SZM*:
   ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
  
@@ -390,7 +390,7 @@
  acpi:TAA*:
   ID_VENDOR_FROM_DATABASE=Tandberg
  
-@@ -6733,6 +6795,9 @@
+@@ -6763,6 +6825,9 @@
  acpi:TDG*:
   ID_VENDOR_FROM_DATABASE=Six15 Technologies
  
@@ -400,7 +400,7 @@
  acpi:TDM*:
   ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
  
-@@ -6775,6 +6840,9 @@
+@@ -6805,6 +6870,9 @@
  acpi:TEV*:
   ID_VENDOR_FROM_DATABASE=Televés, S.A.
  
@@ -410,7 +410,7 @@
  acpi:TEZ*:
   ID_VENDOR_FROM_DATABASE=Tech Source Inc.
  
-@@ -6898,9 +6966,6 @@
+@@ -6928,9 +6996,6 @@
  acpi:TNC*:
   ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
  
@@ -420,7 +420,7 @@
  acpi:TNM*:
   ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
  
-@@ -7210,14 +7275,14 @@
+@@ -7240,14 +7305,14 @@
  acpi:UNC*:
   ID_VENDOR_FROM_DATABASE=Unisys Corporation
  
@@ -441,7 +441,7 @@
  
  acpi:UNI*:
   ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -7252,6 +7317,9 @@
+@@ -7282,6 +7347,9 @@
  acpi:USA*:
   ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
  
@@ -451,7 +451,7 @@
  acpi:USD*:
   ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
  
-@@ -7507,9 +7575,6 @@
+@@ -7540,9 +7608,6 @@
  acpi:WAL*:
   ID_VENDOR_FROM_DATABASE=Wave Access
  
@@ -461,7 +461,7 @@
  acpi:WAV*:
   ID_VENDOR_FROM_DATABASE=Wavephore
  
-@@ -7634,7 +7699,7 @@
+@@ -7667,7 +7732,7 @@
   ID_VENDOR_FROM_DATABASE=WyreStorm Technologies LLC
  
  acpi:WYS*:
@@ -470,7 +470,7 @@
  
  acpi:WYT*:
   ID_VENDOR_FROM_DATABASE=Wooyoung Image & Information Co.,Ltd.
-@@ -7648,9 +7713,6 @@
+@@ -7681,9 +7746,6 @@
  acpi:XDM*:
   ID_VENDOR_FROM_DATABASE=XDM Ltd.
  
@@ -480,7 +480,7 @@
  acpi:XES*:
   ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
  
-@@ -7681,9 +7743,6 @@
+@@ -7714,9 +7776,6 @@
  acpi:XNT*:
   ID_VENDOR_FROM_DATABASE=XN Technologies, Inc.
  
@@ -490,7 +490,7 @@
  acpi:XQU*:
   ID_VENDOR_FROM_DATABASE=SHANGHAI SVA-DAV ELECTRONICS CO., LTD
  
-@@ -7750,6 +7809,9 @@
+@@ -7783,6 +7842,9 @@
  acpi:ZBX*:
   ID_VENDOR_FROM_DATABASE=Zebax Technologies
  

diff --git a/hwdb.d/20-pci-vendor-model.hwdb b/hwdb.d/20-pci-vendor-model.hwdb
index 1344fab356c5f96ed6a504b225aa32e83e869be3..2aad3675b9a5a5fae687e5a86b776f0eaa279b38 100644 (file)
--- a/hwdb.d/20-pci-vendor-model.hwdb
+++ b/hwdb.d/20-pci-vendor-model.hwdb
@@ -128,6 +128,9 @@ pci:v000001DEd00000000*
 pci:v000001DEd00000001*
  ID_MODEL_FROM_DATABASE=Propolis xHCI Controller
 
+pci:v000001DEd00000002*
+ ID_MODEL_FROM_DATABASE=Propolis PCI-PCI Bridge
+
 pci:v00000200*
  ID_VENDOR_FROM_DATABASE=Dell (wrong ID)
 
@@ -1367,6 +1370,9 @@ pci:v00001000d0000005Dsv00001028sd00001F54*
 pci:v00001000d0000005Dsv00001028sd00001FD1*
  ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PERC H730P MX)
 
+pci:v00001000d0000005Dsv00001734sd000011F6*
+ ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PRAID EP400i)
+
 pci:v00001000d0000005Dsv000017AAsd00001052*
  ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (ThinkServer RAID 720i)
 
@@ -2099,6 +2105,9 @@ pci:v00001000d000000A5sv00001000sd000046C0*
 pci:v00001000d000000A5sv00001000sd000046D0*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (eHBA 9600-8i8e Tri-Mode Storage Adapter)
 
+pci:v00001000d000000A5sv00001000sd000046E0*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (eHBA 9602W-16e Tri-Mode Storage Adapter)
+
 pci:v00001000d000000A5sv00001028sd00002114*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (PERC H965i Adapter)
 
@@ -2141,6 +2150,9 @@ pci:v00001000d000000A5sv00001028sd00002209*
 pci:v00001000d000000A5sv00001028sd0000220A*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (HBA465i Front)
 
+pci:v00001000d000000A5sv00001D49sd0000020A*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (ThinkSystem 450W-16e SAS/SATA PCIe Gen4 24Gb HBA)
+
 pci:v00001000d000000AB*
  ID_MODEL_FROM_DATABASE=SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
 
@@ -2372,6 +2384,9 @@ pci:v00001000d000000E6sv00001028sd00002175*
 pci:v00001000d000000E6sv00001028sd00002197*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Secure SAS38xx (HBA350i MM LP)
 
+pci:v00001000d000000E6sv00001028sd00002212*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Secure SAS38xx (HBA355e-s Adapter)
+
 pci:v00001000d000000E6sv00001D49sd00000205*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Secure SAS38xx (ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA)
 
@@ -2423,6 +2438,9 @@ pci:v00001000d000002B1*
 pci:v00001000d000002B1sv00001D49sd00000004*
  ID_MODEL_FROM_DATABASE=Virtual Endpoint on PCIe Switch (9749) (ThinkSystem 1610-8P NVMe Switch Adapter)
 
+pci:v00001000d000002B2*
+ ID_MODEL_FROM_DATABASE=Virtual PCIe Placeholder Endpoint
+
 pci:v00001000d00000407*
  ID_MODEL_FROM_DATABASE=MegaRAID
 
@@ -2768,6 +2786,9 @@ pci:v00001000d000010E5*
 pci:v00001000d000010E6*
  ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS38xx
 
+pci:v00001000d000010E6sv00001000sd000040E0*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS38xx (MegaRAID 9540-2M2)
+
 pci:v00001000d000010E6sv00001028sd00002172*
  ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS38xx (PERC H355 Adapter)
 
@@ -2838,7 +2859,34 @@ pci:v00001000d00006001*
  ID_MODEL_FROM_DATABASE=DX1 Multiformat Broadcast HD/SD Encoder/Decoder
 
 pci:v00001000d0000C010*
- ID_MODEL_FROM_DATABASE=PEX88048 50 lane, 50 port, PCI Express Gen 4.0 ExpressFabric Platform
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch
+
+pci:v00001000d0000C010sv00001000sd0000100B*
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch (PEX88000 PCIe Gen 4 Virtual Upstream/Downstream Port)
+
+pci:v00001000d0000C010sv00001000sd00002004*
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch (PEX88000 Virtual PCIe TWC/NT2 Endpoint)
+
+pci:v00001000d0000C010sv00001000sd00002005*
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch (PEX88000 Virtual PCIe gDMA Endpoint)
+
+pci:v00001000d0000C010sv00001000sd0000A024*
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch (PEX88024 24 lane/port PCIe Gen 4.0 Switch)
+
+pci:v00001000d0000C010sv00001000sd0000A032*
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch (PEX88032 32 lane/port PCIe Gen 4 Switch)
+
+pci:v00001000d0000C010sv00001000sd0000A048*
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch (PEX88048 50 lane/port PCIe Gen 4.0 Switch)
+
+pci:v00001000d0000C010sv00001000sd0000A064*
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch (PEX88064 64 lane/port PCIe Gen 4 Switch)
+
+pci:v00001000d0000C010sv00001000sd0000A080*
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch (PEX88080 80 lane/port PCIe Gen 4 Switch)
+
+pci:v00001000d0000C010sv00001000sd0000A096*
+ ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch (PEX88096 98 lane/port PCIe Gen 4.0 Switch)
 
 pci:v00001000d0000C012*
  ID_MODEL_FROM_DATABASE=PEX880xx PCIe Gen 4 Switch
@@ -2849,6 +2897,36 @@ pci:v00001000d0000C012sv00001D49sd00000003*
 pci:v00001000d0000C030*
  ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch
 
+pci:v00001000d0000C030sv00001000sd00000024*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89024 PCIe Gen 5 24 port/lane Switch Upstream/Downstream Port)
+
+pci:v00001000d0000C030sv00001000sd00000032*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89032 PCIe Gen 5 32 port/lane Switch Upstream/Downstream Port)
+
+pci:v00001000d0000C030sv00001000sd00000048*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89048 PCIe Gen 5 48 port/lane Switch Upstream/Downstream Port)
+
+pci:v00001000d0000C030sv00001000sd00000072*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89072 PCIe Gen 5 36 port/72 lane Switch Upstream/Downstream Port)
+
+pci:v00001000d0000C030sv00001000sd00000088*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89088 PCIe Gen 5 44 port/88 lane Switch Upstream/Downstream Port)
+
+pci:v00001000d0000C030sv00001000sd00000104*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89104 PCIe Gen 5 52 port/104 lane Switch Upstream/Downstream Port)
+
+pci:v00001000d0000C030sv00001000sd00000144*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89144 PCIe Gen 5 72 port/144 lane Switch Upstream/Downstream Port)
+
+pci:v00001000d0000C030sv00001000sd0000100B*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89000 PCIe Gen 5 Virtual Upstream/Downstream Port)
+
+pci:v00001000d0000C030sv00001000sd00002004*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89000 Virtual PCIe TWC/NT 2.0 Endpoint)
+
+pci:v00001000d0000C030sv00001000sd00002005*
+ ID_MODEL_FROM_DATABASE=PEX890xx PCIe Gen 5 Switch (PEX89000 Virtual PCIe gDMA Endpoint)
+
 pci:v00001001*
  ID_VENDOR_FROM_DATABASE=Kolter Electronic
 
@@ -2964,7 +3042,10 @@ pci:v00001002d0000131D*
  ID_MODEL_FROM_DATABASE=Kaveri [Radeon R6 Graphics]
 
 pci:v00001002d000013E9*
- ID_MODEL_FROM_DATABASE=Ariel
+ ID_MODEL_FROM_DATABASE=Ariel/Navi10Lite
+
+pci:v00001002d000013F9*
+ ID_MODEL_FROM_DATABASE=Oberon/Navi12Lite
 
 pci:v00001002d000013FE*
  ID_MODEL_FROM_DATABASE=Cyan Skillfish [BC-250]
@@ -3083,6 +3164,9 @@ pci:v00001002d0000164C*
 pci:v00001002d0000164D*
  ID_MODEL_FROM_DATABASE=Rembrandt
 
+pci:v00001002d0000164E*
+ ID_MODEL_FROM_DATABASE=Raphael
+
 pci:v00001002d0000164F*
  ID_MODEL_FROM_DATABASE=Phoenix
 
@@ -4634,6 +4718,9 @@ pci:v00001002d00004C4Dsv00001179sd0000FF00*
 pci:v00001002d00004C4Dsv000013BDsd00001019*
  ID_MODEL_FROM_DATABASE=Rage Mobility AGP 2x Series (PC-AR10)
 
+pci:v00001002d00004C4E*
+ ID_MODEL_FROM_DATABASE=Rage Mobility L AGP 2x
+
 pci:v00001002d00004C50*
  ID_MODEL_FROM_DATABASE=Rage 3 LT [3D Rage LT PRO PCI]
 
@@ -5993,6 +6080,9 @@ pci:v00001002d00006613sv00001682sd00007240*
 pci:v00001002d00006613sv00001DCFsd00003000*
  ID_MODEL_FROM_DATABASE=Oland PRO [Radeon R7 240/340 / Radeon 520]
 
+pci:v00001002d00006617*
+ ID_MODEL_FROM_DATABASE=Oland LE [Radeon R7 240]
+
 pci:v00001002d00006631*
  ID_MODEL_FROM_DATABASE=Oland
 
@@ -7770,7 +7860,7 @@ pci:v00001002d00006798sv00001682sd00003214*
  ID_MODEL_FROM_DATABASE=Tahiti XT [Radeon HD 7970/8970 OEM / R9 280X] (Double D HD 7970)
 
 pci:v00001002d00006798sv00001787sd0000201C*
- ID_MODEL_FROM_DATABASE=Tahiti XT [Radeon HD 7970/8970 OEM / R9 280X] (HD 7970 IceQ X²)
+ ID_MODEL_FROM_DATABASE=Tahiti XT [Radeon HD 7970/8970 OEM / R9 280X] (HD 7970 IceQ X²)
 
 pci:v00001002d00006798sv00001787sd00002317*
  ID_MODEL_FROM_DATABASE=Tahiti XT [Radeon HD 7970/8970 OEM / R9 280X] (Radeon HD 7990)
@@ -7956,7 +8046,7 @@ pci:v00001002d000067B0sv0000174Bsd0000E324*
  ID_MODEL_FROM_DATABASE=Hawaii XT / Grenada XT [Radeon R9 290X/390X] (Grenada XT2 [Radeon R9 390X])
 
 pci:v00001002d000067B0sv00001787sd00002020*
- ID_MODEL_FROM_DATABASE=Hawaii XT / Grenada XT [Radeon R9 290X/390X] (R9 290X IceQ X² Turbo)
+ ID_MODEL_FROM_DATABASE=Hawaii XT / Grenada XT [Radeon R9 290X/390X] (R9 290X IceQ X² Turbo)
 
 pci:v00001002d000067B0sv00001787sd00002357*
  ID_MODEL_FROM_DATABASE=Hawaii XT / Grenada XT [Radeon R9 290X/390X] (Grenada XT [Radeon R9 390X])
@@ -8997,7 +9087,7 @@ pci:v00001002d00006898*
  ID_MODEL_FROM_DATABASE=Cypress XT [Radeon HD 5870]
 
 pci:v00001002d00006898sv00001002sd00000B00*
- ID_MODEL_FROM_DATABASE=Cypress XT [Radeon HD 5870] (Radeon HD 5870 Eyefinityâ\81¶ Edition)
+ ID_MODEL_FROM_DATABASE=Cypress XT [Radeon HD 5870] (Radeon HD 5870 EyefinityâÂ\81¶ Edition)
 
 pci:v00001002d00006898sv0000106Bsd000000D0*
  ID_MODEL_FROM_DATABASE=Cypress XT [Radeon HD 5870] (Radeon HD 5870 Mac Edition)
@@ -10611,7 +10701,7 @@ pci:v00001002d0000710A*
  ID_MODEL_FROM_DATABASE=R520 [Radeon X1800 GTO]
 
 pci:v00001002d0000710Asv00001002sd00000B12*
- ID_MODEL_FROM_DATABASE=R520 [Radeon X1800 GTO] (Radeon X1800 GTO²)
+ ID_MODEL_FROM_DATABASE=R520 [Radeon X1800 GTO] (Radeon X1800 GTO²)
 
 pci:v00001002d0000710B*
  ID_MODEL_FROM_DATABASE=R520 [Radeon X1800 GTO]
@@ -11106,7 +11196,10 @@ pci:v00001002d000073BFsv00001DA2sd0000440F*
  ID_MODEL_FROM_DATABASE=Navi 21 [Radeon RX 6800/6800 XT / 6900 XT] (TOXIC RX 6900 XT)
 
 pci:v00001002d000073BFsv00001EAEsd00006701*
- ID_MODEL_FROM_DATABASE=Navi 21 [Radeon RX 6800/6800 XT / 6900 XT] (XFX Speedster MERC 319 AMD Radeon RX 6800 XT Black)
+ ID_MODEL_FROM_DATABASE=Navi 21 [Radeon RX 6800/6800 XT / 6900 XT] (Speedster MERC 319 AMD Radeon RX 6800 XT Black)
+
+pci:v00001002d000073BFsv00001EAEsd00006901*
+ ID_MODEL_FROM_DATABASE=Navi 21 [Radeon RX 6800/6800 XT / 6900 XT] (Speedster MERC 319 AMD Radeon RX 6900 XT Black)
 
 pci:v00001002d000073C3*
  ID_MODEL_FROM_DATABASE=Navi 22
@@ -11135,12 +11228,21 @@ pci:v00001002d000073E4*
 pci:v00001002d000073EF*
  ID_MODEL_FROM_DATABASE=Navi 23 [Radeon RX 6650 XT]
 
+pci:v00001002d000073EFsv00001002sd000073EF*
+ ID_MODEL_FROM_DATABASE=Navi 23 [Radeon RX 6650 XT] (Navi 23 [Radeon RX 6700S / 6650 XT])
+
 pci:v00001002d000073FF*
  ID_MODEL_FROM_DATABASE=Navi 23 [Radeon RX 6600/6600 XT/6600M]
 
+pci:v00001002d000073FFsv00001462sd00005022*
+ ID_MODEL_FROM_DATABASE=Navi 23 [Radeon RX 6600/6600 XT/6600M] (RX 6600 MECH 2X)
+
 pci:v00001002d000073FFsv0000148Csd00002412*
  ID_MODEL_FROM_DATABASE=Navi 23 [Radeon RX 6600/6600 XT/6600M] (PowerColor Red Devil RX 6600 XT)
 
+pci:v00001002d000073FFsv00001849sd00005218*
+ ID_MODEL_FROM_DATABASE=Navi 23 [Radeon RX 6600/6600 XT/6600M] (Radeon RX 6600 Challenger ITX 8GB)
+
 pci:v00001002d00007408*
  ID_MODEL_FROM_DATABASE=Aldebaran
 
@@ -11163,10 +11265,10 @@ pci:v00001002d00007424*
  ID_MODEL_FROM_DATABASE=Navi 24 [Radeon RX 6300]
 
 pci:v00001002d0000743F*
- ID_MODEL_FROM_DATABASE=Navi 24 [Radeon RX 6400 / 6500 XT]
+ ID_MODEL_FROM_DATABASE=Navi 24 [Radeon RX 6400/6500 XT/6500M]
 
 pci:v00001002d0000743Fsv00001DA2sd0000E457*
- ID_MODEL_FROM_DATABASE=Navi 24 [Radeon RX 6400 / 6500 XT] (PULSE AMD Radeon RX 6500 XT)
+ ID_MODEL_FROM_DATABASE=Navi 24 [Radeon RX 6400/6500 XT/6500M] (PULSE AMD Radeon RX 6500 XT)
 
 pci:v00001002d00007833*
  ID_MODEL_FROM_DATABASE=RS350 Host Bridge
@@ -14912,6 +15014,9 @@ pci:v00001022d0000162A*
 pci:v00001022d0000162B*
  ID_MODEL_FROM_DATABASE=Arden PCIe Non-Transparent Bridge
 
+pci:v00001022d0000162C*
+ ID_MODEL_FROM_DATABASE=VanGogh USB2
+
 pci:v00001022d00001630*
  ID_MODEL_FROM_DATABASE=Renoir/Cezanne Root Complex
 
@@ -14963,9 +15068,18 @@ pci:v00001022d00001643*
 pci:v00001022d00001644*
  ID_MODEL_FROM_DATABASE=Renoir I2S
 
-pci:v00001022d00001648*
+pci:v00001022d00001645*
  ID_MODEL_FROM_DATABASE=VanGogh Root Complex
 
+pci:v00001022d00001646*
+ ID_MODEL_FROM_DATABASE=VanGogh IOMMU
+
+pci:v00001022d00001647*
+ ID_MODEL_FROM_DATABASE=VanGogh PCIe GPP Bridge
+
+pci:v00001022d00001648*
+ ID_MODEL_FROM_DATABASE=VanGogh Internal PCIe GPP Bridge to Bus
+
 pci:v00001022d00001649*
  ID_MODEL_FROM_DATABASE=VanGogh PSP/CCP
 
@@ -14996,6 +15110,30 @@ pci:v00001022d00001656*
 pci:v00001022d00001657*
  ID_MODEL_FROM_DATABASE=Milan Data Fabric; Function 7
 
+pci:v00001022d00001660*
+ ID_MODEL_FROM_DATABASE=VanGogh Data Fabric; Function 0
+
+pci:v00001022d00001661*
+ ID_MODEL_FROM_DATABASE=VanGogh Data Fabric; Function 1
+
+pci:v00001022d00001662*
+ ID_MODEL_FROM_DATABASE=VanGogh Data Fabric; Function 2
+
+pci:v00001022d00001663*
+ ID_MODEL_FROM_DATABASE=VanGogh Data Fabric; Function 3
+
+pci:v00001022d00001664*
+ ID_MODEL_FROM_DATABASE=VanGogh Data Fabric; Function 4
+
+pci:v00001022d00001665*
+ ID_MODEL_FROM_DATABASE=VanGogh Data Fabric; Function 5
+
+pci:v00001022d00001666*
+ ID_MODEL_FROM_DATABASE=VanGogh Data Fabric; Function 6
+
+pci:v00001022d00001667*
+ ID_MODEL_FROM_DATABASE=VanGogh Data Fabric; Function 7
+
 pci:v00001022d0000166A*
  ID_MODEL_FROM_DATABASE=Cezanne Data Fabric; Function 0
 
@@ -21669,7 +21807,7 @@ pci:v00001077d00002281sv00001590sd000002D3*
  ID_MODEL_FROM_DATABASE=ISP2812-based 64/32G Fibre Channel to PCIe Controller (SN1610Q - 1P Enhanced 32GFC Single Port Fibre Channel Host Bus Adapter)
 
 pci:v00001077d00002281sv00001590sd000002D4*
- ID_MODEL_FROM_DATABASE=ISP2812-based 64/32G Fibre Channel to PCIe Controller (SN1610Q – 2P Enhanced 32GFC Dual Port Fibre Channel Host Bus Adapter)
+ ID_MODEL_FROM_DATABASE=ISP2812-based 64/32G Fibre Channel to PCIe Controller (SN1610Q – 2P Enhanced 32GFC Dual Port Fibre Channel Host Bus Adapter)
 
 pci:v00001077d00002289*
  ID_MODEL_FROM_DATABASE=ISP2852-based 64/32G Fibre Channel to PCIe Controller with StorCryption
@@ -22407,7 +22545,7 @@ pci:v0000108Ed00000001*
  ID_MODEL_FROM_DATABASE=EBUS
 
 pci:v0000108Ed00001000*
- ID_MODEL_FROM_DATABASE=EBUS
+ ID_MODEL_FROM_DATABASE=STP2003QFP [PCIO] EBUS
 
 pci:v0000108Ed00001001*
  ID_MODEL_FROM_DATABASE=Happy Meal 10/100 Ethernet [hme]
@@ -26415,16 +26553,16 @@ pci:v000010B5d00009056sv000010B5sd00003353*
  ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Alpermann+Velte PCL PCIe D: Timecode Reader Board)
 
 pci:v000010B5d00009056sv000010B5sd00003354*
- ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Alpermann+Velte PCL PCIe LV: Timecode Reader Board)
+ ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Plura PCL PCIe LV: Timecode Reader Board)
 
 pci:v000010B5d00009056sv000010B5sd00003355*
- ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Alpermann+Velte PCL PCIe L: Timecode Reader Board)
+ ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Plura PCL PCIe L: Timecode Reader Board)
 
 pci:v000010B5d00009056sv000010B5sd00003415*
- ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Alpermann+Velte PCIe TS: Time Synchronisation Board)
+ ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Plura PCIe TS: Time Synchronisation Board)
 
 pci:v000010B5d00009056sv000010B5sd00003493*
- ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Alpermann+Velte PCL PCIe 3G: Timecode Reader Board)
+ ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Plura PCL PCIe 3G: Timecode Reader Board)
 
 pci:v000010B5d00009056sv000010B5sd00003565*
  ID_MODEL_FROM_DATABASE=PCI9056 32-bit 66MHz PCI <-> IOBus Bridge (Cambridge Pixel HPx Radar Output Card)
@@ -36506,6 +36644,9 @@ pci:v000010DEd00001DBA*
 pci:v000010DEd00001DBAsv000010DEsd000012EB*
  ID_MODEL_FROM_DATABASE=GV100GL [Quadro GV100] (TITAN V CEO Edition)
 
+pci:v000010DEd00001DBE*
+ ID_MODEL_FROM_DATABASE=GV100 Engineering Sample
+
 pci:v000010DEd00001DF0*
  ID_MODEL_FROM_DATABASE=GV100GL [Tesla PG500-216]
 
@@ -36612,7 +36753,7 @@ pci:v000010DEd00001EAB*
  ID_MODEL_FROM_DATABASE=TU104M
 
 pci:v000010DEd00001EAE*
- ID_MODEL_FROM_DATABASE=TU104M
+ ID_MODEL_FROM_DATABASE=TU104M [GeForce GTX 2080 Engineering Sample]
 
 pci:v000010DEd00001EB0*
  ID_MODEL_FROM_DATABASE=TU104GL [Quadro RTX 5000]
@@ -36734,6 +36875,9 @@ pci:v000010DEd00001F81*
 pci:v000010DEd00001F82*
  ID_MODEL_FROM_DATABASE=TU117 [GeForce GTX 1650]
 
+pci:v000010DEd00001F83*
+ ID_MODEL_FROM_DATABASE=TU117 [GeForce GTX 1630]
+
 pci:v000010DEd00001F91*
  ID_MODEL_FROM_DATABASE=TU117M [GeForce GTX 1650 Mobile / Max-Q]
 
@@ -36986,6 +37130,9 @@ pci:v000010DEd0000223F*
 pci:v000010DEd0000228B*
  ID_MODEL_FROM_DATABASE=GA104 High Definition Audio Controller
 
+pci:v000010DEd0000228E*
+ ID_MODEL_FROM_DATABASE=GA106 High Definition Audio Controller
+
 pci:v000010DEd00002296*
  ID_MODEL_FROM_DATABASE=Tegra PCIe Endpoint Virtual Network
 
@@ -36995,6 +37142,9 @@ pci:v000010DEd00002302*
 pci:v000010DEd00002321*
  ID_MODEL_FROM_DATABASE=GH100
 
+pci:v000010DEd00002331*
+ ID_MODEL_FROM_DATABASE=GH100 [H100 80GB 8GPC Engineering Sample]
+
 pci:v000010DEd00002336*
  ID_MODEL_FROM_DATABASE=GH100 [H100 96GB]
 
@@ -37169,6 +37319,9 @@ pci:v000010DEd000025A9*
 pci:v000010DEd000025AA*
  ID_MODEL_FROM_DATABASE=GA107M [GeForce MX570 A]
 
+pci:v000010DEd000025AC*
+ ID_MODEL_FROM_DATABASE=GN20-P0-R-K2
+
 pci:v000010DEd000025AF*
  ID_MODEL_FROM_DATABASE=GA107 [GeForce RTX 3050 Engineering Sample]
 
@@ -37199,12 +37352,51 @@ pci:v000010DEd000025E2*
 pci:v000010DEd000025E5*
  ID_MODEL_FROM_DATABASE=GA107BM [GeForce RTX 3050 Mobile]
 
+pci:v000010DEd000025EC*
+ ID_MODEL_FROM_DATABASE=GN20-P0-R-K2
+
 pci:v000010DEd000025F9*
  ID_MODEL_FROM_DATABASE=GA107 [RTX A1000 Embedded GPU ]
 
 pci:v000010DEd000025FA*
  ID_MODEL_FROM_DATABASE=GA107 [RTX A2000 Embedded GPU]
 
+pci:v000010DEd00002684*
+ ID_MODEL_FROM_DATABASE=AD102 [GeForce RTX 4090]
+
+pci:v000010DEd00002717*
+ ID_MODEL_FROM_DATABASE=GN21-X11
+
+pci:v000010DEd00002757*
+ ID_MODEL_FROM_DATABASE=GN21-X11
+
+pci:v000010DEd00002785*
+ ID_MODEL_FROM_DATABASE=AD104
+
+pci:v000010DEd000027A0*
+ ID_MODEL_FROM_DATABASE=GN21-X9
+
+pci:v000010DEd000027E0*
+ ID_MODEL_FROM_DATABASE=GN21-X9
+
+pci:v000010DEd00002820*
+ ID_MODEL_FROM_DATABASE=GN21-X6
+
+pci:v000010DEd00002860*
+ ID_MODEL_FROM_DATABASE=GN21-X6
+
+pci:v000010DEd000028A0*
+ ID_MODEL_FROM_DATABASE=GN21-X4
+
+pci:v000010DEd000028A1*
+ ID_MODEL_FROM_DATABASE=GN21-X2
+
+pci:v000010DEd000028E0*
+ ID_MODEL_FROM_DATABASE=GN21-X4
+
+pci:v000010DEd000028E1*
+ ID_MODEL_FROM_DATABASE=GN21-X2
+
 pci:v000010DF*
  ID_VENDOR_FROM_DATABASE=Emulex Corporation
 
@@ -38210,6 +38402,9 @@ pci:v000010ECd00008168sv0000103Csd0000825B*
 pci:v000010ECd00008168sv0000103Csd00008615*
  ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (Pavilion Laptop 15-cw1xxx)
 
+pci:v000010ECd00008168sv0000103Csd000086D4*
+ ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (Pavilion Laptop 15-ec0xxx)
+
 pci:v000010ECd00008168sv0000103Csd00008882*
  ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (HP ProDesk 405 G8 Desktop Mini PC)
 
@@ -38478,7 +38673,7 @@ pci:v000010ECd0000B822*
  ID_MODEL_FROM_DATABASE=RTL8822BE 802.11a/b/g/n/ac WiFi adapter
 
 pci:v000010ECd0000B822sv0000103Csd0000831B*
- ID_MODEL_FROM_DATABASE=RTL8822BE 802.11a/b/g/n/ac WiFi adapter (Realtek RTL8822BE 802.11ac 2 Ã\97 2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported))
+ ID_MODEL_FROM_DATABASE=RTL8822BE 802.11a/b/g/n/ac WiFi adapter (Realtek RTL8822BE 802.11ac 2 Ã\83â\80\94 2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported))
 
 pci:v000010ECd0000B822sv000017AAsd00005124*
  ID_MODEL_FROM_DATABASE=RTL8822BE 802.11a/b/g/n/ac WiFi adapter (ThinkPad E595)
@@ -38576,6 +38771,15 @@ pci:v000010EEd00005020*
 pci:v000010EEd0000505C*
  ID_MODEL_FROM_DATABASE=Alveo U55C
 
+pci:v000010EEd00006987*
+ ID_MODEL_FROM_DATABASE=SmartSSD
+
+pci:v000010EEd00006988*
+ ID_MODEL_FROM_DATABASE=SmartSSD
+
+pci:v000010EEd00007011*
+ ID_MODEL_FROM_DATABASE=7-Series FPGA Hard PCIe block (AXI/debug)
+
 pci:v000010EEd00007038*
  ID_MODEL_FROM_DATABASE=FPGA Card XC7VX690T
 
@@ -38594,6 +38798,15 @@ pci:v000010EEd00008380*
 pci:v000010EEd00008381*
  ID_MODEL_FROM_DATABASE=Ellips Santos Frame Grabber
 
+pci:v000010EEd00009134*
+ ID_MODEL_FROM_DATABASE=SmartSSD
+
+pci:v000010EEd00009234*
+ ID_MODEL_FROM_DATABASE=SmartSSD
+
+pci:v000010EEd00009434*
+ ID_MODEL_FROM_DATABASE=SmartSSD
+
 pci:v000010EEd0000D000*
  ID_MODEL_FROM_DATABASE=Alveo U200 Golden Image
 
@@ -51023,9 +51236,39 @@ pci:v00001344d00005192*
 pci:v00001344d000051A2*
  ID_MODEL_FROM_DATABASE=7300 PRO NVMe SSD
 
+pci:v00001344d000051A2sv00001344sd00002000*
+ ID_MODEL_FROM_DATABASE=7300 PRO NVMe SSD (960GB U.2)
+
+pci:v00001344d000051A2sv00001344sd00003000*
+ ID_MODEL_FROM_DATABASE=7300 PRO NVMe SSD (1920GB U.2)
+
+pci:v00001344d000051A2sv00001344sd00004000*
+ ID_MODEL_FROM_DATABASE=7300 PRO NVMe SSD (3480GB U.2)
+
+pci:v00001344d000051A2sv00001344sd00005000*
+ ID_MODEL_FROM_DATABASE=7300 PRO NVMe SSD (7680GB U.2)
+
 pci:v00001344d000051A3*
  ID_MODEL_FROM_DATABASE=7300 MAX NVMe SSD
 
+pci:v00001344d000051A3sv00001344sd00001100*
+ ID_MODEL_FROM_DATABASE=7300 MAX NVMe SSD (400GB M.2)
+
+pci:v00001344d000051A3sv00001344sd00002000*
+ ID_MODEL_FROM_DATABASE=7300 MAX NVMe SSD (800GB U.2)
+
+pci:v00001344d000051A3sv00001344sd00002100*
+ ID_MODEL_FROM_DATABASE=7300 MAX NVMe SSD (800GB M.2)
+
+pci:v00001344d000051A3sv00001344sd00003000*
+ ID_MODEL_FROM_DATABASE=7300 MAX NVMe SSD (1600GB U.2)
+
+pci:v00001344d000051A3sv00001344sd00004000*
+ ID_MODEL_FROM_DATABASE=7300 MAX NVMe SSD (3200GB U.2)
+
+pci:v00001344d000051A3sv00001344sd00005000*
+ ID_MODEL_FROM_DATABASE=7300 MAX NVMe SSD (6400GB U.2)
+
 pci:v00001344d000051B1*
  ID_MODEL_FROM_DATABASE=9300 PRO NVMe SSD
 
@@ -53333,6 +53576,9 @@ pci:v00001414d00000002*
 pci:v00001414d0000008C*
  ID_MODEL_FROM_DATABASE=Basic Render Driver
 
+pci:v00001414d0000008E*
+ ID_MODEL_FROM_DATABASE=Basic Render Driver
+
 pci:v00001414d00005353*
  ID_MODEL_FROM_DATABASE=Hyper-V virtual VGA
 
@@ -58505,6 +58751,9 @@ pci:v000014E4d000016D5*
 pci:v000014E4d000016D6*
  ID_MODEL_FROM_DATABASE=BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller
 
+pci:v000014E4d000016D6sv0000117Csd000000CD*
+ ID_MODEL_FROM_DATABASE=BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller (FastFrame N4S2 Dual-port 10Gb Ethernet Adapter)
+
 pci:v000014E4d000016D6sv000014E4sd00001202*
  ID_MODEL_FROM_DATABASE=BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller (BCM957412M4122C OCP 1x25G Type1 wRoCE)
 
@@ -58526,6 +58775,9 @@ pci:v000014E4d000016D6sv0000193Dsd00001024*
 pci:v000014E4d000016D7*
  ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
 
+pci:v000014E4d000016D7sv0000117Csd000000CC*
+ ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (FastFrame N422 Dual-port 25Gb Ethernet Adapter)
+
 pci:v000014E4d000016D7sv000014E4sd00001402*
  ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (BCM957414A4142CC 10Gb/25Gb Ethernet PCIe)
 
@@ -58548,7 +58800,7 @@ pci:v000014E4d000016D7sv00001590sd00000211*
  ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (Ethernet 25Gb 2-port 631FLR-SFP28 Adapter)
 
 pci:v000014E4d000016D7sv00001EECsd00000101*
- ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe)
+ ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (VSE-225-31S Dual-port 10Gb/25Gb Ethernet PCIe)
 
 pci:v000014E4d000016D8*
  ID_MODEL_FROM_DATABASE=BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
@@ -58556,6 +58808,9 @@ pci:v000014E4d000016D8*
 pci:v000014E4d000016D8sv00001028sd00001FEB*
  ID_MODEL_FROM_DATABASE=BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller (NetXtreme-E 10Gb SFP+ Adapter)
 
+pci:v000014E4d000016D8sv0000117Csd000000CE*
+ ID_MODEL_FROM_DATABASE=BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller (FastFrame N4T2 Dual-port 10GBASE-T Ethernet Adapter)
+
 pci:v000014E4d000016D8sv000014E4sd00004163*
  ID_MODEL_FROM_DATABASE=BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller (NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 2.0 Adapter (BCM957416M4163C))
 
@@ -58709,6 +58964,9 @@ pci:v000014E4d00001713sv000017AAsd00003A23*
 pci:v000014E4d00001750*
  ID_MODEL_FROM_DATABASE=BCM57508 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
 
+pci:v000014E4d00001750sv0000117Csd000000CF*
+ ID_MODEL_FROM_DATABASE=BCM57508 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet (FastFrame N412 Dual-port 100Gb Ethernet Adapter)
+
 pci:v000014E4d00001750sv000014E4sd00002100*
  ID_MODEL_FROM_DATABASE=BCM57508 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet (NetXtreme-E Dual-port 100G QSFP56 Ethernet PCIe4.0 x16 Adapter (BCM957508-P2100G))
 
@@ -59558,6 +59816,15 @@ pci:v000014E4d00005E87*
 pci:v000014E4d00005E88*
  ID_MODEL_FROM_DATABASE=Viper Offload Engine
 
+pci:v000014E4d00005F69*
+ ID_MODEL_FROM_DATABASE=BRCM4378 Bluetooth Controller
+
+pci:v000014E4d00005F71*
+ ID_MODEL_FROM_DATABASE=BRCM4387 Bluetooth Controller
+
+pci:v000014E4d00005FA0*
+ ID_MODEL_FROM_DATABASE=BRCM4377 Bluetooth Controller
+
 pci:v000014E4d00008602*
  ID_MODEL_FROM_DATABASE=BCM7400/BCM7405 Serial ATA Controller
 
@@ -61745,6 +62012,12 @@ pci:v000015B3d0000025B*
 pci:v000015B3d0000025C*
  ID_MODEL_FROM_DATABASE=Quantum-3 RMA
 
+pci:v000015B3d0000025D*
+ ID_MODEL_FROM_DATABASE=Quantum-3CPO in Flash Recovery Mode
+
+pci:v000015B3d0000025E*
+ ID_MODEL_FROM_DATABASE=Quantum-3CPO RMA
+
 pci:v000015B3d00000262*
  ID_MODEL_FROM_DATABASE=MT27710 [ConnectX-4 Lx Programmable] EN
 
@@ -61772,6 +62045,12 @@ pci:v000015B3d00000277*
 pci:v000015B3d00000281*
  ID_MODEL_FROM_DATABASE=NPS-600 Flash Recovery
 
+pci:v000015B3d00000282*
+ ID_MODEL_FROM_DATABASE=ArcusE Flash recovery
+
+pci:v000015B3d00000283*
+ ID_MODEL_FROM_DATABASE=ArcusE RMA
+
 pci:v000015B3d00001002*
  ID_MODEL_FROM_DATABASE=MT25400 Family [ConnectX-2 Virtual Function]
 
@@ -61992,16 +62271,16 @@ pci:v000015B3d00001017*
  ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5]
 
 pci:v000015B3d00001017sv000015B3sd00000006*
- ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5] (ConnectX®-5 EN network interface card, 100GbE single-port QSFP28, PCIe3.0 x16, tall bracket; MCX515A-CCAT)
+ ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5] (ConnectX®-5 EN network interface card, 100GbE single-port QSFP28, PCIe3.0 x16, tall bracket; MCX515A-CCAT)
 
 pci:v000015B3d00001017sv000015B3sd00000007*
- ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5] (Mellanox ConnectX®-5 MCX516A-CCAT)
+ ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5] (Mellanox ConnectX®-5 MCX516A-CCAT)
 
 pci:v000015B3d00001017sv000015B3sd00000020*
- ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5] (ConnectX®-5 EN network interface card, 10/25GbE dual-port SFP28, PCIe3.0 x8, tall bracket ; MCX512A-ACAT)
+ ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5] (ConnectX®-5 EN network interface card, 10/25GbE dual-port SFP28, PCIe3.0 x8, tall bracket ; MCX512A-ACAT)
 
 pci:v000015B3d00001017sv000015B3sd00000068*
- ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5] (ConnectX®-5 EN network interface card for OCP2.0, Type 1, with host management, 25GbE dual-port SFP28, PCIe3.0 x8, no bracket Halogen free ; MCX542B-ACAN)
+ ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5] (ConnectX®-5 EN network interface card for OCP2.0, Type 1, with host management, 25GbE dual-port SFP28, PCIe3.0 x8, no bracket Halogen free ; MCX542B-ACAN)
 
 pci:v000015B3d00001017sv0000193Dsd00001051*
  ID_MODEL_FROM_DATABASE=MT27800 Family [ConnectX-5] (NIC-IB1040i-Mb-2P)
@@ -62273,6 +62552,9 @@ pci:v000015B3d0000A2DE*
 pci:v000015B3d0000A2DF*
  ID_MODEL_FROM_DATABASE=BF4 Family integrated network controller [BlueField-4 integrated network controller]
 
+pci:v000015B3d0000B200*
+ ID_MODEL_FROM_DATABASE=ArcusE
+
 pci:v000015B3d0000C2D2*
  ID_MODEL_FROM_DATABASE=MT416842 BlueField SoC management interfac
 
@@ -62333,6 +62615,9 @@ pci:v000015B3d0000D2F2*
 pci:v000015B3d0000D2F4*
  ID_MODEL_FROM_DATABASE=Quantum-3
 
+pci:v000015B3d0000D2F6*
+ ID_MODEL_FROM_DATABASE=Quantum-3CPO
+
 pci:v000015B4*
  ID_VENDOR_FROM_DATABASE=CCI/TRIAD
 
@@ -62571,7 +62856,7 @@ pci:v000015CE*
  ID_VENDOR_FROM_DATABASE=Genrad Inc
 
 pci:v000015CF*
- ID_VENDOR_FROM_DATABASE=Hilscher Gesellschaft für Systemautomation mbH
+ ID_VENDOR_FROM_DATABASE=Hilscher Gesellschaft fÃ\83¼r Systemautomation mbH
 
 pci:v000015CFd00000000*
  ID_MODEL_FROM_DATABASE=CIFX PCI/PCIe
@@ -63957,7 +64242,7 @@ pci:v0000168Cd00000030*
  ID_MODEL_FROM_DATABASE=AR93xx Wireless Network Adapter
 
 pci:v0000168Cd00000030sv0000103Csd00001627*
- ID_MODEL_FROM_DATABASE=AR93xx Wireless Network Adapter (AR9380/HB112 802.11abgn 3Ã\973 Wi-Fi Adapter)
+ ID_MODEL_FROM_DATABASE=AR93xx Wireless Network Adapter (AR9380/HB112 802.11abgn 3Ã\83â\80\943 Wi-Fi Adapter)
 
 pci:v0000168Cd00000030sv0000106Bsd0000009A*
  ID_MODEL_FROM_DATABASE=AR93xx Wireless Network Adapter (AirPort Extreme)
@@ -63978,7 +64263,7 @@ pci:v0000168Cd00000032sv00001028sd00000208*
  ID_MODEL_FROM_DATABASE=AR9485 Wireless Network Adapter (Wireless 1506 WLAN Half Mini-Card)
 
 pci:v0000168Cd00000032sv0000103Csd00001838*
- ID_MODEL_FROM_DATABASE=AR9485 Wireless Network Adapter (AR9485/HB125 802.11bgn 1Ã\971 Wi-Fi Adapter)
+ ID_MODEL_FROM_DATABASE=AR9485 Wireless Network Adapter (AR9485/HB125 802.11bgn 1Ã\83â\80\941 Wi-Fi Adapter)
 
 pci:v0000168Cd00000032sv0000105Bsd0000E044*
  ID_MODEL_FROM_DATABASE=AR9485 Wireless Network Adapter (Unex DHXA-225)
@@ -68423,6 +68708,18 @@ pci:v000019E5d00000212sv000019E5sd0000D303*
 pci:v000019E5d00000212sv000019E5sd0000D306*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (2*8G FC) (Hi1822 SP523 (2*8G FC))
 
+pci:v000019E5d00000222*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family
+
+pci:v000019E5d00000222sv000019E5sd00000051*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (Hi1822 SP681 (2*25/10GE))
+
+pci:v000019E5d00000222sv000019E5sd00000052*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (Hi1822 SP680 (4*25/10GE))
+
+pci:v000019E5d00000222sv000019E5sd000000A1*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (Hi1822 SP670 (2*100GE))
+
 pci:v000019E5d00001710*
  ID_MODEL_FROM_DATABASE=iBMA Virtual Network Adapter
 
@@ -68486,9 +68783,15 @@ pci:v000019E5d00003754sv000019E5sd00006215*
 pci:v000019E5d0000375E*
  ID_MODEL_FROM_DATABASE=Hi1822 Family Virtual Function
 
+pci:v000019E5d0000375F*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family Virtual Function
+
 pci:v000019E5d0000379E*
  ID_MODEL_FROM_DATABASE=Hi1822 Family Virtual Function
 
+pci:v000019E5d0000379F*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family Virtual Function
+
 pci:v000019E5d0000A120*
  ID_MODEL_FROM_DATABASE=HiSilicon PCIe Root Port with Gen4
 
@@ -69314,6 +69617,9 @@ pci:v00001AF5*
 pci:v00001AFA*
  ID_VENDOR_FROM_DATABASE=J & W Electronics Co., Ltd.
 
+pci:v00001B00*
+ ID_VENDOR_FROM_DATABASE=Montage Technology Co., Ltd.
+
 pci:v00001B03*
  ID_VENDOR_FROM_DATABASE=Magnum Semiconductor, Inc,
 
@@ -69353,6 +69659,9 @@ pci:v00001B21d00000612*
 pci:v00001B21d00000612sv00001849sd00000612*
  ID_MODEL_FROM_DATABASE=ASM1062 Serial ATA Controller (Motherboard)
 
+pci:v00001B21d00000625*
+ ID_MODEL_FROM_DATABASE=106x SATA/RAID Controller
+
 pci:v00001B21d00001040*
  ID_MODEL_FROM_DATABASE=ASM1040 XHCI Controller
 
@@ -69405,10 +69714,10 @@ pci:v00001B21d00001812*
  ID_MODEL_FROM_DATABASE=ASM1812 6-Port PCIe x4 Gen2 Packet Switch
 
 pci:v00001B21d00002142*
- ID_MODEL_FROM_DATABASE=ASM2142 USB 3.1 Host Controller
+ ID_MODEL_FROM_DATABASE=ASM2142/ASM3142 USB 3.1 Host Controller
 
 pci:v00001B21d00002142sv00001462sd00007A72*
- ID_MODEL_FROM_DATABASE=ASM2142 USB 3.1 Host Controller (H270 PC MATE)
+ ID_MODEL_FROM_DATABASE=ASM2142/ASM3142 USB 3.1 Host Controller (H270 PC MATE)
 
 pci:v00001B21d00002824*
  ID_MODEL_FROM_DATABASE=ASM2824 PCIe Gen3 Packet Switch
@@ -70476,7 +70785,10 @@ pci:v00001C5Cd00001527*
  ID_MODEL_FROM_DATABASE=PC401 NVMe Solid State Drive 256GB
 
 pci:v00001C5Cd0000174A*
- ID_MODEL_FROM_DATABASE=Gold P31 SSD
+ ID_MODEL_FROM_DATABASE=PC711 NVMe Solid State Drive
+
+pci:v00001C5Cd00002204*
+ ID_MODEL_FROM_DATABASE=960GB TLC PCIe Gen3 x4 NVMe M.2 22110
 
 pci:v00001C5Cd0000243B*
  ID_MODEL_FROM_DATABASE=PE6110 NVMe Solid State Drive
@@ -70547,23 +70859,35 @@ pci:v00001C5Fd0000000Esv00001C5Fsd00000B40*
 pci:v00001C5Fd0000000Esv00001C5Fsd00000B41*
  ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6530 7680G 2.5" U.2)
 
+pci:v00001C5Fd0000000Esv00001C5Fsd00001331*
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6531 3840G 2.5" U.2)
+
+pci:v00001C5Fd0000000Esv00001C5Fsd00001341*
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6531 7680G 2.5" U.2)
+
 pci:v00001C5Fd0000000Esv00001C5Fsd00004B20*
- ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6530 1600G AIC)
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6536 1600G AIC)
 
 pci:v00001C5Fd0000000Esv00001C5Fsd00004B21*
- ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6530 1600G 2.5" U.2)
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6536 1600G 2.5" U.2)
 
 pci:v00001C5Fd0000000Esv00001C5Fsd00004B30*
- ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6530 3200G AIC)
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6536 3200G AIC)
 
 pci:v00001C5Fd0000000Esv00001C5Fsd00004B31*
- ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6530 3200G 2.5" U.2)
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6536 3200G 2.5" U.2)
 
 pci:v00001C5Fd0000000Esv00001C5Fsd00004B40*
- ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6530 6400G AIC)
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6536 6400G AIC)
 
 pci:v00001C5Fd0000000Esv00001C5Fsd00004B41*
- ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6530 6400G 2.5" U.2)
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6536 6400G 2.5" U.2)
+
+pci:v00001C5Fd0000000Esv00001C5Fsd00005331*
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6537 3200G 2.5" U.2)
+
+pci:v00001C5Fd0000000Esv00001C5Fsd00005341*
+ ID_MODEL_FROM_DATABASE=PBlaze6 6530 (NVMe SSD PBlaze6 6537 6400G 2.5" U.2)
 
 pci:v00001C5Fd0000003D*
  ID_MODEL_FROM_DATABASE=PBlaze5 920/926
@@ -70695,7 +71019,7 @@ pci:v00001CC1d00008201*
  ID_MODEL_FROM_DATABASE=XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive
 
 pci:v00001CC4*
- ID_VENDOR_FROM_DATABASE=Union Memory (Shenzhen)
+ ID_VENDOR_FROM_DATABASE=Shenzhen Unionmemory Information System Ltd.
 
 pci:v00001CC4d00001203*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series
@@ -70737,7 +71061,10 @@ pci:v00001CC5*
  ID_VENDOR_FROM_DATABASE=Embedded Intelligence, Inc.
 
 pci:v00001CC5d00000100*
- ID_MODEL_FROM_DATABASE=CAN-PCIe-02
+ ID_MODEL_FROM_DATABASE=PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1.
+
+pci:v00001CC5d00000101*
+ ID_MODEL_FROM_DATABASE=PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1.
 
 pci:v00001CC7*
  ID_VENDOR_FROM_DATABASE=Radian Memory Systems Inc.
@@ -70865,6 +71192,15 @@ pci:v00001D05*
 pci:v00001D0F*
  ID_VENDOR_FROM_DATABASE=Amazon.com, Inc.
 
+pci:v00001D0Fd00007064*
+ ID_MODEL_FROM_DATABASE=NeuronDevice (Inferentia)
+
+pci:v00001D0Fd00007164*
+ ID_MODEL_FROM_DATABASE=NeuronDevice
+
+pci:v00001D0Fd00007164sv00001D0Fsd00000000*
+ ID_MODEL_FROM_DATABASE=NeuronDevice (Trainium)
+
 pci:v00001D0Fd00008061*
  ID_MODEL_FROM_DATABASE=NVMe EBS Controller
 
@@ -71324,6 +71660,12 @@ pci:v00001D6Cd0000101E*
 pci:v00001D6Cd0000101F*
  ID_MODEL_FROM_DATABASE=AR-TK242 [2x100GbE Packet Capture Device]
 
+pci:v00001D6Cd00001020*
+ ID_MODEL_FROM_DATABASE=AR-GP-PF [General-Purpose Physical Function]
+
+pci:v00001D6Cd00001021*
+ ID_MODEL_FROM_DATABASE=AR-MGMT-PF [Board-Generic Management Physical Function]
+
 pci:v00001D6Cd00004200*
  ID_MODEL_FROM_DATABASE=A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
 
@@ -71372,6 +71714,138 @@ pci:v00001D78d00001512sv00001D78sd00003105*
 pci:v00001D78d00001512sv00001D78sd00003107*
  ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5457 U.2 6.4TB NVMe SSD)
 
+pci:v00001D78d00001512sv00001D78sd00005003*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5447 HHHL 1.6TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005004*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5427 HHHL 1.92TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005005*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5447 HHHL 3.2TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005006*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5427 HHHL 3.84TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005007*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5447 HHHL 6.4TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005008*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5427 HHHL 7.68TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005103*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5447 U.2 1.6TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005105*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5447 U.2 3.2TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005106*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (AF3UP34DTCUN3T8B SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005107*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5447 U.2 6.4TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005114*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5427 U.2 1.92TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005116*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5427 U.2 3.84TB NVMe SSD)
+
+pci:v00001D78d00001512sv00001D78sd00005118*
+ ID_MODEL_FROM_DATABASE=TAI NVMe Controller (D5427 U.2 7.68TB NVMe SSD)
+
+pci:v00001D78d00001513*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller
+
+pci:v00001D78d00001513sv00001D78sd00006015*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6456 HHHL 3.2TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006016*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6436 HHHL 3.84TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006017*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6456 HHHL 6.4TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006018*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6436 HHHL 7.68TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006105*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6457 U.2 3.2TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006106*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6437 U.2 3.84TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006107*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6457 U.2 6.4TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006108*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6437 U.2 7.68TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006115*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6456 U.2 3.2TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006116*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6436 U.2 3.84TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006117*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6456 U.2 6.4TB NVMe SSD)
+
+pci:v00001D78d00001513sv00001D78sd00006118*
+ ID_MODEL_FROM_DATABASE=DERA MENG NVMe Controller (D6436 U.2 7.68TB NVMe SSD)
+
+pci:v00001D78d00001515*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller
+
+pci:v00001D78d00001515sv00001D78sd00007002*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7436 HHHL 1.92TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007003*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7456 HHHL 1.6TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007004*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7436 HHHL 3.84TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007005*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7456 HHHL 3.2TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007007*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7456 HHHL 6.4TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007008*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7436 HHHL 7.68TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007009*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7456 HHHL 12.8TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd0000700A*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7436 HHHL 15.36TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007102*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7436 U.2 15mm 1.92TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007103*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7456 U.2 15mm 1.6TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007104*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7436 U.2 15mm 3.84TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007105*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7456 U.2 15mm 3.2TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007107*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7456 U.2 15mm 6.4TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007108*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7436 U.2 15mm 7.68TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd00007109*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7456 U.2 15mm 12.8TB NVMe SSD)
+
+pci:v00001D78d00001515sv00001D78sd0000710A*
+ ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (D7436 U.2 15mm 15.36TB NVMe SSD)
+
+pci:v00001D79*
+ ID_VENDOR_FROM_DATABASE=Transcend Information, Inc.
+
 pci:v00001D7C*
  ID_VENDOR_FROM_DATABASE=Aerotech, Inc.
 
@@ -71546,12 +72020,18 @@ pci:v00001DA3*
 pci:v00001DA3d00000001*
  ID_MODEL_FROM_DATABASE=HL-1000 AI Inference Accelerator [Goya]
 
+pci:v00001DA3d00000030*
+ ID_MODEL_FROM_DATABASE=Greco AI Inference Accelerator
+
 pci:v00001DA3d00001000*
  ID_MODEL_FROM_DATABASE=HL-2000 AI Training Accelerator [Gaudi]
 
 pci:v00001DA3d00001010*
  ID_MODEL_FROM_DATABASE=HL-2000 AI Training Accelerator [Gaudi secured]
 
+pci:v00001DA3d00001020*
+ ID_MODEL_FROM_DATABASE=Gaudi2 AI Training Accelerator
+
 pci:v00001DA8*
  ID_VENDOR_FROM_DATABASE=Corigine, Inc.
 
@@ -72158,6 +72638,9 @@ pci:v00001DFCd00001181*
 pci:v00001E0F*
  ID_VENDOR_FROM_DATABASE=KIOXIA Corporation
 
+pci:v00001E0Fd00000001*
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller BG4
+
 pci:v00001E0Fd00000007*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller Cx6
 
@@ -72518,6 +73001,9 @@ pci:v00001E3Bd00001098sv00001E3Bsd00000091*
 pci:v00001E3D*
  ID_VENDOR_FROM_DATABASE=Burlywood, Inc
 
+pci:v00001E44*
+ ID_VENDOR_FROM_DATABASE=Valve Software
+
 pci:v00001E49*
  ID_VENDOR_FROM_DATABASE=Yangtze Memory Technologies Co.,Ltd
 
@@ -72557,6 +73043,9 @@ pci:v00001E4Cd00000010*
 pci:v00001E4Cd00000010sv00001E4Csd00000120*
  ID_MODEL_FROM_DATABASE=APU [Leda] (SE120)
 
+pci:v00001E50*
+ ID_VENDOR_FROM_DATABASE=IP3 Tech (HK) Limited
+
 pci:v00001E57*
  ID_VENDOR_FROM_DATABASE=Beijing Panyi Technology Co., Ltd
 
@@ -72587,6 +73076,12 @@ pci:v00001E60*
 pci:v00001E60d00002864*
  ID_MODEL_FROM_DATABASE=Hailo-8 AI Processor
 
+pci:v00001E67*
+ ID_VENDOR_FROM_DATABASE=Untether AI
+
+pci:v00001E67d00000002*
+ ID_MODEL_FROM_DATABASE=runAI200 AI Inference Accelerator
+
 pci:v00001E68*
  ID_VENDOR_FROM_DATABASE=Jiangsu Xinsheng Intelligent Technology Co., Ltd
 
@@ -72615,25 +73110,25 @@ pci:v00001E81d00001203sv00001E81sd0000A122*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 1920GB)
 
 pci:v00001E81d00001203sv00001E81sd0000A123*
- ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 3840GB)
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 3840GBÂ)
 
 pci:v00001E81d00001203sv00001E81sd0000A124*
- ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 7680GB)
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 7680GBÂ)
 
 pci:v00001E81d00001203sv00001E81sd0000A125*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 15360GB)
 
 pci:v00001E81d00001203sv00001E81sd0000A211*
- ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 800GBÂ)
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 800GBÃ\83â\80\9aÃ\82)
 
 pci:v00001E81d00001203sv00001E81sd0000A212*
- ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 1600GB)
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 1600GBÂ)
 
 pci:v00001E81d00001203sv00001E81sd0000A213*
- ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 3200GB)
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 3200GBÂ)
 
 pci:v00001E81d00001203sv00001E81sd0000A214*
- ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 6400GB)
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller UHXXXa series (NVMe SSD UHXXXa series U.2 6400GBÂ)
 
 pci:v00001E85*
  ID_VENDOR_FROM_DATABASE=Heitec AG
@@ -72647,6 +73142,9 @@ pci:v00001E89d00000002*
 pci:v00001E89d00000003*
  ID_MODEL_FROM_DATABASE=Quantis-PCIe-240M
 
+pci:v00001E93*
+ ID_VENDOR_FROM_DATABASE=Beijing Bytedance Network Technology Co., Ltd.
+
 pci:v00001E94*
  ID_VENDOR_FROM_DATABASE=Calian SED
 
@@ -72719,6 +73217,9 @@ pci:v00001EBD*
 pci:v00001EBDd00000101*
  ID_MODEL_FROM_DATABASE=Seirios 2063 Video Codec
 
+pci:v00001EC9*
+ ID_VENDOR_FROM_DATABASE=Wingtech Group(HongKong)Limited
+
 pci:v00001ED2*
  ID_VENDOR_FROM_DATABASE=FuriosaAI, Inc.
 
@@ -72758,6 +73259,36 @@ pci:v00001ED5d00000122*
 pci:v00001ED5d00000123*
  ID_MODEL_FROM_DATABASE=MTT S2000
 
+pci:v00001ED5d000001FF*
+ ID_MODEL_FROM_DATABASE=MTT HDMI/DP Audio
+
+pci:v00001ED5d00000201*
+ ID_MODEL_FROM_DATABASE=G2D30
+
+pci:v00001ED5d00000202*
+ ID_MODEL_FROM_DATABASE=G2D20
+
+pci:v00001ED5d00000203*
+ ID_MODEL_FROM_DATABASE=G2D10
+
+pci:v00001ED5d00000211*
+ ID_MODEL_FROM_DATABASE=G2D40
+
+pci:v00001ED5d00000221*
+ ID_MODEL_FROM_DATABASE=G2S80
+
+pci:v00001ED5d00000222*
+ ID_MODEL_FROM_DATABASE=G2S85
+
+pci:v00001ED5d00000223*
+ ID_MODEL_FROM_DATABASE=G2S4
+
+pci:v00001ED5d00000251*
+ ID_MODEL_FROM_DATABASE=G2N10
+
+pci:v00001ED5d000002FF*
+ ID_MODEL_FROM_DATABASE=MTT HDMI/DP Audio
+
 pci:v00001ED8*
  ID_VENDOR_FROM_DATABASE=Digiteq Automotive
 
@@ -72767,6 +73298,9 @@ pci:v00001ED8d00000101*
 pci:v00001ED9*
  ID_VENDOR_FROM_DATABASE=Myrtle.ai
 
+pci:v00001EE4*
+ ID_VENDOR_FROM_DATABASE=PETAiO, Inc
+
 pci:v00001EE9*
  ID_VENDOR_FROM_DATABASE=SUSE LLC
 
@@ -72782,59 +73316,23 @@ pci:v00001EECd00001EEC*
 pci:v00001EED*
  ID_VENDOR_FROM_DATABASE=XDX Computing Technology Ltd.
 
-pci:v00001EEDd00001100*
+pci:v00001EEDd000010A0*
  ID_MODEL_FROM_DATABASE=XDX110 Graphic/VGA Controller
 
-pci:v00001EEDd00001101*
+pci:v00001EEDd000010A1*
  ID_MODEL_FROM_DATABASE=XDX110 Audio Controller
 
-pci:v00001EEDd00001200*
+pci:v00001EEDd00001140*
  ID_MODEL_FROM_DATABASE=XDX120 Graphic/VGA Controller
 
-pci:v00001EEDd00001201*
+pci:v00001EEDd00001141*
  ID_MODEL_FROM_DATABASE=XDX120 Audio Controller
 
-pci:v00001EEDd00001300*
- ID_MODEL_FROM_DATABASE=XDX130 Graphic/VGA Controller
-
-pci:v00001EEDd00001301*
- ID_MODEL_FROM_DATABASE=XDX130 Audio Controller
-
-pci:v00001EEDd00001400*
- ID_MODEL_FROM_DATABASE=XDX140 Graphic/VGA Controller
-
-pci:v00001EEDd00001401*
- ID_MODEL_FROM_DATABASE=XDX140 Audio Controller
-
-pci:v00001EEDd00001500*
- ID_MODEL_FROM_DATABASE=XDX150 Graphic/VGA Controller
-
-pci:v00001EEDd00001501*
- ID_MODEL_FROM_DATABASE=XDX150 Audio Controller
+pci:v00001EF6*
+ ID_VENDOR_FROM_DATABASE=GrAI Matter Labs
 
-pci:v00001EEDd00001600*
- ID_MODEL_FROM_DATABASE=XDX160 Graphic/VGA Controller
-
-pci:v00001EEDd00001601*
- ID_MODEL_FROM_DATABASE=XDX160 Audio Controller
-
-pci:v00001EEDd00001700*
- ID_MODEL_FROM_DATABASE=XDX170 Graphic/VGA Controller
-
-pci:v00001EEDd00001701*
- ID_MODEL_FROM_DATABASE=XDX170 Audio Controller
-
-pci:v00001EEDd00001800*
- ID_MODEL_FROM_DATABASE=XDX180 Graphic/VGA Controller
-
-pci:v00001EEDd00001801*
- ID_MODEL_FROM_DATABASE=XDX180 Audio Controller
-
-pci:v00001EEDd00001900*
- ID_MODEL_FROM_DATABASE=XDX190 Graphic/VGA Controller
-
-pci:v00001EEDd00001901*
- ID_MODEL_FROM_DATABASE=XDX190 Audio Controller
+pci:v00001EF7*
+ ID_VENDOR_FROM_DATABASE=Shenzhen Gunnir Technology Development Co., Ltd
 
 pci:v00001EFB*
  ID_VENDOR_FROM_DATABASE=Flexxon Pte Ltd
@@ -73004,9 +73502,24 @@ pci:v00001F3Fd00009032sv00001F3Fsd000000A1*
 pci:v00001F40*
  ID_VENDOR_FROM_DATABASE=Netac Technology Co.,Ltd
 
+pci:v00001F44*
+ ID_VENDOR_FROM_DATABASE=VVDN Technologies Private Limited
+
+pci:v00001F4B*
+ ID_VENDOR_FROM_DATABASE=Axera Semiconductor Co., Ltd
+
+pci:v00001F52*
+ ID_VENDOR_FROM_DATABASE=MangoBoost Inc.
+
 pci:v00001FAA*
  ID_VENDOR_FROM_DATABASE=Hexaflake (Shanghai) Information Technology Co., Ltd.
 
+pci:v00001FAAd00000C10*
+ ID_MODEL_FROM_DATABASE=Compass C10 PF
+
+pci:v00001FAAd00000C11*
+ ID_MODEL_FROM_DATABASE=Compass C10 VF
+
 pci:v00001FAB*
  ID_VENDOR_FROM_DATABASE=Unifabrix Ltd.
 
@@ -76151,6 +76664,9 @@ pci:v00008086d0000061F*
 pci:v00008086d00000684*
  ID_MODEL_FROM_DATABASE=H470 Chipset LPC/eSPI Controller
 
+pci:v00008086d00000685*
+ ID_MODEL_FROM_DATABASE=Z490 Chipset LPC/eSPI Controller
+
 pci:v00008086d00000687*
  ID_MODEL_FROM_DATABASE=Q470 Chipset LPC/eSPI Controller
 
@@ -76181,6 +76697,12 @@ pci:v00008086d000006AC*
 pci:v00008086d000006B0*
  ID_MODEL_FROM_DATABASE=Comet Lake PCI Express Root Port #9
 
+pci:v00008086d000006BA*
+ ID_MODEL_FROM_DATABASE=Comet Lake PCI Express Root Port #1
+
+pci:v00008086d000006BB*
+ ID_MODEL_FROM_DATABASE=Comet Lake PCI Express Root Port #4
+
 pci:v00008086d000006BD*
  ID_MODEL_FROM_DATABASE=Comet Lake PCIe Port #6
 
@@ -77033,6 +77555,27 @@ pci:v00008086d00000962*
 pci:v00008086d00000964*
  ID_MODEL_FROM_DATABASE=80960RP (i960RP) Microprocessor/Bridge
 
+pci:v00008086d00000998*
+ ID_MODEL_FROM_DATABASE=Ice Lake IEH
+
+pci:v00008086d000009A2*
+ ID_MODEL_FROM_DATABASE=Ice Lake Memory Map/VT-d
+
+pci:v00008086d000009A3*
+ ID_MODEL_FROM_DATABASE=Ice Lake RAS
+
+pci:v00008086d000009A4*
+ ID_MODEL_FROM_DATABASE=Ice Lake Mesh 2 PCIe
+
+pci:v00008086d000009A6*
+ ID_MODEL_FROM_DATABASE=Ice Lake MSM
+
+pci:v00008086d000009A7*
+ ID_MODEL_FROM_DATABASE=Ice Lake PMON MSM
+
+pci:v00008086d000009AB*
+ ID_MODEL_FROM_DATABASE=RST VMD Managed Controller
+
 pci:v00008086d00000A03*
  ID_MODEL_FROM_DATABASE=Haswell-ULT Thermal Subsystem
 
@@ -77252,6 +77795,9 @@ pci:v00008086d00000A55sv00001028sd00001FE8*
 pci:v00008086d00000A55sv00001028sd00001FE9*
  ID_MODEL_FROM_DATABASE=NVMe DC SSD [3DNAND, Beta Rock Controller] (Express Flash NVMe 4.0TB HHHL AIC (P4600))
 
+pci:v00008086d00000B00*
+ ID_MODEL_FROM_DATABASE=Ice Lake CBDMA [QuickData Technology]
+
 pci:v00008086d00000B26*
  ID_MODEL_FROM_DATABASE=Thunderbolt 4 Bridge [Goshen Ridge 2020]
 
@@ -77669,6 +78215,9 @@ pci:v00008086d00000DDA*
 pci:v00008086d00000DDAsv00001BD4sd00000076*
  ID_MODEL_FROM_DATABASE=Ethernet Connection X722 for 10GbE SFP+ (Ethernet Connection F102IX722 for 10GbE SFP)
 
+pci:v00008086d00000DDAsv00001BD4sd00000082*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection X722 for 10GbE SFP+ (Ethernet Connection F102IX722 for 10GbE SFP)
+
 pci:v00008086d00000E00*
  ID_MODEL_FROM_DATABASE=Xeon E7 v2/Xeon E5 v2/Core i7 DMI2
 
@@ -80756,6 +81305,9 @@ pci:v00008086d00001521sv00001BD4sd00000035*
 pci:v00008086d00001521sv00001BD4sd00000066*
  ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (F014I350)
 
+pci:v00008086d00001521sv00001BD4sd0000008A*
+ ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (F012I350)
+
 pci:v00008086d00001521sv00008086sd00000001*
  ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (Ethernet Server Adapter I350-T4)
 
@@ -80978,6 +81530,12 @@ pci:v00008086d00001533sv000010A9sd0000802D*
 pci:v00008086d00001533sv000017AAsd00001100*
  ID_MODEL_FROM_DATABASE=I210 Gigabit Network Connection (ThinkServer Ethernet Server Adapter)
 
+pci:v00008086d00001533sv000017AAsd00001509*
+ ID_MODEL_FROM_DATABASE=I210 Gigabit Network Connection
+
+pci:v00008086d00001533sv000017AAsd0000404D*
+ ID_MODEL_FROM_DATABASE=I210 Gigabit Network Connection (I210 PCIe 1Gb 1-Port RJ45 LOM)
+
 pci:v00008086d00001533sv00008086sd00000001*
  ID_MODEL_FROM_DATABASE=I210 Gigabit Network Connection (Ethernet Server Adapter I210-T1)
 
@@ -81293,6 +81851,9 @@ pci:v00008086d00001572sv00001BD4sd00000065*
 pci:v00008086d00001572sv00001BD4sd00000074*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Network Adapter X710-BM2 for lldp)
 
+pci:v00008086d00001572sv00001BD4sd0000008B*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (F102IX710)
+
 pci:v00008086d00001572sv00008086sd00000000*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710)
 
@@ -81644,12 +82205,18 @@ pci:v00008086d0000158Bsv00008086sd00000009*
 pci:v00008086d0000158Bsv00008086sd0000000A*
  ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Ethernet 25G 2P XXV710 OCP)
 
+pci:v00008086d0000158Bsv00008086sd0000000D*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Ethernet 25G 2P XXV710 OCP)
+
 pci:v00008086d0000158Bsv00008086sd00004001*
  ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Ethernet Network Adapter XXV710-2)
 
 pci:v00008086d00001591*
  ID_MODEL_FROM_DATABASE=Ethernet Controller E810-C for backplane
 
+pci:v00008086d00001591sv00008086sd0000BCCE*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller E810-C for backplane (Ethernet Controller E810-C for Intel(R) Open FPGA Stack)
+
 pci:v00008086d00001592*
  ID_MODEL_FROM_DATABASE=Ethernet Controller E810-C for QSFP
 
@@ -81782,8 +82349,11 @@ pci:v00008086d0000159Bsv00001BD4sd00000058*
 pci:v00008086d0000159Bsv00001BD4sd0000006E*
  ID_MODEL_FROM_DATABASE=Ethernet Controller E810-XXV for SFP (Ethernet Network Adapter E810-XXVAM2 for BD)
 
+pci:v00008086d0000159Bsv00001BD4sd00000083*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller E810-XXV for SFP (Ethernet Network Adapter E810-XXVAM2 for lldp)
+
 pci:v00008086d0000159Bsv00001EECsd00000102*
- ID_MODEL_FROM_DATABASE=Ethernet Controller E810-XXV for SFP (VSE250241E Dual-port 10Gb/25Gb Ethernet PCIe)
+ ID_MODEL_FROM_DATABASE=Ethernet Controller E810-XXV for SFP (VSE-225-41E Dual-port 10Gb/25Gb Etherent PCIe)
 
 pci:v00008086d0000159Bsv00008086sd00000001*
  ID_MODEL_FROM_DATABASE=Ethernet Controller E810-XXV for SFP (Ethernet 25G 2P E810-XXV OCP)
@@ -82286,6 +82856,9 @@ pci:v00008086d0000188B*
 pci:v00008086d0000188C*
  ID_MODEL_FROM_DATABASE=Ethernet Connection E823-C for SFP
 
+pci:v00008086d0000188Csv00001028sd00000ABD*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection E823-C for SFP (Ethernet Connection 25G 4P E823-C LOM)
+
 pci:v00008086d0000188D*
  ID_MODEL_FROM_DATABASE=Ethernet Connection E823-C/X557-AT 10GBASE-T
 
@@ -82397,6 +82970,9 @@ pci:v00008086d00001908*
 pci:v00008086d00001909*
  ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x4)
 
+pci:v00008086d0000190B*
+ ID_MODEL_FROM_DATABASE=HD Graphics 510
+
 pci:v00008086d0000190C*
  ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
 
@@ -82496,6 +83072,9 @@ pci:v00008086d0000191F*
 pci:v00008086d00001921*
  ID_MODEL_FROM_DATABASE=HD Graphics 520
 
+pci:v00008086d00001923*
+ ID_MODEL_FROM_DATABASE=HD Graphics 535
+
 pci:v00008086d00001926*
  ID_MODEL_FROM_DATABASE=Iris Graphics 540
 
@@ -88098,7 +88677,7 @@ pci:v00008086d00002723*
  ID_MODEL_FROM_DATABASE=Wi-Fi 6 AX200
 
 pci:v00008086d00002723sv00001A56sd00001654*
- ID_MODEL_FROM_DATABASE=Wi-Fi 6 AX200 (Killerâ\84¢ Wi-Fi 6 AX1650x (AX200NGW))
+ ID_MODEL_FROM_DATABASE=Wi-Fi 6 AX200 (Killerââ\80\9e¢ Wi-Fi 6 AX1650x (AX200NGW))
 
 pci:v00008086d00002723sv00008086sd00000084*
  ID_MODEL_FROM_DATABASE=Wi-Fi 6 AX200 (NGW)
@@ -92891,6 +93470,15 @@ pci:v00008086d00003433*
 pci:v00008086d00003438*
  ID_MODEL_FROM_DATABASE=7500/5520/5500/X58 I/O Hub Throttle Registers
 
+pci:v00008086d00003440*
+ ID_MODEL_FROM_DATABASE=Ice Lake UPI Misc
+
+pci:v00008086d00003441*
+ ID_MODEL_FROM_DATABASE=Ice Lake UPI Link/Phy0
+
+pci:v00008086d00003456*
+ ID_MODEL_FROM_DATABASE=Ice Lake NorthPeak
+
 pci:v00008086d0000347E*
  ID_MODEL_FROM_DATABASE=Ice Lake Xeon Non-Transparent Bridge
 
@@ -94847,24 +95435,45 @@ pci:v00008086d00003E92sv00001028sd00000869*
 pci:v00008086d00003E93*
  ID_MODEL_FROM_DATABASE=CoffeeLake-S GT1 [UHD Graphics 610]
 
+pci:v00008086d00003E94*
+ ID_MODEL_FROM_DATABASE=Coffee Lake-S GT2 [UHD Graphics P630]
+
 pci:v00008086d00003E96*
  ID_MODEL_FROM_DATABASE=CoffeeLake-S GT2 [UHD Graphics P630]
 
 pci:v00008086d00003E98*
  ID_MODEL_FROM_DATABASE=CoffeeLake-S GT2 [UHD Graphics 630]
 
+pci:v00008086d00003E9A*
+ ID_MODEL_FROM_DATABASE=Coffee Lake-S GT2 [UHD Graphics P630]
+
 pci:v00008086d00003E9B*
  ID_MODEL_FROM_DATABASE=CoffeeLake-H GT2 [UHD Graphics 630]
 
+pci:v00008086d00003E9C*
+ ID_MODEL_FROM_DATABASE=Coffee Lake-S GT1 [UHD Graphics 610]
+
 pci:v00008086d00003EA0*
  ID_MODEL_FROM_DATABASE=WhiskeyLake-U GT2 [UHD Graphics 620]
 
 pci:v00008086d00003EA0sv00001028sd0000089E*
  ID_MODEL_FROM_DATABASE=WhiskeyLake-U GT2 [UHD Graphics 620] (Inspiron 5482)
 
+pci:v00008086d00003EA1*
+ ID_MODEL_FROM_DATABASE=Whiskey Lake-U GT1 [UHD Graphics 610]
+
 pci:v00008086d00003EA5*
  ID_MODEL_FROM_DATABASE=CoffeeLake-U GT3e [Iris Plus Graphics 655]
 
+pci:v00008086d00003EA6*
+ ID_MODEL_FROM_DATABASE=Coffee Lake-U GT3 [Iris Plus Graphics 645]
+
+pci:v00008086d00003EA8*
+ ID_MODEL_FROM_DATABASE=Coffee Lake-U GT3 [Iris Plus Graphics 655]
+
+pci:v00008086d00003EA9*
+ ID_MODEL_FROM_DATABASE=Coffee Lake-U GT2 [UHD Graphics 620]
+
 pci:v00008086d00003EC2*
  ID_MODEL_FROM_DATABASE=8th Gen Core Processor Host Bridge/DRAM Registers
 
@@ -95300,6 +95909,9 @@ pci:v00008086d000043E0*
 pci:v00008086d000043E8*
  ID_MODEL_FROM_DATABASE=Tiger Lake-H Serial IO I2C Controller #0
 
+pci:v00008086d000043E9*
+ ID_MODEL_FROM_DATABASE=Tiger Lake-H Serial IO I2C Controller #1
+
 pci:v00008086d000043ED*
  ID_MODEL_FROM_DATABASE=Tiger Lake-H USB 3.2 Gen 2x1 xHCI Host Controller
 
@@ -95321,9 +95933,18 @@ pci:v00008086d000043F0sv00008086sd00000264*
 pci:v00008086d000043F0sv00008086sd000002A4*
  ID_MODEL_FROM_DATABASE=Tiger Lake PCH CNVi WiFi (Wireless-AC 9462)
 
+pci:v00008086d000043FC*
+ ID_MODEL_FROM_DATABASE=Tiger Lake-H Integrated Sensor Hub
+
 pci:v00008086d0000444E*
  ID_MODEL_FROM_DATABASE=Turbo Memory Controller
 
+pci:v00008086d00004555*
+ ID_MODEL_FROM_DATABASE=Elkhart Lake [UHD Graphics Gen11 16EU]
+
+pci:v00008086d00004571*
+ ID_MODEL_FROM_DATABASE=Elkhart Lake [UHD Graphics Gen11 32EU]
+
 pci:v00008086d0000460D*
  ID_MODEL_FROM_DATABASE=12th Gen Core Processor PCI Express x16 Controller #1
 
@@ -95339,6 +95960,9 @@ pci:v00008086d0000461F*
 pci:v00008086d00004626*
  ID_MODEL_FROM_DATABASE=Alder Lake-P Integrated Graphics Controller
 
+pci:v00008086d00004628*
+ ID_MODEL_FROM_DATABASE=Alder Lake-UP3 GT2 [UHD Graphics]
+
 pci:v00008086d00004629*
  ID_MODEL_FROM_DATABASE=12th Gen Core Processor Host Bridge/DRAM Registers
 
@@ -95366,6 +95990,9 @@ pci:v00008086d0000464F*
 pci:v00008086d00004660*
  ID_MODEL_FROM_DATABASE=12th Gen Core Processor Host Bridge/DRAM Registers
 
+pci:v00008086d00004668*
+ ID_MODEL_FROM_DATABASE=12th Gen Core Processor Host Bridge/DRAM Registers
+
 pci:v00008086d0000466D*
  ID_MODEL_FROM_DATABASE=Alder Lake-P Thunderbolt 4 NHI #1
 
@@ -95381,6 +96008,27 @@ pci:v00008086d0000467F*
 pci:v00008086d00004680*
  ID_MODEL_FROM_DATABASE=AlderLake-S GT1
 
+pci:v00008086d00004682*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S GT1 [UHD Graphics 730]
+
+pci:v00008086d00004688*
+ ID_MODEL_FROM_DATABASE=Alder Lake-HX GT1 [UHD Graphics 770]
+
+pci:v00008086d0000468A*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S [UHD Graphics]
+
+pci:v00008086d0000468B*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S [UHD Graphics]
+
+pci:v00008086d00004690*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S GT1 [UHD Graphics 770]
+
+pci:v00008086d00004692*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S GT1 [UHD Graphics 730]
+
+pci:v00008086d00004693*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S GT1 [UHD Graphics 710]
+
 pci:v00008086d000046A0*
  ID_MODEL_FROM_DATABASE=AlderLake-P GT2
 
@@ -95393,9 +96041,21 @@ pci:v00008086d000046A3*
 pci:v00008086d000046A6*
  ID_MODEL_FROM_DATABASE=Alder Lake-P Integrated Graphics Controller
 
+pci:v00008086d000046A8*
+ ID_MODEL_FROM_DATABASE=Alder Lake-UP3 GT2 [Iris Xe Graphics]
+
+pci:v00008086d000046AA*
+ ID_MODEL_FROM_DATABASE=Alder Lake-UP4 GT2 [Iris Xe Graphics]
+
+pci:v00008086d000046B3*
+ ID_MODEL_FROM_DATABASE=Alder Lake-UP3 GT1 [UHD Graphics]
+
 pci:v00008086d000046C0*
  ID_MODEL_FROM_DATABASE=AlderLake-M GT1
 
+pci:v00008086d000046C3*
+ ID_MODEL_FROM_DATABASE=Alder Lake-UP4 GT1 [UHD Graphics]
+
 pci:v00008086d00004905*
  ID_MODEL_FROM_DATABASE=DG1 [Iris Xe MAX Graphics]
 
@@ -95411,6 +96071,9 @@ pci:v00008086d00004907sv0000193Dsd00004000*
 pci:v00008086d00004908*
  ID_MODEL_FROM_DATABASE=DG1 [Iris Xe Graphics]
 
+pci:v00008086d00004909*
+ ID_MODEL_FROM_DATABASE=DG1 [UHD Discrete Graphics]
+
 pci:v00008086d00004C3D*
  ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller
 
@@ -95702,6 +96365,48 @@ pci:v00008086d0000530D*
 pci:v00008086d00005502*
  ID_MODEL_FROM_DATABASE=Ethernet Controller (2) I225-LMvP
 
+pci:v00008086d00005502sv00001AB6sd00000225*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller (2) I225-LMvP (TS4 On-Board 2.5GbE Ethernet Adaptor)
+
+pci:v00008086d00005690*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A770M]
+
+pci:v00008086d00005691*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A730M]
+
+pci:v00008086d00005692*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A550M]
+
+pci:v00008086d00005693*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A370M]
+
+pci:v00008086d00005694*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A350M]
+
+pci:v00008086d00005695*
+ ID_MODEL_FROM_DATABASE=DG2 [Iris Xe MAX A200M]
+
+pci:v00008086d000056A0*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A770]
+
+pci:v00008086d000056A1*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A750]
+
+pci:v00008086d000056A2*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A580]
+
+pci:v00008086d000056A5*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A380]
+
+pci:v00008086d000056A6*
+ ID_MODEL_FROM_DATABASE=DG2 [Arc A310]
+
+pci:v00008086d000056C0*
+ ID_MODEL_FROM_DATABASE=Data Center GPU Flex 170
+
+pci:v00008086d000056C1*
+ ID_MODEL_FROM_DATABASE=Data Center GPU Flex 140
+
 pci:v00008086d00005845*
  ID_MODEL_FROM_DATABASE=QEMU NVM Express Controller
 
@@ -95732,9 +96437,15 @@ pci:v00008086d00005904sv000017AAsd0000224F*
 pci:v00008086d00005905*
  ID_MODEL_FROM_DATABASE=Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x8)
 
+pci:v00008086d00005906*
+ ID_MODEL_FROM_DATABASE=HD Graphics 610
+
 pci:v00008086d00005909*
  ID_MODEL_FROM_DATABASE=Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x4)
 
+pci:v00008086d0000590B*
+ ID_MODEL_FROM_DATABASE=HD Graphics 610
+
 pci:v00008086d0000590C*
  ID_MODEL_FROM_DATABASE=Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
 
@@ -95801,6 +96512,9 @@ pci:v00008086d0000591E*
 pci:v00008086d0000591F*
  ID_MODEL_FROM_DATABASE=Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
 
+pci:v00008086d00005921*
+ ID_MODEL_FROM_DATABASE=HD Graphics 620
+
 pci:v00008086d00005923*
  ID_MODEL_FROM_DATABASE=HD Graphics 635
 
@@ -95811,7 +96525,7 @@ pci:v00008086d00005927*
  ID_MODEL_FROM_DATABASE=Iris Plus Graphics 650
 
 pci:v00008086d00005A84*
- ID_MODEL_FROM_DATABASE=Celeron N3350/Pentium N4200/Atom E3900 Series Integrated Graphics Controller
+ ID_MODEL_FROM_DATABASE=Apollo Lake [HD Graphics 505]
 
 pci:v00008086d00005A85*
  ID_MODEL_FROM_DATABASE=HD Graphics 500
@@ -96794,6 +97508,15 @@ pci:v00008086d00007AA4*
 pci:v00008086d00007AA7*
  ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Shared SRAM
 
+pci:v00008086d00007AA8*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Serial IO UART #0
+
+pci:v00008086d00007AAB*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Serial IO SPI Controller #1
+
+pci:v00008086d00007AB0*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH PCI Express Root Port #9
+
 pci:v00008086d00007AB4*
  ID_MODEL_FROM_DATABASE=Alder Lake-S PCH PCI Express Root Port #13
 
@@ -96809,8 +97532,20 @@ pci:v00008086d00007ABC*
 pci:v00008086d00007ABD*
  ID_MODEL_FROM_DATABASE=Alder Lake-S PCH PCI Express Root Port #6
 
+pci:v00008086d00007ABF*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH PCI Express Root Port #8
+
 pci:v00008086d00007ACC*
- ID_MODEL_FROM_DATABASE=Alder Lake-S PCH I2C Controller #0
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Serial IO I2C Controller #0
+
+pci:v00008086d00007ACD*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Serial IO I2C Controller #1
+
+pci:v00008086d00007ACE*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Serial IO I2C Controller #2
+
+pci:v00008086d00007ACF*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Serial IO I2C Controller #3
 
 pci:v00008086d00007AD0*
  ID_MODEL_FROM_DATABASE=Alder Lake-S HD Audio Controller
@@ -96827,9 +97562,102 @@ pci:v00008086d00007AE8*
 pci:v00008086d00007AF0*
  ID_MODEL_FROM_DATABASE=Alder Lake-S PCH CNVi WiFi
 
+pci:v00008086d00007AF0sv00008086sd00000034*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH CNVi WiFi (Wireless-AC 9560)
+
+pci:v00008086d00007AF0sv00008086sd00000070*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH CNVi WiFi (Wi-Fi 6 AX201 160MHz)
+
 pci:v00008086d00007AF0sv00008086sd00000094*
  ID_MODEL_FROM_DATABASE=Alder Lake-S PCH CNVi WiFi (Wi-Fi 6 AX201 160MHz)
 
+pci:v00008086d00007AFC*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Serial IO I2C Controller #4
+
+pci:v00008086d00007AFD*
+ ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Serial IO I2C Controller #5
+
+pci:v00008086d00007D0B*
+ ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller Intel Corporation
+
+pci:v00008086d00007E01*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P LPC/eSPI Controller
+
+pci:v00008086d00007E22*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P SMBus Controller
+
+pci:v00008086d00007E23*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P SPI Controller
+
+pci:v00008086d00007E24*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Trace Hub
+
+pci:v00008086d00007E25*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO UART Controller #0
+
+pci:v00008086d00007E26*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO UART Controller #1
+
+pci:v00008086d00007E27*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO SPI Controller #0
+
+pci:v00008086d00007E28*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P HD Audio Controller
+
+pci:v00008086d00007E30*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO SPI Controller #1
+
+pci:v00008086d00007E46*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO SPI Controller #2
+
+pci:v00008086d00007E50*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO I2C Controller #4
+
+pci:v00008086d00007E51*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO I2C Controller #5
+
+pci:v00008086d00007E52*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO UART Controller #2
+
+pci:v00008086d00007E78*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO I2C Controller #0
+
+pci:v00008086d00007E79*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO I2C Controller #1
+
+pci:v00008086d00007E7A*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO I2C Controller #2
+
+pci:v00008086d00007E7B*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO I2C Controller #3
+
+pci:v00008086d00007E7D*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P USB 3.2 Gen 2x1 xHCI Host Controller
+
+pci:v00008086d00007E7E*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P USB Device Controller
+
+pci:v00008086d00007EC0*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Thunderbolt 4 USB Controller
+
+pci:v00008086d00007EC2*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Thunderbolt 4 NHI #0
+
+pci:v00008086d00007EC3*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Thunderbolt 4 NHI #1
+
+pci:v00008086d00007EC4*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Thunderbolt 4 PCI Express Root Port #0
+
+pci:v00008086d00007EC5*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Thunderbolt 4 PCI Express Root Port #1
+
+pci:v00008086d00007EC6*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Thunderbolt 4 PCI Express Root Port #2
+
+pci:v00008086d00007EC7*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-P Thunderbolt 4 PCI Express Root Port #3
+
 pci:v00008086d00008002*
  ID_MODEL_FROM_DATABASE=Trusted Execution Technology Registers
 
@@ -96959,6 +97787,9 @@ pci:v00008086d00008603*
 pci:v00008086d000087C0*
  ID_MODEL_FROM_DATABASE=UHD Graphics 617
 
+pci:v00008086d000087CA*
+ ID_MODEL_FROM_DATABASE=UHD Graphics 617
+
 pci:v00008086d00008800*
  ID_MODEL_FROM_DATABASE=Platform Controller Hub EG20T PCI Express Port
 
@@ -97082,6 +97913,9 @@ pci:v00008086d00008A53*
 pci:v00008086d00008A56*
  ID_MODEL_FROM_DATABASE=Iris Plus Graphics G1 (Ice Lake)
 
+pci:v00008086d00008A58*
+ ID_MODEL_FROM_DATABASE=Ice Lake-Y GT1 [UHD Graphics G1]
+
 pci:v00008086d00008A5A*
  ID_MODEL_FROM_DATABASE=Iris Plus Graphics G4 (Ice Lake)
 
@@ -97826,6 +98660,12 @@ pci:v00008086d00009641*
 pci:v00008086d000096A1*
  ID_MODEL_FROM_DATABASE=Integrated RAID
 
+pci:v00008086d00009840*
+ ID_MODEL_FROM_DATABASE=Lakefield GT2 [UHD Graphics]
+
+pci:v00008086d00009841*
+ ID_MODEL_FROM_DATABASE=Lakefield GT1.5 [UHD Graphics]
+
 pci:v00008086d00009A01*
  ID_MODEL_FROM_DATABASE=11th Gen Core Processor PCIe Controller #1
 
@@ -97901,6 +98741,9 @@ pci:v00008086d00009A33*
 pci:v00008086d00009A36*
  ID_MODEL_FROM_DATABASE=11th Gen Core Processor Host Bridge/DRAM Registers
 
+pci:v00008086d00009A40*
+ ID_MODEL_FROM_DATABASE=Tiger Lake-UP4 GT2 [Iris Xe Graphics]
+
 pci:v00008086d00009A49*
  ID_MODEL_FROM_DATABASE=TigerLake-LP GT2 [Iris Xe Graphics]
 
@@ -97910,6 +98753,15 @@ pci:v00008086d00009A60*
 pci:v00008086d00009A68*
  ID_MODEL_FROM_DATABASE=TigerLake-H GT1 [UHD Graphics]
 
+pci:v00008086d00009A70*
+ ID_MODEL_FROM_DATABASE=Tiger Lake-H GT1 [UHD Graphics]
+
+pci:v00008086d00009A78*
+ ID_MODEL_FROM_DATABASE=Tiger Lake-LP GT2 [UHD Graphics G4]
+
+pci:v00008086d00009B21*
+ ID_MODEL_FROM_DATABASE=Comet Lake-U GT2 [UHD Graphics 620]
+
 pci:v00008086d00009B33*
  ID_MODEL_FROM_DATABASE=Comet Lake-S 6c Host Bridge/DRAM Controller
 
@@ -97922,6 +98774,9 @@ pci:v00008086d00009B41sv00001028sd000009BD*
 pci:v00008086d00009B41sv00001028sd000009BE*
  ID_MODEL_FROM_DATABASE=CometLake-U GT2 [UHD Graphics] (Latitude 7410)
 
+pci:v00008086d00009B43*
+ ID_MODEL_FROM_DATABASE=10th Gen Core Processor Host Bridge/DRAM Registers
+
 pci:v00008086d00009B44*
  ID_MODEL_FROM_DATABASE=10th Gen Core Processor Host Bridge/DRAM Registers
 
@@ -97943,21 +98798,42 @@ pci:v00008086d00009B63*
 pci:v00008086d00009B64*
  ID_MODEL_FROM_DATABASE=10th Gen Core Processor Host Bridge/DRAM Registers
 
+pci:v00008086d00009BA4*
+ ID_MODEL_FROM_DATABASE=Comet Lake-H GT1 [UHD Graphics 610]
+
 pci:v00008086d00009BA8*
  ID_MODEL_FROM_DATABASE=CometLake-S GT1 [UHD Graphics 610]
 
+pci:v00008086d00009BAA*
+ ID_MODEL_FROM_DATABASE=Comet Lake UHD Graphics
+
+pci:v00008086d00009BAC*
+ ID_MODEL_FROM_DATABASE=Comet Lake UHD Graphics
+
 pci:v00008086d00009BC4*
  ID_MODEL_FROM_DATABASE=CometLake-H GT2 [UHD Graphics]
 
 pci:v00008086d00009BC5*
  ID_MODEL_FROM_DATABASE=CometLake-S GT2 [UHD Graphics 630]
 
+pci:v00008086d00009BC6*
+ ID_MODEL_FROM_DATABASE=Comet Lake-S GT2 [UHD Graphics P630]
+
 pci:v00008086d00009BC8*
  ID_MODEL_FROM_DATABASE=CometLake-S GT2 [UHD Graphics 630]
 
 pci:v00008086d00009BCA*
  ID_MODEL_FROM_DATABASE=Comet Lake UHD Graphics
 
+pci:v00008086d00009BCC*
+ ID_MODEL_FROM_DATABASE=Comet Lake UHD Graphics
+
+pci:v00008086d00009BE6*
+ ID_MODEL_FROM_DATABASE=Comet Lake-S GT2 [UHD Graphics P630]
+
+pci:v00008086d00009BF6*
+ ID_MODEL_FROM_DATABASE=Coffee Lake-S GT2 [UHD Graphics P630]
+
 pci:v00008086d00009C00*
  ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [IDE mode]
 
@@ -98894,6 +99770,9 @@ pci:v00008086d0000A0C6*
 pci:v00008086d0000A0C8*
  ID_MODEL_FROM_DATABASE=Tiger Lake-LP Smart Sound Technology Audio Controller
 
+pci:v00008086d0000A0D3*
+ ID_MODEL_FROM_DATABASE=Tiger Lake-LP SATA Controller
+
 pci:v00008086d0000A0E0*
  ID_MODEL_FROM_DATABASE=Tiger Lake-LP Management Engine Interface
 
@@ -99866,9 +100745,39 @@ pci:v00008086d0000A3F0*
 pci:v00008086d0000A620*
  ID_MODEL_FROM_DATABASE=6400/6402 Advanced Memory Buffer (AMB)
 
+pci:v00008086d0000A77F*
+ ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller Intel Corporation
+
+pci:v00008086d0000A780*
+ ID_MODEL_FROM_DATABASE=Raptor Lake-S UHD Graphics
+
+pci:v00008086d0000A781*
+ ID_MODEL_FROM_DATABASE=Raptor Lake-S UHD Graphics
+
+pci:v00008086d0000A782*
+ ID_MODEL_FROM_DATABASE=Raptor Lake-S UHD Graphics
+
+pci:v00008086d0000A783*
+ ID_MODEL_FROM_DATABASE=Raptor Lake-S UHD Graphics
+
+pci:v00008086d0000A788*
+ ID_MODEL_FROM_DATABASE=Raptor Lake-S UHD Graphics
+
+pci:v00008086d0000A789*
+ ID_MODEL_FROM_DATABASE=Raptor Lake-S UHD Graphics
+
+pci:v00008086d0000A78A*
+ ID_MODEL_FROM_DATABASE=Raptor Lake-S UHD Graphics
+
+pci:v00008086d0000A78B*
+ ID_MODEL_FROM_DATABASE=Raptor Lake-S UHD Graphics
+
 pci:v00008086d0000ABC0*
  ID_MODEL_FROM_DATABASE=Omni-Path Fabric Switch Silicon 100 Series
 
+pci:v00008086d0000AD0B*
+ ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller Intel Corporation
+
 pci:v00008086d0000B152*
  ID_MODEL_FROM_DATABASE=21152 PCI-to-PCI Bridge
 
@@ -100130,6 +101039,12 @@ pci:v00008088d00001000*
 pci:v00008088d00001001*
  ID_MODEL_FROM_DATABASE=Ethernet Controller RP1000 for 10GbE SFP+
 
+pci:v00008088d00001001sv00001BD4sd00000084*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller RP1000 for 10GbE SFP+ ((lldp))
+
+pci:v00008088d00001001sv00001BD4sd00000085*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller RP1000 for 10GbE SFP+ (Ethernet Controller SP1000A for 10GBASE-T)
+
 pci:v00008088d00001001sv00008088sd00000000*
  ID_MODEL_FROM_DATABASE=Ethernet Controller RP1000 for 10GbE SFP+ (Ethernet Network Adaptor RP1000 for 10GbE SFP+)
 
@@ -101300,6 +102215,18 @@ pci:v00009005d0000028Fsv00001BD4sd00000079*
 pci:v00009005d0000028Fsv00001BD4sd00000080*
  ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (RS0804M5R16iM)
 
+pci:v00009005d0000028Fsv00001BD4sd00000086*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (RT0800M7E)
+
+pci:v00009005d0000028Fsv00001BD4sd00000087*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (RT0800M7H)
+
+pci:v00009005d0000028Fsv00001BD4sd00000088*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (RT0804M7R)
+
+pci:v00009005d0000028Fsv00001BD4sd00000089*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (RT0808M7R)
+
 pci:v00009005d0000028Fsv00001CC4sd00000101*
  ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (Ramaxel FBGF-RAD PM8204)
 
@@ -101450,6 +102377,9 @@ pci:v00009005d0000028Fsv00009005sd00001471*
 pci:v00009005d0000028Fsv00009005sd00001472*
  ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (SmartRAID 3258-16i /e)
 
+pci:v00009005d0000028Fsv00009005sd00001475*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (SmartRAID 3254-16e /e)
+
 pci:v00009005d0000028Fsv00009005sd000014A0*
  ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (SmartRAID 3254-8i)
 
@@ -101459,12 +102389,27 @@ pci:v00009005d0000028Fsv00009005sd000014A1*
 pci:v00009005d0000028Fsv00009005sd000014A2*
  ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (SmartRAID 3252-8i)
 
+pci:v00009005d0000028Fsv00009005sd000014A4*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (SmartRAID 3254-8i /e)
+
+pci:v00009005d0000028Fsv00009005sd000014A5*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (SmartRAID 3252-8i /e)
+
+pci:v00009005d0000028Fsv00009005sd000014A6*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (SmartRAID 3204-8i /e)
+
 pci:v00009005d0000028Fsv00009005sd000014C0*
  ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (SmartHBA 2200-16i)
 
 pci:v00009005d0000028Fsv00009005sd000014C1*
  ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (HBA 1200-16i)
 
+pci:v00009005d0000028Fsv00009005sd000014C3*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (HBA 1200-16e)
+
+pci:v00009005d0000028Fsv00009005sd000014C4*
+ ID_MODEL_FROM_DATABASE=Smart Storage PQI SAS (HBA 1200-8e)
+
 pci:v00009005d00000410*
  ID_MODEL_FROM_DATABASE=AIC-9410W SAS (Razor HBA RAID)
 
@@ -101769,7 +102714,7 @@ pci:v00009710d00009922*
  ID_MODEL_FROM_DATABASE=MCS9922 PCIe Multi-I/O Controller
 
 pci:v00009710d00009990*
- ID_MODEL_FROM_DATABASE=MCS9990 PCIe to 4â\80\90Port USB 2.0 Host Controller
+ ID_MODEL_FROM_DATABASE=MCS9990 PCIe to 4ââ\82¬Â\90Port USB 2.0 Host Controller
 
 pci:v00009850*
  ID_VENDOR_FROM_DATABASE=3Com (wrong ID)

diff --git a/hwdb.d/60-autosuspend-fingerprint-reader.hwdb b/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
index 9704680cd1158bf9739fbf2b46664ca38389c54b..30f781dfc63ebbc7fb44c3bd0044539baa93b5bf 100644 (file)
--- a/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
+++ b/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
@@ -150,6 +150,9 @@ usb:v04F3p0C58*
 usb:v04F3p0C7D*
 usb:v04F3p0C7E*
 usb:v04F3p0C82*
+usb:v04F3p0C88*
+usb:v04F3p0C8C*
+usb:v04F3p0C8D*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -160,8 +163,12 @@ usb:v1C7Ap0603*
 
 # Supported by libfprint driver goodixmoc
 usb:v27C6p5840*
+usb:v27C6p6094*
 usb:v27C6p609C*
 usb:v27C6p60A2*
+usb:v27C6p631C*
+usb:v27C6p634C*
+usb:v27C6p6384*
 usb:v27C6p639C*
 usb:v27C6p63AC*
 usb:v27C6p63BC*
@@ -171,6 +178,7 @@ usb:v27C6p6584*
 usb:v27C6p658C*
 usb:v27C6p6592*
 usb:v27C6p6594*
+usb:v27C6p659A*
 usb:v27C6p659C*
 usb:v27C6p6A94*
  ID_AUTOSUSPEND=1
@@ -194,6 +202,8 @@ usb:v06CBp0123*
 usb:v06CBp0126*
 usb:v06CBp0129*
 usb:v06CBp0168*
+usb:v06CBp015F*
+usb:v06CBp0104*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -261,6 +271,7 @@ usb:v138Ap0091*
  ID_PERSIST=0
 
 # Known unsupported devices
+usb:v04E8p730B*
 usb:v04F3p036B*
 usb:v04F3p0C00*
 usb:v04F3p0C4C*
@@ -283,6 +294,7 @@ usb:v06CBp00C9*
 usb:v06CBp00D8*
 usb:v06CBp00DA*
 usb:v06CBp00DC*
+usb:v06CBp00E4*
 usb:v06CBp00E7*
 usb:v06CBp00E9*
 usb:v06CBp00FD*
@@ -298,6 +310,7 @@ usb:v0A5Cp5845*
 usb:v0BDAp5812*
 usb:v10A5p0007*
 usb:v10A5p9200*
+usb:v10A5p9800*
 usb:v1188p9545*
 usb:v138Ap0007*
 usb:v138Ap003A*
@@ -319,6 +332,7 @@ usb:v1C7Ap0576*
 usb:v27C6p5042*
 usb:v27C6p5110*
 usb:v27C6p5117*
+usb:v27C6p5125*
 usb:v27C6p5201*
 usb:v27C6p521D*
 usb:v27C6p5301*
@@ -330,6 +344,8 @@ usb:v27C6p5385*
 usb:v27C6p538C*
 usb:v27C6p538D*
 usb:v27C6p5395*
+usb:v27C6p5503*
+usb:v27C6p550A*
 usb:v27C6p5584*
 usb:v27C6p55A2*
 usb:v27C6p55A4*
@@ -337,6 +353,7 @@ usb:v27C6p55B4*
 usb:v27C6p5740*
 usb:v27C6p5E0A*
 usb:v2808p9338*
+usb:v2808p93A9*
 usb:v298Dp2020*
 usb:v298Dp2033*
 usb:v3538p0930*

diff --git a/hwdb.d/60-sensor.hwdb b/hwdb.d/60-sensor.hwdb
index 4c869332f9178fec2f4f1e3a9ba89f7f0babd4ee..000871537efd1b4467d5480e70ed385b6d434acf 100644 (file)
--- a/hwdb.d/60-sensor.hwdb
+++ b/hwdb.d/60-sensor.hwdb
@@ -824,7 +824,16 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:rvnPOV:rnI102A:*
 sensor:modalias:i2c:bmc150_accel:dmi:bvnINSYDECorp.:*:svnInsyde:pnBayTrail:*:rvn105B:rn0E57:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
+##########################################
+# Positivo
 #########################################
+
+# Positivo Duo K116R
+sensor:modalias:acpi:KIOX010A*:dmi:bvn*:bvr*:svnPositivoTecnologiaSA:pn*:pvr*:rvnPositivoTecnologiaSA:rnK116R*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
+ ACCEL_LOCATION=display
+
+########################################
 # Predia
 #########################################
 

diff --git a/hwdb.d/acpi_id_registry.html b/hwdb.d/acpi_id_registry.html
index cd4ac8c553e376a2878a8d184053e65317e3bcf2..d27531c463aab4df0459a81f0bfc24eb1ca07ab3 100644 (file)
--- a/hwdb.d/acpi_id_registry.html
+++ b/hwdb.d/acpi_id_registry.html
@@ -113,6 +113,7 @@
  <tr class="odd"><td>Shanghai Aiwei Electronic Technology Co., Ltd.</td><td>AWDZ</td><td>12/31/2021</td> </tr>
  <tr class="even"><td>Silicom Ltd. Connectivity Solutions</td><td>SILC</td><td>03/28/2022</td> </tr>
  <tr class="odd"><td>NOLO Co., Ltd.</td><td>NOLO</td><td>03/28/2022</td> </tr>
+ <tr class="even"><td>GoUp Co.,Ltd</td><td>GOUP</td><td>06/24/2022</td> </tr>
       </tbody>
     </table>
   </body>

diff --git a/hwdb.d/ma-large.txt b/hwdb.d/ma-large.txt
index d98eb3f3846143fc26959efa6bba60b69728a4a1..411708953fd928811a00e3697152726b8294a07d 100644 (file)
--- a/hwdb.d/ma-large.txt
+++ b/hwdb.d/ma-large.txt
@@ -716,9 +716,6 @@ EC5B73     (base 16)                Advanced & Wise Technology Corp.
                                Hsinchu City  Hsinchu  30075\r
                                TW\r
 \r
-E0-CB-1D   (hex)               Private\r
-E0CB1D     (base 16)           Private\r
-\r
 84-8B-CD   (hex)               IEEE Registration Authority\r
 848BCD     (base 16)           IEEE Registration Authority\r
                                445 Hoes Lane\r
@@ -5843,12 +5840,6 @@ F483E1     (base 16)             Shanghai Clouder Semiconductor Co.,Ltd
                                Beijing  Beijing  10085\r
                                CN\r
 \r
-64-1A-22   (hex)               Heliospectra AB\r
-641A22     (base 16)           Heliospectra AB\r
-                               Frans Perssons väg 6\r
-                                   \r
-                               SE\r
-\r
 A0-84-CB   (hex)               SonicSensory,Inc.\r
 A084CB     (base 16)           SonicSensory,Inc.\r
                                1161 Logan St\r
@@ -9182,12 +9173,6 @@ F87B7A     (base 16)             ARRIS Group, Inc.
                                San Jose    95134\r
                                US\r
 \r
-00-1A-EB   (hex)               Allied Telesis R&D Center K.K.\r
-001AEB     (base 16)           Allied Telesis R&D Center K.K.\r
-                               No.2 TOC Bldg.\r
-                               Shinagawa-ku  Tokyo  141-0031\r
-                               JP\r
-\r
 70-3C-39   (hex)               SEAWING Kft\r
 703C39     (base 16)           SEAWING Kft\r
                                Palánkai utca 5.\r
@@ -20075,12 +20060,6 @@ D4C766     (base 16)           Acentic GmbH
                                Lawrenceville  GA  30044\r
                                US\r
 \r
-00-1E-70   (hex)               Cobham Antenna Systems\r
-001E70     (base 16)           Cobham Antenna Systems\r
-                               Cobham Centre, Fourth Avenue\r
-                               Marlow  Buckinghamshire  SL7 1TF\r
-                               GB\r
-\r
 00-1E-61   (hex)               ITEC GmbH\r
 001E61     (base 16)           ITEC GmbH\r
                                Lassnitzthal 300\r
@@ -21101,12 +21080,6 @@ D4C766     (base 16)           Acentic GmbH
                                Xiamen  Fujian  361006\r
                                CN\r
 \r
-00-1A-0F   (hex)               Sistemas Avanzados de Control, S.A.\r
-001A0F     (base 16)           Sistemas Avanzados de Control, S.A.\r
-                               calle Colquide 6\r
-                               Las Rozas  Madrid  28230\r
-                               ES\r
-\r
 00-1A-43   (hex)               Logical Link Communications\r
 001A43     (base 16)           Logical Link Communications\r
                                1909 Central Drive Suite 205\r
@@ -22817,12 +22790,6 @@ D4C766     (base 16)           Acentic GmbH
                                HIGASHINARI-KU  OSAKA  537-0002\r
                                JP\r
 \r
-00-12-F3   (hex)               connectBlue AB\r
-0012F3     (base 16)           connectBlue AB\r
-                               Norra Vallgatan 64\r
-                               Malmoe    SE-211 22\r
-                               SE\r
-\r
 00-13-37   (hex)               Orient Power Home Network Ltd.\r
 001337     (base 16)           Orient Power Home Network Ltd.\r
                                307 Harbour Centre, Tower 1,\r
@@ -24956,12 +24923,6 @@ D4C766     (base 16)           Acentic GmbH
                                Brookings  SD  57006\r
                                US\r
 \r
-00-09-EE   (hex)               MEIKYO ELECTRIC CO.,LTD\r
-0009EE     (base 16)           MEIKYO ELECTRIC CO.,LTD\r
-                               4-27-2 Higashiogu\r
-                               Arakawa-ku  Tokyo  116-0012\r
-                               JP\r
-\r
 00-09-CA   (hex)               iMaxNetworks(Shenzhen)Limited.\r
 0009CA     (base 16)           iMaxNetworks(Shenzhen)Limited.\r
                                4/B,South Bldg of 29th,South District of\r
@@ -28805,12 +28766,6 @@ D4C766     (base 16)           Acentic GmbH
                                SOUTHBURY  CT  06488\r
                                US\r
 \r
-00-10-EC   (hex)               RPCG, LLC\r
-0010EC     (base 16)           RPCG, LLC\r
-                               749 MINER ROAD\r
-                               HIGHLAND HTS  OH  44143-2117\r
-                               US\r
-\r
 00-10-59   (hex)               DIABLO RESEARCH CO. LLC\r
 001059     (base 16)           DIABLO RESEARCH CO. LLC\r
                                825 STEWART DRIVE\r
@@ -32057,12 +32012,6 @@ FCF5C4     (base 16)           Espressif Inc.
                                Shanghai  Shanghai  201203\r
                                CN\r
 \r
-E8-26-B6   (hex)               Inside Biometrics International Limited\r
-E826B6     (base 16)           Inside Biometrics International Limited\r
-                               Strathpeffer Road\r
-                               Dingwall  Scotland  IV159QF\r
-                               GB\r
-\r
 54-CE-69   (hex)               Hikari Trading Co.,Ltd.\r
 54CE69     (base 16)           Hikari Trading Co.,Ltd.\r
                                Hikari Building,7-4-14,Ginza,Chuo-ku\r
@@ -33935,9 +33884,6 @@ B0BBE5     (base 16)            Sagemcom Broadband SAS
                                Rueil Malmaison Cedex  hauts de seine  92848\r
                                FR\r
 \r
-90-B4-DD   (hex)               Private\r
-90B4DD     (base 16)           Private\r
-\r
 C4-18-E9   (hex)               Samsung Electronics Co.,Ltd\r
 C418E9     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
@@ -34376,12 +34322,6 @@ A03B01     (base 16)           Kyung In Electronics
                                 Seoul    08501\r
                                KR\r
 \r
-18-18-8B   (hex)               FUJITSU CONNECTED TECHNOLOGIES LIMITED\r
-18188B     (base 16)           FUJITSU CONNECTED TECHNOLOGIES LIMITED\r
-                               Sanki Yamato Building, 7-10-1 Chuorinkan\r
-                               Yamato  Kanagawa  242-8588\r
-                               JP\r
-\r
 14-5E-69   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
 145E69     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
                                NO.18 HAIBIN ROAD,\r
@@ -35648,12 +35588,6 @@ A848FA     (base 16)           Espressif Inc.
                                Shanghai  Shanghai  201203\r
                                CN\r
 \r
-50-5D-7A   (hex)               zte corporation\r
-505D7A     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 FC-58-DF   (hex)               Interphone Service\r
 FC58DF     (base 16)           Interphone Service\r
                                Inwestorow, 8\r
@@ -36416,12 +36350,6 @@ BC2228     (base 16)           D-Link International
                                Singapore   Singapore  609917\r
                                SG\r
 \r
-10-3C-59   (hex)               zte corporation\r
-103C59     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 C4-CA-2B   (hex)               Arista Networks\r
 C4CA2B     (base 16)           Arista Networks\r
                                5453 Great America Parkway\r
@@ -36614,12 +36542,6 @@ A8B57C     (base 16)           Roku, Inc
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-78-90-A2   (hex)               zte corporation\r
-7890A2     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 60-22-32   (hex)               Ubiquiti Networks Inc.\r
 602232     (base 16)           Ubiquiti Networks Inc.\r
                                2580 Orchard Pkwy\r
@@ -36800,9 +36722,6 @@ C47D9F     (base 16)            Samsung Electronics Co.,Ltd
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
-9C-54-40   (hex)               Private\r
-9C5440     (base 16)           Private\r
-\r
 3C-A9-16   (hex)               Huawei Device Co., Ltd.\r
 3CA916     (base 16)           Huawei Device Co., Ltd.\r
                                No.2 of Xincheng Road, Songshan Lake Zone\r
@@ -37379,12 +37298,6 @@ DC8084     (base 16)           Apple, Inc.
                                Ernakulam  KL  686662\r
                                IN\r
 \r
-E4-DA-DF   (hex)               Taicang T&W Electronics\r
-E4DADF     (base 16)           Taicang T&W Electronics\r
-                               89# Jiang Nan RD\r
-                               Suzhou  Jiangsu  215412\r
-                               CN\r
-\r
 7C-35-F8   (hex)               Zhejiang Tmall Technology Co., Ltd.\r
 7C35F8     (base 16)           Zhejiang Tmall Technology Co., Ltd.\r
                                No.969 Wenyi West Road, Wuchang Street, Yuhang District\r
@@ -37409,6 +37322,12 @@ C85895     (base 16)           Motorola Mobility LLC, a Lenovo Company
                                Chicago  IL  60654\r
                                US\r
 \r
+E4-DA-DF   (hex)               Taicang T&W Electronics\r
+E4DADF     (base 16)           Taicang T&W Electronics\r
+                               89# Jiang Nan RD\r
+                               Suzhou  Jiangsu  215412\r
+                               CN\r
+\r
 A8-53-7D   (hex)               Mist Systems, Inc.\r
 A8537D     (base 16)           Mist Systems, Inc.\r
                                1601 South De Anza Blvd, Suite 248\r
@@ -37439,12 +37358,6 @@ E8D322     (base 16)           Cisco Systems, Inc
                                San Jose  CA  94568\r
                                US\r
 \r
-30-2B-DC   (hex)               Top-Unum Electronics Co., LTD\r
-302BDC     (base 16)           Top-Unum Electronics Co., LTD\r
-                               No. 58, Ln. 137, Jianshan Rd., Yingge Dist., \r
-                               New Taipei City 239,  Taiwan  239\r
-                               CN\r
-\r
 8C-15-53   (hex)               Beijing Memblaze Technology Co Ltd\r
 8C1553     (base 16)           Beijing Memblaze Technology Co Ltd\r
                                Building B2,Dongsheng Park, 66 Xixiaokou Road, Haidian\r
@@ -37493,6 +37406,24 @@ E8EBD3     (base 16)           Mellanox Technologies, Inc.
                                Sunnyvale  CA  94085\r
                                US\r
 \r
+30-2B-DC   (hex)               Top-Unum Electronics Co., LTD\r
+302BDC     (base 16)           Top-Unum Electronics Co., LTD\r
+                               No. 58, Ln. 137, Jianshan Rd., Yingge Dist., \r
+                               New Taipei City 239,  Taiwan  239\r
+                               CN\r
+\r
+90-F7-B2   (hex)               New H3C Technologies Co., Ltd\r
+90F7B2     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+04-E3-1A   (hex)               Sagemcom Broadband SAS\r
+04E31A     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
 C0-06-0C   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 C0060C     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
@@ -37511,24 +37442,18 @@ B0A4F0     (base 16)          HUAWEI TECHNOLOGIES CO.,LTD
                                DONG GUAN  GUANG DONG  523860\r
                                CN\r
 \r
-90-F7-B2   (hex)               New H3C Technologies Co., Ltd\r
-90F7B2     (base 16)           New H3C Technologies Co., Ltd\r
-                               466 Changhe Road, Binjiang District\r
-                               Hangzhou  Zhejiang  310052\r
-                               CN\r
-\r
-04-E3-1A   (hex)               Sagemcom Broadband SAS\r
-04E31A     (base 16)           Sagemcom Broadband SAS\r
-                               250, route de l'Empereur\r
-                               Rueil Malmaison Cedex  hauts de seine  92848\r
-                               FR\r
-\r
 6C-99-9D   (hex)               Amazon Technologies Inc.\r
 6C999D     (base 16)           Amazon Technologies Inc.\r
                                P.O Box 8102 \r
                                Reno  NV  89507\r
                                US\r
 \r
+6C-93-08   (hex)               IEEE Registration Authority\r
+6C9308     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
 7C-6A-60   (hex)               China Mobile Group Device Co.,Ltd.\r
 7C6A60     (base 16)           China Mobile Group Device Co.,Ltd.\r
                                32 Xuanwumen West Street,Xicheng District\r
@@ -37547,14 +37472,20 @@ B0A4F0     (base 16)          HUAWEI TECHNOLOGIES CO.,LTD
                                York    YO30 4RY\r
                                GB\r
 \r
-9C-A2-F4   (hex)               TP-Link Corporation Limited\r
-9CA2F4     (base 16)           TP-Link Corporation Limited\r
+D8-E2-DF   (hex)               Microsoft Corporation\r
+D8E2DF     (base 16)           Microsoft Corporation\r
+                               One Microsoft Way\r
+                               REDMOND  WA  98052\r
+                               US\r
+\r
+1C-61-B4   (hex)               TP-Link Corporation Limited\r
+1C61B4     (base 16)           TP-Link Corporation Limited\r
                                Room 901,9/F.New East Ocean Centre, 9 Science Museum Road\r
                                 Tsim Sha Tsui  Kowloon  999077\r
                                HK\r
 \r
-1C-61-B4   (hex)               TP-Link Corporation Limited\r
-1C61B4     (base 16)           TP-Link Corporation Limited\r
+9C-A2-F4   (hex)               TP-Link Corporation Limited\r
+9CA2F4     (base 16)           TP-Link Corporation Limited\r
                                Room 901,9/F.New East Ocean Centre, 9 Science Museum Road\r
                                 Tsim Sha Tsui  Kowloon  999077\r
                                HK\r
@@ -37565,29 +37496,23 @@ B4695F     (base 16)          TCT mobile ltd
                                Hui Zhou  Guang Dong  516006\r
                                CN\r
 \r
-D8-E2-DF   (hex)               Microsoft Corporation\r
-D8E2DF     (base 16)           Microsoft Corporation\r
-                               One Microsoft Way\r
-                               REDMOND  WA  98052\r
-                               US\r
-\r
-6C-93-08   (hex)               IEEE Registration Authority\r
-6C9308     (base 16)           IEEE Registration Authority\r
-                               445 Hoes Lane\r
-                               Piscataway  NJ  08554\r
-                               US\r
-\r
 38-8F-30   (hex)               Samsung Electronics Co.,Ltd\r
 388F30     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
-24-06-F2   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
-2406F2     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
-                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
-                               Chengdu  Sichuan  611330\r
-                               CN\r
+A0-44-66   (hex)               Intellics\r
+A04466     (base 16)           Intellics\r
+                               697, Pangyo-ro, Bundang-gu\r
+                               Seongnam-si  Gyeonggi-do  13511\r
+                               KR\r
+\r
+44-6D-7F   (hex)               Amazon Technologies Inc.\r
+446D7F     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno    89507\r
+                               US\r
 \r
 84-C6-92   (hex)               Texas Instruments\r
 84C692     (base 16)           Texas Instruments\r
@@ -37607,40 +37532,10 @@ D8E2DF     (base 16)          Microsoft Corporation
                                London    E14 5EY\r
                                GB\r
 \r
-A0-44-66   (hex)               Intellics\r
-A04466     (base 16)           Intellics\r
-                               697, Pangyo-ro, Bundang-gu\r
-                               Seongnam-si  Gyeonggi-do  13511\r
-                               KR\r
-\r
-CC-66-18   (hex)               Adtran Inc\r
-CC6618     (base 16)           Adtran Inc\r
-                               901 Explorer Blvd.\r
-                               Huntsville  AL  35806-2807\r
-                               US\r
-\r
-C0-C1-70   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
-C0C170     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
-                               1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
-\r
-50-42-89   (hex)               zte corporation\r
-504289     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-30-8E-7A   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
-308E7A     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
-                               Room 601,Block B ,Digital Building,Garden City\r
-                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
-                               CN\r
-\r
-2C-DD-5F   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
-2CDD5F     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
-                               Room 601,Block B ,Digital Building,Garden City\r
-                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
+24-06-F2   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
+2406F2     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
+                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
+                               Chengdu  Sichuan  611330\r
                                CN\r
 \r
 C0-6D-ED   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
@@ -37649,18 +37544,6 @@ C06DED     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.
                                Hangzhou  Zhejiang  310052\r
                                CN\r
 \r
-44-6D-7F   (hex)               Amazon Technologies Inc.\r
-446D7F     (base 16)           Amazon Technologies Inc.\r
-                               P.O Box 8102 \r
-                               Reno    89507\r
-                               US\r
-\r
-E0-27-6C   (hex)               Guangzhou Shiyuan Electronic Technology Company Limited\r
-E0276C     (base 16)           Guangzhou Shiyuan Electronic Technology Company Limited\r
-                               No.6, 4th Yunpu Road, Yunpu industry District\r
-                               Guangzhou  Guangdong  510530\r
-                               CN\r
-\r
 90-93-5A   (hex)               ARRIS Group, Inc.\r
 90935A     (base 16)           ARRIS Group, Inc.\r
                                6450 Sequence Drive\r
@@ -37679,12 +37562,42 @@ AC8FA9     (base 16)          Nokia Solutions and Networks GmbH & Co. KG
                                Sunnyvale  CA  94089\r
                                US\r
 \r
+C0-C1-70   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
+C0C170     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
+                               1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+50-42-89   (hex)               zte corporation\r
+504289     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+44-29-1E   (hex)               AltoBeam (China) Inc.\r
+44291E     (base 16)           AltoBeam (China) Inc.\r
+                               B808, Tsinghua Tongfang Hi-Tech Plaza, Haidian\r
+                               Beijing  Beijing  100083\r
+                               CN\r
+\r
 24-EB-ED   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 24EBED     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
+30-8E-7A   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
+308E7A     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
+                               Room 601,Block B ,Digital Building,Garden City\r
+                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
+                               CN\r
+\r
+2C-DD-5F   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
+2CDD5F     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
+                               Room 601,Block B ,Digital Building,Garden City\r
+                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
+                               CN\r
+\r
 AC-51-AB   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 AC51AB     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
@@ -37697,22 +37610,16 @@ AC51AB     (base 16)          HUAWEI TECHNOLOGIES CO.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
-F8-AD-24   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
-F8AD24     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
-                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
-                               Chongqing   China  401120\r
-                               CN\r
-\r
-A8-C9-8A   (hex)               New H3C Technologies Co., Ltd\r
-A8C98A     (base 16)           New H3C Technologies Co., Ltd\r
-                               466 Changhe Road, Binjiang District\r
-                               Hangzhou  Zhejiang  310052\r
-                               CN\r
+CC-66-18   (hex)               Adtran Inc\r
+CC6618     (base 16)           Adtran Inc\r
+                               901 Explorer Blvd.\r
+                               Huntsville  AL  35806-2807\r
+                               US\r
 \r
-44-29-1E   (hex)               AltoBeam (China) Inc.\r
-44291E     (base 16)           AltoBeam (China) Inc.\r
-                               B808, Tsinghua Tongfang Hi-Tech Plaza, Haidian\r
-                               Beijing  Beijing  100083\r
+E0-27-6C   (hex)               Guangzhou Shiyuan Electronic Technology Company Limited\r
+E0276C     (base 16)           Guangzhou Shiyuan Electronic Technology Company Limited\r
+                               No.6, 4th Yunpu Road, Yunpu industry District\r
+                               Guangzhou  Guangdong  510530\r
                                CN\r
 \r
 DC-8E-95   (hex)               Silicon Laboratories\r
@@ -37721,12 +37628,6 @@ DC8E95     (base 16)           Silicon Laboratories
                                Austin  TX  78701\r
                                US\r
 \r
-7C-EF-40   (hex)               Nextorage Corporation\r
-7CEF40     (base 16)           Nextorage Corporation\r
-                               Kawasaki-eki-mae Tower Riverk 9F, 12-1, Ekimaehoncho, Kawasaki-ku\r
-                               Kawasaki City  Kanagawa  210-0007\r
-                               JP\r
-\r
 28-BE-43   (hex)               vivo Mobile Communication Co., Ltd.\r
 28BE43     (base 16)           vivo Mobile Communication Co., Ltd.\r
                                No.1, vivo Road, Chang'an\r
@@ -37739,11 +37640,11 @@ DC8E95     (base 16)          Silicon Laboratories
                                DONG GUAN  GUANG DONG  523860\r
                                CN\r
 \r
-28-74-F5   (hex)               Nokia Solutions and Networks GmbH & Co. KG\r
-2874F5     (base 16)           Nokia Solutions and Networks GmbH & Co. KG\r
-                               Werinherstrasse 91\r
-                               München  Bavaria  D-81541\r
-                               DE\r
+F8-AD-24   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+F8AD24     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
+                               Chongqing   China  401120\r
+                               CN\r
 \r
 B0-1F-8C   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
 B01F8C     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
@@ -37751,11 +37652,11 @@ B01F8C     (base 16)          Aruba, a Hewlett Packard Enterprise Company
                                Santa Clara  CA  95054\r
                                US\r
 \r
-C0-E0-1C   (hex)               IoT Security Group, SL\r
-C0E01C     (base 16)           IoT Security Group, SL\r
-                               Calle Pez Dorado, 27, local 2\r
-                               Torremolinos  Malaga  29620\r
-                               ES\r
+A8-C9-8A   (hex)               New H3C Technologies Co., Ltd\r
+A8C98A     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
 \r
 00-26-04   (hex)               WorldCast Systems\r
 002604     (base 16)           WorldCast Systems\r
@@ -37763,23 +37664,11 @@ C0E01C     (base 16)          IoT Security Group, SL
                                Mérignac    33700\r
                                FR\r
 \r
-00-CB-7A   (hex)               Technicolor CH USA Inc.\r
-00CB7A     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
-F8-AB-82   (hex)               Xiaomi Communications Co Ltd\r
-F8AB82     (base 16)           Xiaomi Communications Co Ltd\r
-                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
-                               Beijing  Haidian District  100085\r
-                               CN\r
-\r
-EC-30-B3   (hex)               Xiaomi Communications Co Ltd\r
-EC30B3     (base 16)           Xiaomi Communications Co Ltd\r
-                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
-                               Beijing  Haidian District  100085\r
-                               CN\r
+7C-EF-40   (hex)               Nextorage Corporation\r
+7CEF40     (base 16)           Nextorage Corporation\r
+                               Kawasaki-eki-mae Tower Riverk 9F, 12-1, Ekimaehoncho, Kawasaki-ku\r
+                               Kawasaki City  Kanagawa  210-0007\r
+                               JP\r
 \r
 1C-AF-4A   (hex)               Samsung Electronics Co.,Ltd\r
 1CAF4A     (base 16)           Samsung Electronics Co.,Ltd\r
@@ -37793,17 +37682,17 @@ C8120B     (base 16)          Samsung Electronics Co.,Ltd
                                Suwon  Gyeonggi-Do  16677\r
                                KR\r
 \r
-90-2C-FB   (hex)               CanTops Co,.Ltd.\r
-902CFB     (base 16)           CanTops Co,.Ltd.\r
-                               A-1002 Digital Empire, 16, Deogyong-daero 1556beon-gil\r
-                               Yeongtong-gu  Suwon-si, Gyonggi-do  1660\r
-                               KR\r
+28-74-F5   (hex)               Nokia Solutions and Networks GmbH & Co. KG\r
+2874F5     (base 16)           Nokia Solutions and Networks GmbH & Co. KG\r
+                               Werinherstrasse 91\r
+                               München  Bavaria  D-81541\r
+                               DE\r
 \r
-A8-A2-37   (hex)               Arcadyan Corporation\r
-A8A237     (base 16)           Arcadyan Corporation\r
-                               No.8, Sec.2, Guangfu Rd.\r
-                               Hsinchu City  Hsinchu  30071\r
-                               TW\r
+C0-E0-1C   (hex)               IoT Security Group, SL\r
+C0E01C     (base 16)           IoT Security Group, SL\r
+                               Calle Pez Dorado, 27, local 2\r
+                               Torremolinos  Malaga  29620\r
+                               ES\r
 \r
 00-00-BD   (hex)               RYOSEI, Ltd.\r
 0000BD     (base 16)           RYOSEI, Ltd.\r
@@ -37817,23 +37706,23 @@ ACCCFC     (base 16)          Amazon Technologies Inc.
                                Reno  NV  89507\r
                                US\r
 \r
-08-E6-3B   (hex)               zte corporation\r
-08E63B     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
+90-2C-FB   (hex)               CanTops Co,.Ltd.\r
+902CFB     (base 16)           CanTops Co,.Ltd.\r
+                               A-1002 Digital Empire, 16, Deogyong-daero 1556beon-gil\r
+                               Yeongtong-gu  Suwon-si, Gyonggi-do  1660\r
+                               KR\r
 \r
-88-C1-74   (hex)               zte corporation\r
-88C174     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
+F8-AB-82   (hex)               Xiaomi Communications Co Ltd\r
+F8AB82     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
                                CN\r
 \r
-C8-9E-61   (hex)               Lyngsoe Systems LTd\r
-C89E61     (base 16)           Lyngsoe Systems LTd\r
-                               101 Simona Dr., Unit 2\r
-                               Bolton  Ontario  L7E 4E8\r
-                               CA\r
+EC-30-B3   (hex)               Xiaomi Communications Co Ltd\r
+EC30B3     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
 \r
 9C-57-BC   (hex)               eero inc.\r
 9C57BC     (base 16)           eero inc.\r
@@ -37841,12 +37730,6 @@ C89E61     (base 16)           Lyngsoe Systems LTd
                                San Francisco  CA  94107\r
                                US\r
 \r
-2C-82-17   (hex)               Apple, Inc.\r
-2C8217     (base 16)           Apple, Inc.\r
-                               1 Infinite Loop\r
-                               Cupertino  CA  95014\r
-                               US\r
-\r
 14-2D-4D   (hex)               Apple, Inc.\r
 142D4D     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
@@ -37865,6 +37748,12 @@ B8211C     (base 16)           Apple, Inc.
                                Cupertino  CA  95014\r
                                US\r
 \r
+B0-3F-64   (hex)               Apple, Inc.\r
+B03F64     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
 D4-5A-3F   (hex)               Juniper Networks\r
 D45A3F     (base 16)           Juniper Networks\r
                                1133 Innovation Way\r
@@ -37877,35 +37766,23 @@ E8DC6C     (base 16)          Cisco Systems, Inc
                                San Jose  CA  94568\r
                                US\r
 \r
-48-B4-C3   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
-48B4C3     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
-                               3333 Scott Blvd\r
-                               Santa Clara  CA  95054\r
-                               US\r
+A8-A2-37   (hex)               Arcadyan Corporation\r
+A8A237     (base 16)           Arcadyan Corporation\r
+                               No.8, Sec.2, Guangfu Rd.\r
+                               Hsinchu City  Hsinchu  30071\r
+                               TW\r
 \r
-B0-3F-64   (hex)               Apple, Inc.\r
-B03F64     (base 16)           Apple, Inc.\r
+2C-82-17   (hex)               Apple, Inc.\r
+2C8217     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
                                Cupertino  CA  95014\r
                                US\r
 \r
-68-A7-B4   (hex)               Honor Device Co., Ltd.\r
-68A7B4     (base 16)           Honor Device Co., Ltd.\r
-                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
-                               Shenzhen   Guangdong  518040\r
-                               CN\r
-\r
-80-3C-20   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-803C20     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
-                               CN\r
-\r
-A4-DD-58   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-A4DD58     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
-                               CN\r
+C8-9E-61   (hex)               Lyngsoe Systems LTd\r
+C89E61     (base 16)           Lyngsoe Systems LTd\r
+                               101 Simona Dr., Unit 2\r
+                               Bolton  Ontario  L7E 4E8\r
+                               CA\r
 \r
 E0-28-B1   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
 E028B1     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
@@ -37925,6 +37802,12 @@ C08D51     (base 16)           Amazon Technologies Inc.
                                Reno  NV  89507\r
                                US\r
 \r
+48-B4-C3   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+48B4C3     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
 6C-15-24   (hex)               IEEE Registration Authority\r
 6C1524     (base 16)           IEEE Registration Authority\r
                                445 Hoes Lane\r
@@ -37937,12 +37820,6 @@ C08D51     (base 16)           Amazon Technologies Inc.
                                Kanata  Ontario  K2K 2E6\r
                                CA\r
 \r
-00-12-93   (hex)               ABB Switzerland Ltd.\r
-001293     (base 16)           ABB Switzerland Ltd.\r
-                               Via Luserte Sud 9  Quartino \r
-                               Quartino     6572\r
-                               CH\r
-\r
 C0-E9-11   (hex)               Private\r
 C0E911     (base 16)           Private\r
 \r
@@ -37958,28 +37835,28 @@ C0E911     (base 16)          Private
                                London    SW1Y 4AR\r
                                GB\r
 \r
-24-2C-FE   (hex)               Zhejiang Tmall Technology Co., Ltd.\r
-242CFE     (base 16)           Zhejiang Tmall Technology Co., Ltd.\r
-                               No.969 Wenyi West Road, Wuchang Street, Yuhang District\r
-                               Hangzhou  Zhejiang  310024\r
+68-A7-B4   (hex)               Honor Device Co., Ltd.\r
+68A7B4     (base 16)           Honor Device Co., Ltd.\r
+                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
+                               Shenzhen   Guangdong  518040\r
                                CN\r
 \r
-A0-42-D1   (hex)               Huawei Device Co., Ltd.\r
-A042D1     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
+80-3C-20   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+803C20     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
                                CN\r
 \r
-2C-DC-78   (hex)               Descartes Systems (USA) LLC\r
-2CDC78     (base 16)           Descartes Systems (USA) LLC\r
-                               2030 Powers Ferry Road SE\r
-                               Atlanta  GA  303339\r
-                               US\r
+A4-DD-58   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+A4DD58     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
 \r
-58-87-9F   (hex)               Huawei Device Co., Ltd.\r
-58879F     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
+24-2C-FE   (hex)               Zhejiang Tmall Technology Co., Ltd.\r
+242CFE     (base 16)           Zhejiang Tmall Technology Co., Ltd.\r
+                               No.969 Wenyi West Road, Wuchang Street, Yuhang District\r
+                               Hangzhou  Zhejiang  310024\r
                                CN\r
 \r
 E8-D8-7E   (hex)               Amazon Technologies Inc.\r
@@ -37988,47 +37865,59 @@ E8D87E     (base 16)          Amazon Technologies Inc.
                                Reno  NV  89507\r
                                US\r
 \r
+00-12-93   (hex)               ABB Switzerland Ltd.\r
+001293     (base 16)           ABB Switzerland Ltd.\r
+                               Via Luserte Sud 9  Quartino \r
+                               Quartino     6572\r
+                               CH\r
+\r
 9C-1F-CA   (hex)               Hangzhou AlmightyDigit Technology Co., Ltd\r
 9C1FCA     (base 16)           Hangzhou AlmightyDigit Technology Co., Ltd\r
                                Room A0041, 10 / F, building 1, Haizhi center, Cangqian street, Yuhang District\r
                                Hangzhou  Zhejiang   310000\r
                                CN\r
 \r
-84-70-D7   (hex)               eero inc.\r
-8470D7     (base 16)           eero inc.\r
-                               660 3rd Street\r
-                               San Francisco  CA  94107\r
+2C-DC-78   (hex)               Descartes Systems (USA) LLC\r
+2CDC78     (base 16)           Descartes Systems (USA) LLC\r
+                               2030 Powers Ferry Road SE\r
+                               Atlanta  GA  303339\r
                                US\r
 \r
+A0-42-D1   (hex)               Huawei Device Co., Ltd.\r
+A042D1     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+58-87-9F   (hex)               Huawei Device Co., Ltd.\r
+58879F     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
 E0-6C-4E   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
 E06C4E     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
                                Building, No.33, Xiandong Rd, Xili\r
                                Nanshan District, Shenzhen  PRC  518053\r
                                CN\r
 \r
-58-1D-D8   (hex)               Sagemcom Broadband SAS\r
-581DD8     (base 16)           Sagemcom Broadband SAS\r
-                               250, route de l'Empereur\r
-                               Rueil Malmaison Cedex  hauts de seine  92848\r
-                               FR\r
-\r
 80-6A-B0   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
 806AB0     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
                                Building, No.33, Xiandong Rd, Xili\r
                                Nanshan District, Shenzhen  PRC  518053\r
                                CN\r
 \r
-F4-B3-B1   (hex)               Silicon Laboratories\r
-F4B3B1     (base 16)           Silicon Laboratories\r
-                               400 West Cesar Chavez Street\r
-                               Austin  TX  78701\r
+84-70-D7   (hex)               eero inc.\r
+8470D7     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
                                US\r
 \r
-04-69-8F   (hex)               Juniper Networks\r
-04698F     (base 16)           Juniper Networks\r
-                               1133 Innovation Way\r
-                               Sunnyvale  CA  94089\r
-                               US\r
+10-B2-32   (hex)               Qingdao Intelligent&Precise Electronics Co.,Ltd.\r
+10B232     (base 16)           Qingdao Intelligent&Precise Electronics Co.,Ltd.\r
+                               No.218 Qianwangang Road\r
+                               Qingdao  Shangdong  266510\r
+                               CN\r
 \r
 14-9B-F3   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
 149BF3     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
@@ -38042,11 +37931,11 @@ F4B3B1     (base 16)          Silicon Laboratories
                                Wuhan  Hubei  430074\r
                                CN\r
 \r
-10-B2-32   (hex)               Qingdao Intelligent&Precise Electronics Co.,Ltd.\r
-10B232     (base 16)           Qingdao Intelligent&Precise Electronics Co.,Ltd.\r
-                               No.218 Qianwangang Road\r
-                               Qingdao  Shangdong  266510\r
-                               CN\r
+F4-B3-B1   (hex)               Silicon Laboratories\r
+F4B3B1     (base 16)           Silicon Laboratories\r
+                               400 West Cesar Chavez Street\r
+                               Austin  TX  78701\r
+                               US\r
 \r
 B8-50-D8   (hex)               Beijing Xiaomi Mobile Software Co., Ltd\r
 B850D8     (base 16)           Beijing Xiaomi Mobile Software Co., Ltd\r
@@ -38054,6 +37943,36 @@ B850D8     (base 16)           Beijing Xiaomi Mobile Software Co., Ltd
                                Beijing  Beijing  100085\r
                                CN\r
 \r
+58-1D-D8   (hex)               Sagemcom Broadband SAS\r
+581DD8     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+04-69-8F   (hex)               Juniper Networks\r
+04698F     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+5C-53-C3   (hex)               Ubee Interactive Co., Limited\r
+5C53C3     (base 16)           Ubee Interactive Co., Limited\r
+                               Flat/RM 1202, 12/F, AT Tower, 180 Electric Road\r
+                               North Point    00000\r
+                               HK\r
+\r
+AC-5A-F0   (hex)               LG Electronics\r
+AC5AF0     (base 16)           LG Electronics\r
+                               222 LG-ro, JINWI-MYEON\r
+                               Pyeongtaek-si  Gyeonggi-do  451-713\r
+                               KR\r
+\r
+EC-A6-2F   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+ECA62F     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
 C0-9F-51   (hex)               SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
 C09F51     (base 16)           SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
                                NO.8 Tangzhuang Road,Suzhou Industrial Park,Su ZhouCity,JiangSu Province,China\r
@@ -38072,11 +37991,17 @@ A0CDF3     (base 16)          Murata Manufacturing Co., Ltd.
                                Nagaokakyo-shi  Kyoto  617-8555\r
                                JP\r
 \r
-B4-8A-0A   (hex)               Espressif Inc.\r
-B48A0A     (base 16)           Espressif Inc.\r
-                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
-                               Shanghai  Shanghai  201203\r
-                               CN\r
+24-29-34   (hex)               Google, Inc.\r
+242934     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
+38-0A-4F   (hex)               PRACHI ENTERPRISES\r
+380A4F     (base 16)           PRACHI ENTERPRISES\r
+                               B-141, 2nd FLOOR SECTOR-6 NOIDA\r
+                               NOIDA  UTTARPRADESH  201301\r
+                               IN\r
 \r
 C8-3A-1B   (hex)               Toshiba TEC Corporation Inc\r
 C83A1B     (base 16)           Toshiba TEC Corporation Inc\r
@@ -38084,23 +38009,29 @@ C83A1B     (base 16)          Toshiba TEC Corporation Inc
                                Shinagawa-ku  Tokyo  141-8664\r
                                JP\r
 \r
-EC-A6-2F   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-ECA62F     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
+B4-8A-0A   (hex)               Espressif Inc.\r
+B48A0A     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
                                CN\r
 \r
-AC-5A-F0   (hex)               LG Electronics\r
-AC5AF0     (base 16)           LG Electronics\r
-                               222 LG-ro, JINWI-MYEON\r
-                               Pyeongtaek-si  Gyeonggi-do  451-713\r
+80-19-70   (hex)               Samsung Electronics Co.,Ltd\r
+801970     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
-5C-53-C3   (hex)               Ubee Interactive Co., Limited\r
-5C53C3     (base 16)           Ubee Interactive Co., Limited\r
-                               Flat/RM 1202, 12/F, AT Tower, 180 Electric Road\r
-                               North Point    00000\r
-                               HK\r
+E0-F7-28   (hex)               Amazon Technologies Inc.\r
+E0F728     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+1C-0E-D3   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
+1C0ED3     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
+                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
+                               Chengdu  Sichuan  611330\r
+                               CN\r
 \r
 24-32-AE   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
 2432AE     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
@@ -38132,12 +38063,6 @@ AC936A     (base 16)           Huawei Device Co., Ltd.
                                Dongguan  Guangdong  523808\r
                                CN\r
 \r
-1C-0E-D3   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
-1C0ED3     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
-                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
-                               Chengdu  Sichuan  611330\r
-                               CN\r
-\r
 7C-4C-A5   (hex)               SKY UK LIMITED\r
 7C4CA5     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
@@ -38162,41 +38087,17 @@ C03E0F     (base 16)          SKY UK LIMITED
                                Brentwood  Essex  08854\r
                                GB\r
 \r
-24-29-34   (hex)               Google, Inc.\r
-242934     (base 16)           Google, Inc.\r
-                               1600 Amphitheatre Parkway\r
-                               Mountain View  CA  94043\r
-                               US\r
-\r
-38-0A-4F   (hex)               PRACHI ENTERPRISES\r
-380A4F     (base 16)           PRACHI ENTERPRISES\r
-                               B-141, 2nd FLOOR SECTOR-6 NOIDA\r
-                               NOIDA  UTTARPRADESH  201301\r
-                               IN\r
-\r
-80-19-70   (hex)               Samsung Electronics Co.,Ltd\r
-801970     (base 16)           Samsung Electronics Co.,Ltd\r
-                               #94-1, Imsoo-Dong\r
-                               Gumi  Gyeongbuk  730-350\r
-                               KR\r
-\r
-E0-F7-28   (hex)               Amazon Technologies Inc.\r
-E0F728     (base 16)           Amazon Technologies Inc.\r
-                               P.O Box 8102 \r
-                               Reno  NV  89507\r
-                               US\r
-\r
-B8-FB-AF   (hex)               Xiamen IPRT Technology CO.,LTD\r
-B8FBAF     (base 16)           Xiamen IPRT Technology CO.,LTD\r
-                               3~5Floor,No.101,Huili Industry Park,Meixi Road,Tongan District,Xiamen,China.\r
-                               xiamen  fujian  361000\r
-                               CN\r
+D0-58-FC   (hex)               SKY UK LIMITED\r
+D058FC     (base 16)           SKY UK LIMITED\r
+                               130 Kings Road\r
+                               Brentwood  Essex  08854\r
+                               GB\r
 \r
-34-85-18   (hex)               Espressif Inc.\r
-348518     (base 16)           Espressif Inc.\r
-                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
-                               Shanghai  Shanghai  201203\r
-                               CN\r
+90-02-18   (hex)               SKY UK LIMITED\r
+900218     (base 16)           SKY UK LIMITED\r
+                               130 Kings Road\r
+                               Brentwood  Essex  08854\r
+                               GB\r
 \r
 D4-DA-CD   (hex)               SKY UK LIMITED\r
 D4DACD     (base 16)           SKY UK LIMITED\r
@@ -38222,6 +38123,66 @@ B04530     (base 16)           SKY UK LIMITED
                                Brentwood  Essex  08854\r
                                GB\r
 \r
+A4-AE-11   (hex)               Hon Hai Precision Industry Co., Ltd.\r
+A4AE11     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
+                               GuangDongShenZhen\r
+                               ShenZhen  GuangDong  518109\r
+                               CN\r
+\r
+7C-DE-78   (hex)               New H3C Technologies Co., Ltd\r
+7CDE78     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+3C-E0-64   (hex)               Texas Instruments\r
+3CE064     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+E0-92-8F   (hex)               Texas Instruments\r
+E0928F     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+CC-03-7B   (hex)               Texas Instruments\r
+CC037B     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+58-1C-F8   (hex)               Intel Corporate\r
+581CF8     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+AC-19-8E   (hex)               Intel Corporate\r
+AC198E     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+C8-5E-A9   (hex)               Intel Corporate\r
+C85EA9     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+B8-FB-AF   (hex)               Xiamen IPRT Technology CO.,LTD\r
+B8FBAF     (base 16)           Xiamen IPRT Technology CO.,LTD\r
+                               3~5Floor,No.101,Huili Industry Park,Meixi Road,Tongan District,Xiamen,China.\r
+                               xiamen  fujian  361000\r
+                               CN\r
+\r
+34-85-18   (hex)               Espressif Inc.\r
+348518     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
 EC-E6-A2   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
 ECE6A2     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
                                No.5 DongXin Road\r
@@ -38240,24 +38201,6 @@ E02E0B     (base 16)           Intel Corporate
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-A4-AE-11   (hex)               Hon Hai Precision Industry Co., Ltd.\r
-A4AE11     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
-                               GuangDongShenZhen\r
-                               ShenZhen  GuangDong  518109\r
-                               CN\r
-\r
-D0-58-FC   (hex)               SKY UK LIMITED\r
-D058FC     (base 16)           SKY UK LIMITED\r
-                               130 Kings Road\r
-                               Brentwood  Essex  08854\r
-                               GB\r
-\r
-90-02-18   (hex)               SKY UK LIMITED\r
-900218     (base 16)           SKY UK LIMITED\r
-                               130 Kings Road\r
-                               Brentwood  Essex  08854\r
-                               GB\r
-\r
 38-5C-FB   (hex)               Silicon Laboratories\r
 385CFB     (base 16)           Silicon Laboratories\r
                                400 West Cesar Chavez Street\r
@@ -38270,65 +38213,23 @@ C43D1A     (base 16)          Intel Corporate
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-BC-F8-8B   (hex)               zte corporation\r
-BCF88B     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 68-53-9D   (hex)               EM Microelectronic\r
 68539D     (base 16)           EM Microelectronic\r
                                Rue des Sors 3\r
                                Marin-Epagnier  Neuchatel  2074\r
                                CH\r
 \r
-E4-65-64   (hex)               SHENZHEN KTC TECHNOLOGY CO.,LTD\r
-E46564     (base 16)           SHENZHEN KTC TECHNOLOGY CO.,LTD\r
-                               Add: NO.4023, Wuhe Road, Bantian, Longgang District, Shenzhen, China\r
-                               SHEN ZHEN  GUANG DONG  518100\r
-                               CN\r
-\r
 C8-BF-4C   (hex)               Beijing Xiaomi Mobile Software Co., Ltd\r
 C8BF4C     (base 16)           Beijing Xiaomi Mobile Software Co., Ltd\r
                                The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District\r
                                Beijing  Beijing  100085\r
                                CN\r
 \r
-58-1C-F8   (hex)               Intel Corporate\r
-581CF8     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
-AC-19-8E   (hex)               Intel Corporate\r
-AC198E     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
-C8-5E-A9   (hex)               Intel Corporate\r
-C85EA9     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
-3C-E0-64   (hex)               Texas Instruments\r
-3CE064     (base 16)           Texas Instruments\r
-                               12500 TI Blvd\r
-                               Dallas  TX  75243\r
-                               US\r
-\r
-E0-92-8F   (hex)               Texas Instruments\r
-E0928F     (base 16)           Texas Instruments\r
-                               12500 TI Blvd\r
-                               Dallas  TX  75243\r
-                               US\r
-\r
-CC-03-7B   (hex)               Texas Instruments\r
-CC037B     (base 16)           Texas Instruments\r
-                               12500 TI Blvd\r
-                               Dallas  TX  75243\r
-                               US\r
+E4-65-64   (hex)               SHENZHEN KTC TECHNOLOGY CO.,LTD\r
+E46564     (base 16)           SHENZHEN KTC TECHNOLOGY CO.,LTD\r
+                               Add: NO.4023, Wuhe Road, Bantian, Longgang District, Shenzhen, China\r
+                               SHEN ZHEN  GUANG DONG  518100\r
+                               CN\r
 \r
 E0-51-D8   (hex)               China Dragon Technology Limited\r
 E051D8     (base 16)           China Dragon Technology Limited\r
@@ -38336,17 +38237,11 @@ E051D8     (base 16)          China Dragon Technology Limited
                                Shenzhen  Guangdong  518104\r
                                CN\r
 \r
-CC-29-BD   (hex)               zte corporation\r
-CC29BD     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-7C-DE-78   (hex)               New H3C Technologies Co., Ltd\r
-7CDE78     (base 16)           New H3C Technologies Co., Ltd\r
-                               466 Changhe Road, Binjiang District\r
-                               Hangzhou  Zhejiang  310052\r
-                               CN\r
+5C-60-BA   (hex)               HP Inc.\r
+5C60BA     (base 16)           HP Inc.\r
+                               10300 Energy Dr\r
+                               Spring  TX  77389\r
+                               US\r
 \r
 E0-EF-02   (hex)               Chengdu Quanjing Intelligent Technology Co.,Ltd\r
 E0EF02     (base 16)           Chengdu Quanjing Intelligent Technology Co.,Ltd\r
@@ -38360,18 +38255,6 @@ E0EF02     (base 16)           Chengdu Quanjing Intelligent Technology Co.,Ltd
                                Hong Kong  Hong Kong  999077\r
                                HK\r
 \r
-20-9C-B4   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
-209CB4     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
-                               3333 Scott Blvd\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-E8-CC-8C   (hex)               Chengdu Jiarui Hualian Communication Technology Co\r
-E8CC8C     (base 16)           Chengdu Jiarui Hualian Communication Technology Co\r
-                               5th Floor, Building F, Huirong Plaza (Jinhua), No. 88, Section 3, Jinhua Road, Industrial Park, Jinjiang District, Chengdu, Sichuan Province\r
-                               Chengdu  Sichuan  610000\r
-                               CN\r
-\r
 A8-AB-B5   (hex)               Apple, Inc.\r
 A8ABB5     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
@@ -38390,11 +38273,29 @@ A8ABB5     (base 16)          Apple, Inc.
                                Kanata  Ontario  K2K 2E6\r
                                CA\r
 \r
-B0-67-B5   (hex)               Apple, Inc.\r
-B067B5     (base 16)           Apple, Inc.\r
-                               1 Infinite Loop\r
-                               Cupertino  CA  95014\r
-                               US\r
+74-80-3F   (hex)               Renesas Electronics (Penang) Sdn. Bhd.\r
+74803F     (base 16)           Renesas Electronics (Penang) Sdn. Bhd.\r
+                               Phase 3, Bayan Lepas FIZ\r
+                               Bayan Lepas  Penang  11900\r
+                               MY\r
+\r
+04-43-FD   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
+0443FD     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
+                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
+                               Chengdu  Sichuan  611330\r
+                               CN\r
+\r
+A4-89-7E   (hex)               Guangzhou Yuhong Technology Co.,Ltd.\r
+A4897E     (base 16)           Guangzhou Yuhong Technology Co.,Ltd.\r
+                               Room 402, No. 11 Software Road, Tianhe District, Guangzhou\r
+                               Guangzhou  Guangdong  510640\r
+                               CN\r
+\r
+E8-CC-8C   (hex)               Chengdu Jiarui Hualian Communication Technology Co\r
+E8CC8C     (base 16)           Chengdu Jiarui Hualian Communication Technology Co\r
+                               5th Floor, Building F, Huirong Plaza (Jinhua), No. 88, Section 3, Jinhua Road, Industrial Park, Jinjiang District, Chengdu, Sichuan Province\r
+                               Chengdu  Sichuan  610000\r
+                               CN\r
 \r
 5C-52-84   (hex)               Apple, Inc.\r
 5C5284     (base 16)           Apple, Inc.\r
@@ -38414,17 +38315,11 @@ C0956D     (base 16)          Apple, Inc.
                                Cupertino  CA  95014\r
                                US\r
 \r
-04-43-FD   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
-0443FD     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
-                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
-                               Chengdu  Sichuan  611330\r
-                               CN\r
-\r
-74-80-3F   (hex)               Renesas Electronics (Penang) Sdn. Bhd.\r
-74803F     (base 16)           Renesas Electronics (Penang) Sdn. Bhd.\r
-                               Phase 3, Bayan Lepas FIZ\r
-                               Bayan Lepas  Penang  11900\r
-                               MY\r
+20-9C-B4   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+209CB4     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
 \r
 EC-A1-38   (hex)               Amazon Technologies Inc.\r
 ECA138     (base 16)           Amazon Technologies Inc.\r
@@ -38432,18 +38327,12 @@ ECA138     (base 16)          Amazon Technologies Inc.
                                Reno  NV  89507\r
                                US\r
 \r
-5C-60-BA   (hex)               HP Inc.\r
-5C60BA     (base 16)           HP Inc.\r
-                               10300 Energy Dr\r
-                               Spring  TX  77389\r
+B0-67-B5   (hex)               Apple, Inc.\r
+B067B5     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
                                US\r
 \r
-A4-89-7E   (hex)               Guangzhou Yuhong Technology Co.,Ltd.\r
-A4897E     (base 16)           Guangzhou Yuhong Technology Co.,Ltd.\r
-                               Room 402, No. 11 Software Road, Tianhe District, Guangzhou\r
-                               Guangzhou  Guangdong  510640\r
-                               CN\r
-\r
 90-0A-62   (hex)               Inventus Power Eletronica do Brasil LTDA\r
 900A62     (base 16)           Inventus Power Eletronica do Brasil LTDA\r
                                Av Buriti, 4285 Distrito Industrial\r
@@ -38468,18 +38357,6 @@ A4897E     (base 16)           Guangzhou Yuhong Technology Co.,Ltd.
                                Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
                                CN\r
 \r
-AC-31-84   (hex)               Huawei Device Co., Ltd.\r
-AC3184     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
-50-3F-50   (hex)               Huawei Device Co., Ltd.\r
-503F50     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
 50-5F-B5   (hex)               ASKEY COMPUTER CORP\r
 505FB5     (base 16)           ASKEY COMPUTER CORP\r
                                10F, NO. 119, JIANKANG RD., ZHONGHE DIST.\r
@@ -38492,6 +38369,18 @@ AC3184     (base 16)           Huawei Device Co., Ltd.
                                NEW TAIPEI CITY    23585\r
                                TW\r
 \r
+AC-31-84   (hex)               Huawei Device Co., Ltd.\r
+AC3184     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+50-3F-50   (hex)               Huawei Device Co., Ltd.\r
+503F50     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
 48-1C-B9   (hex)               SZ DJI TECHNOLOGY CO.,LTD\r
 481CB9     (base 16)           SZ DJI TECHNOLOGY CO.,LTD\r
                                6/F,HKUST SZ IER Bldg,9 Yuexing 1st Rd\r
@@ -38504,12 +38393,6 @@ B8208E     (base 16)           Panasonic Connect Co., Ltd.
                                Fukuoka-shi  Fukuoka  812-8531\r
                                JP\r
 \r
-3C-A7-AE   (hex)               zte corporation\r
-3CA7AE     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 80-64-6F   (hex)               Espressif Inc.\r
 80646F     (base 16)           Espressif Inc.\r
                                Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
@@ -38522,23 +38405,29 @@ B8208E     (base 16)          Panasonic Connect Co., Ltd.
                                San Mateo  CA  94402\r
                                US\r
 \r
+F4-2B-7D   (hex)               Chipsguide technology CO.,LTD.\r
+F42B7D     (base 16)           Chipsguide technology CO.,LTD.\r
+                               No.758 in DongHua Design House, Nan Guang Road, Nan Shan Tone, ShenZhen, Guangdong, China\r
+                               Shenzhen  Guangdong  518002\r
+                               CN\r
+\r
+8C-52-19   (hex)               SHARP Corporation\r
+8C5219     (base 16)           SHARP Corporation\r
+                               1 Takumi-cho, Sakai-ku\r
+                               Sakai City  Osaka  590-8522\r
+                               JP\r
+\r
 E0-BA-AD   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
 E0BAAD     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
                                No.555 Qianmo Road\r
                                Hangzhou  Zhejiang  310052\r
                                CN\r
 \r
-08-91-15   (hex)               Amazon Technologies Inc.\r
-089115     (base 16)           Amazon Technologies Inc.\r
-                               P.O Box 8102 \r
-                               Reno  NV  89507\r
-                               US\r
-\r
-74-D4-23   (hex)               Amazon Technologies Inc.\r
-74D423     (base 16)           Amazon Technologies Inc.\r
-                               P.O Box 8102 \r
-                               Reno  NV  89507\r
-                               US\r
+D4-2D-C5   (hex)               i-PRO Co., Ltd.\r
+D42DC5     (base 16)           i-PRO Co., Ltd.\r
+                               4-1-62 Minoshima, Hakata-ku\r
+                               Fukuoka City     812-8531\r
+                               JP\r
 \r
 EC-1D-9E   (hex)               Quectel Wireless Solutions Co.,Ltd.\r
 EC1D9E     (base 16)           Quectel Wireless Solutions Co.,Ltd.\r
@@ -38552,35 +38441,47 @@ BCD767     (base 16)          BAE Systems Apllied Intelligence
                                Guildford  Surrey  GU2 7RQ\r
                                GB\r
 \r
+74-D4-23   (hex)               Amazon Technologies Inc.\r
+74D423     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+08-91-15   (hex)               Amazon Technologies Inc.\r
+089115     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
 2C-69-1D   (hex)               IEEE Registration Authority\r
 2C691D     (base 16)           IEEE Registration Authority\r
                                445 Hoes Lane\r
                                Piscataway  NJ  08554\r
                                US\r
 \r
-D4-2D-C5   (hex)               i-PRO Co., Ltd.\r
-D42DC5     (base 16)           i-PRO Co., Ltd.\r
-                               4-1-62 Minoshima, Hakata-ku\r
-                               Fukuoka City     812-8531\r
-                               JP\r
-\r
 E0-47-35   (hex)               Ericsson AB\r
 E04735     (base 16)           Ericsson AB\r
                                Torshamnsgatan 36\r
                                Stockholm    SE-164 80\r
                                SE\r
 \r
-F4-2B-7D   (hex)               Chipsguide technology CO.,LTD.\r
-F42B7D     (base 16)           Chipsguide technology CO.,LTD.\r
-                               No.758 in DongHua Design House, Nan Guang Road, Nan Shan Tone, ShenZhen, Guangdong, China\r
-                               Shenzhen  Guangdong  518002\r
-                               CN\r
+80-39-8C   (hex)               Samsung Electronics Co.,Ltd\r
+80398C     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
 \r
-8C-52-19   (hex)               SHARP Corporation\r
-8C5219     (base 16)           SHARP Corporation\r
-                               1 Takumi-cho, Sakai-ku\r
-                               Sakai City  Osaka  590-8522\r
-                               JP\r
+98-0D-6F   (hex)               Samsung Electronics Co.,Ltd\r
+980D6F     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+1C-90-FF   (hex)               Tuya Smart Inc.\r
+1C90FF     (base 16)           Tuya Smart Inc.\r
+                               160 Greentree Drive, Suite 101\r
+                               Dover  DE  19904\r
+                               US\r
 \r
 A0-44-F3   (hex)               RafaelMicro\r
 A044F3     (base 16)           RafaelMicro\r
@@ -38588,6 +38489,864 @@ A044F3     (base 16)          RafaelMicro
                                ChuBei City  HsinChu County  30264\r
                                TW\r
 \r
+C4-04-D8   (hex)               Aviva Links Inc.\r
+C404D8     (base 16)           Aviva Links Inc.\r
+                               160 E Tasman DrSTE 102\r
+                               SAN JOSE  CA  95134\r
+                               US\r
+\r
+E0-CA-3C   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+E0CA3C     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+98-20-44   (hex)               New H3C Technologies Co., Ltd\r
+982044     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+D8-A0-E8   (hex)               zte corporation\r
+D8A0E8     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+DC-6A-E7   (hex)               Xiaomi Communications Co Ltd\r
+DC6AE7     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+7C-A4-49   (hex)               Xiaomi Communications Co Ltd\r
+7CA449     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+10-82-3D   (hex)               Ruijie Networks Co.,LTD\r
+10823D     (base 16)           Ruijie Networks Co.,LTD\r
+                               No. 2, 7th floor, xingwangruijie, haixi hi-tech industrial park, high-tech zone, fuzhou city\r
+                               Fuzhou  Fujian  350002\r
+                               CN\r
+\r
+90-98-77   (hex)               Vestel Elektronik San ve Tic. A.S.\r
+909877     (base 16)           Vestel Elektronik San ve Tic. A.S.\r
+                               Organize san\r
+                               Manisa  Turket  45030\r
+                               TR\r
+\r
+E0-CB-1D   (hex)               Amazon Technologies Inc.\r
+E0CB1D     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+80-56-3C   (hex)               ZF\r
+80563C     (base 16)           ZF\r
+                               Ehlersstraße 50\r
+                               Friedrichshafen  BW  88046\r
+                               DE\r
+\r
+D0-06-6A   (hex)               Cornelis Networks, Inc.\r
+D0066A     (base 16)           Cornelis Networks, Inc.\r
+                               1500 Liberty Ridge Drive, Suite 100\r
+                               Wayne  PA  19087\r
+                               US\r
+\r
+2C-9E-00   (hex)               Sony Interactive Entertainment Inc.\r
+2C9E00     (base 16)           Sony Interactive Entertainment Inc.\r
+                               1-7-1 Konan\r
+                               Minato-ku  Tokyo  108-0075\r
+                               JP\r
+\r
+88-3C-93   (hex)               Alcatel-Lucent Enterprise\r
+883C93     (base 16)           Alcatel-Lucent Enterprise\r
+                               26801 West Agoura Rd\r
+                               Calabasas  CA  91301\r
+                               US\r
+\r
+AC-96-5B   (hex)               Lucid Motors\r
+AC965B     (base 16)           Lucid Motors\r
+                               7373 Gateway Blvd\r
+                               Newark  CA  94560\r
+                               US\r
+\r
+84-AA-A4   (hex)               SONoC Corp.\r
+84AAA4     (base 16)           SONoC Corp.\r
+                               8F-3, No. 1071, Zhongzheng Road, Taoyuan District, Taoyuan city, Taiwan\r
+                               Taoyuan    330\r
+                               TW\r
+\r
+E8-BF-DB   (hex)               Inodesign Group\r
+E8BFDB     (base 16)           Inodesign Group\r
+                               155 Avenue Georges Hannart\r
+                               CROIX    59170\r
+                               FR\r
+\r
+28-7E-80   (hex)               Hui Zhou Gaoshengda Technology Co.,LTD\r
+287E80     (base 16)           Hui Zhou Gaoshengda Technology Co.,LTD\r
+                               No.2,Jin-da Road,Huinan Industrial Park\r
+                               Hui Zhou  Guangdong  516025\r
+                               CN\r
+\r
+E8-FF-98   (hex)               Huawei Device Co., Ltd.\r
+E8FF98     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+24-15-51   (hex)               Huawei Device Co., Ltd.\r
+241551     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+58-95-7E   (hex)               Huawei Device Co., Ltd.\r
+58957E     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+00-1A-0F   (hex)               ARTECHE GROUP\r
+001A0F     (base 16)           ARTECHE GROUP\r
+                               Derio Bidea 28, Zabalondo Industrialdea\r
+                               Mungia  Bizkaia  48100\r
+                               ES\r
+\r
+B8-14-4D   (hex)               Apple, Inc.\r
+B8144D     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+EC-28-D3   (hex)               Apple, Inc.\r
+EC28D3     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+08-65-18   (hex)               Apple, Inc.\r
+086518     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+2C-57-CE   (hex)               Apple, Inc.\r
+2C57CE     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+0C-9F-71   (hex)               Dolphin Electronics (DongGuan) Co., Ltd.\r
+0C9F71     (base 16)           Dolphin Electronics (DongGuan) Co., Ltd.\r
+                               Building 3,No.2 Baolong Road, Houjie Town,\r
+                               Dongguan  Guangdong  523000\r
+                               CN\r
+\r
+74-58-89   (hex)               Multilaser Industrial S.A.\r
+745889     (base 16)           Multilaser Industrial S.A.\r
+                               Rua Josefa Gomes de Souza, 382\r
+                               Extrema  Minas Gerais  37640-000\r
+                               BR\r
+\r
+00-10-EC   (hex)               Embedded Planet\r
+0010EC     (base 16)           Embedded Planet\r
+                               31225 Bainbridge Road, Suite N\r
+                               Solon  OH  44139\r
+                               US\r
+\r
+FC-DF-00   (hex)               GD Midea Air-Conditioning Equipment Co.,Ltd.\r
+FCDF00     (base 16)           GD Midea Air-Conditioning Equipment Co.,Ltd.\r
+                               Midea Global Innovation Center,Beijiao Town,Shunde\r
+                               Foshan  Guangdong  528311\r
+                               CN\r
+\r
+F0-1A-A0   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+F01AA0     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+E4-8C-73   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+E48C73     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
+                               Chongqing   China  401120\r
+                               CN\r
+\r
+2C-94-52   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+2C9452     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+60-01-B1   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+6001B1     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+1C-8B-76   (hex)               Calix Inc.\r
+1C8B76     (base 16)           Calix Inc.\r
+                               2777 Orchard Pkwy\r
+                               San Jose  CA  95131\r
+                               US\r
+\r
+2C-B6-C8   (hex)               Raisecom Technology CO., LTD\r
+2CB6C8     (base 16)           Raisecom Technology CO., LTD\r
+                               No. 11, East Area, No. 10 Block, East Xibeiwang Road\r
+                               Beijing    100094\r
+                               CN\r
+\r
+D8-34-D1   (hex)               Shenzhen Orange Digital Technology Co.,Ltd\r
+D834D1     (base 16)           Shenzhen Orange Digital Technology Co.,Ltd\r
+                               Room 2305,Building 2,Phase 6 ,Vanke Yuncheng,Tongfa South Road,Xili Community,Xili Street,Nanshan District,Shenzhen\r
+                               Shenzhen    518055\r
+                               CN\r
+\r
+C4-61-C7   (hex)               Microsoft Corporation\r
+C461C7     (base 16)           Microsoft Corporation\r
+                               One Microsoft Way\r
+                               REDMOND  WA  98052\r
+                               US\r
+\r
+AC-CB-36   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+ACCB36     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+C8-40-52   (hex)               PAX Computer Technology(Shenzhen) Ltd.\r
+C84052     (base 16)           PAX Computer Technology(Shenzhen) Ltd.\r
+                               4/F, No.3 Building, Software Park, Second Central Science-Tech Road, High-Tech\r
+                               Shenzhen  GuangDong  518057\r
+                               CN\r
+\r
+00-1E-70   (hex)               Chelton Limited\r
+001E70     (base 16)           Chelton Limited\r
+                               The Chelton Centre, Fourth Avenue\r
+                               Marlow  Buckinghamshire  SL7 1TF \r
+                               GB\r
+\r
+64-1A-22   (hex)               Heliospectra AB\r
+641A22     (base 16)           Heliospectra AB\r
+                               Fiskhamnsgatan 2\r
+                               Gothenburg    SE-414 58\r
+                               SE\r
+\r
+54-70-68   (hex)               VTech Communications Limited\r
+547068     (base 16)           VTech Communications Limited\r
+                               23/F, Tai Ping Industrial Centre, Block 1, 57 Ting Kok Road, Tai Po, New Territories\r
+                               Hong kong    00852\r
+                               HK\r
+\r
+24-09-35   (hex)               Samsung Electronics Co.,Ltd\r
+240935     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+84-22-89   (hex)               Samsung Electronics Co.,Ltd\r
+842289     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+68-EE-4B   (hex)               Sharetronic Data Technology Co.,Ltd\r
+68EE4B     (base 16)           Sharetronic Data Technology Co.,Ltd\r
+                               Room 1209, 12 / F, Building 1, Yaohua Foundation Building, Shennan Avenue, Futian District\r
+                               Shenzhen  Guangdong  518040\r
+                               CN\r
+\r
+60-70-6C   (hex)               Google, Inc.\r
+60706C     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
+C8-2A-DD   (hex)               Google, Inc.\r
+C82ADD     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
+C0-A5-E8   (hex)               Intel Corporate\r
+C0A5E8     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+90-65-84   (hex)               Intel Corporate\r
+906584     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+28-C5-D2   (hex)               Intel Corporate\r
+28C5D2     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+AC-4C-A5   (hex)               Technicolor CH USA Inc.\r
+AC4CA5     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+00-CB-7A   (hex)               Technicolor CH USA Inc.\r
+00CB7A     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+48-C3-5A   (hex)               LENOVO(BEIJING)CO., LTD.\r
+48C35A     (base 16)           LENOVO(BEIJING)CO., LTD.\r
+                               Lenovo HQ East,Building 1,No.10 Courtyard Xibeiwang East Road,Haidian District\r
+                               Beijing    100176\r
+                               CN\r
+\r
+40-E1-1C   (hex)               shenzhen Cloud High Communication Technology Co.,Ltd\r
+40E11C     (base 16)           shenzhen Cloud High Communication Technology Co.,Ltd\r
+                               Room 1908, Building 1, Jinlitong Financial Center Building, No. 1100, Xingye Road, Haiwang Community, Xin'an Street, Bao'an District, Shenzhen, China  \r
+                               Shenzhen    518128\r
+                               CN\r
+\r
+C4-83-72   (hex)               IEEE Registration Authority\r
+C48372     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+B4-DB-91   (hex)               CELESTICA INC.\r
+B4DB91     (base 16)           CELESTICA INC.\r
+                               1900-5140 Yonge Street PO Box 42   \r
+                               Toronto  Ontario  M2N 6L7\r
+                               CA\r
+\r
+C0-BF-AC   (hex)               Huawei Device Co., Ltd.\r
+C0BFAC     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+44-27-2E   (hex)               Huawei Device Co., Ltd.\r
+44272E     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+08-1A-FD   (hex)               Huawei Device Co., Ltd.\r
+081AFD     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+84-07-C4   (hex)               Carrier Corporation\r
+8407C4     (base 16)           Carrier Corporation\r
+                               13995 Pasteur Boulevard\r
+                               Palm Beach Gardens  FL  33418\r
+                               US\r
+\r
+10-66-50   (hex)               Robert Bosch JuP1\r
+106650     (base 16)           Robert Bosch JuP1\r
+                               Robert Bosch 1150\r
+                               Juarez  Chihuahua  32557\r
+                               MX\r
+\r
+A8-0C-03   (hex)               Florawise\r
+A80C03     (base 16)           Florawise\r
+                               ?TÜ Ar? Teknokent No:6 Sar?yer\r
+                               ?stanbul    34467\r
+                               TR\r
+\r
+CC-8D-B5   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
+CC8DB5     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
+                               1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+AC-EE-64   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
+ACEE64     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
+                               1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+44-64-3C   (hex)               Cisco Systems, Inc\r
+44643C     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+24-16-1B   (hex)               Cisco Systems, Inc\r
+24161B     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+A8-40-0B   (hex)               Visteon Corporation\r
+A8400B     (base 16)           Visteon Corporation\r
+                               One Village Center Drive\r
+                               Van Buren Twp  MI  48111\r
+                               US\r
+\r
+00-12-F3   (hex)               u-blox AG\r
+0012F3     (base 16)           u-blox AG\r
+                               Norra Vallgatan 64\r
+                               Malmoe    SE-211 22\r
+                               SE\r
+\r
+18-18-8B   (hex)               FCNT LMITED\r
+18188B     (base 16)           FCNT LMITED\r
+                               Sanki Yamato Building, 7-10-1 Chuorinkan\r
+                               Yamato  Kanagawa  242-8588\r
+                               JP\r
+\r
+3C-B0-7E   (hex)               Arounds Intelligent Equipment Co., Ltd.\r
+3CB07E     (base 16)           Arounds Intelligent Equipment Co., Ltd.\r
+                               Room 701~703,Vanke Huamao Plaza? No.508, East 2nd Section, 2ndRingRoad,Chenghua District\r
+                               Chengdu  Sichuan  610000\r
+                               CN\r
+\r
+5C-A0-6C   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+5CA06C     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
+                               Chongqing   China  401120\r
+                               CN\r
+\r
+C0-4E-8A   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+C04E8A     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+08-56-9B   (hex)               WiZ\r
+08569B     (base 16)           WiZ\r
+                               Unit 1203-5, 12/F, Tower 1, Enterprise Square, 9 Sheung Yuet Road\r
+                               Kowloon Bay  Hong Kong  0000\r
+                               HK\r
+\r
+20-31-8D   (hex)               Giax GmbH\r
+20318D     (base 16)           Giax GmbH\r
+                               Am Weichselgarten 7\r
+                               Erlangen    91058\r
+                               DE\r
+\r
+8C-94-6A   (hex)               New H3C Technologies Co., Ltd\r
+8C946A     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+FC-11-65   (hex)               Cambium Networks Limited\r
+FC1165     (base 16)           Cambium Networks Limited\r
+                               Unit B2, Linhay Business Park,\r
+                               Ashburton  Devon  TQ13 7UP\r
+                               GB\r
+\r
+F8-00-9D   (hex)               INTRACOM DEFENSE S.A.\r
+F8009D     (base 16)           INTRACOM DEFENSE S.A.\r
+                               21 Km. Markopoulou Ave.\r
+                               Koropi  Attica  19441\r
+                               GR\r
+\r
+20-16-42   (hex)               Microsoft Corporation\r
+201642     (base 16)           Microsoft Corporation\r
+                               One Microsoft Way\r
+                               REDMOND  WA  98052\r
+                               US\r
+\r
+A8-3B-76   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+A83B76     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+                               B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
+                               Nanning  Guangxi  530007\r
+                               CN\r
+\r
+48-E7-29   (hex)               Espressif Inc.\r
+48E729     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+90-DA-F9   (hex)               Siemens Rail Automation SAU\r
+90DAF9     (base 16)           Siemens Rail Automation SAU\r
+                               Ronda de Europa, 5\r
+                               Tres Cantos    28760 \r
+                               ES\r
+\r
+E8-BA-E2   (hex)               Xplora Technologies AS\r
+E8BAE2     (base 16)           Xplora Technologies AS\r
+                               Nedre Slottsgate 8\r
+                               Oslo    0157\r
+                               NO\r
+\r
+90-27-78   (hex)               Open Infrastructure\r
+902778     (base 16)           Open Infrastructure\r
+                               Neufeldstrasse 125\r
+                               Bern    3012\r
+                               CH\r
+\r
+08-E6-3B   (hex)               zte corporation\r
+08E63B     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+88-C1-74   (hex)               zte corporation\r
+88C174     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+CC-29-BD   (hex)               zte corporation\r
+CC29BD     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+BC-F8-8B   (hex)               zte corporation\r
+BCF88B     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+3C-A7-AE   (hex)               zte corporation\r
+3CA7AE     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+9C-DE-4D   (hex)               ML vision Co.,LTD\r
+9CDE4D     (base 16)           ML vision Co.,LTD\r
+                               #503, 403-dong, Bucheon Techno Park, 655, Pyeongcheon-ro\r
+                               Bucheon-si  Gyeonggi-do  14502\r
+                               KR\r
+\r
+10-3C-59   (hex)               zte corporation\r
+103C59     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+78-90-A2   (hex)               zte corporation\r
+7890A2     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+50-5D-7A   (hex)               zte corporation\r
+505D7A     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+FC-33-57   (hex)               KAGA FEI Co., Ltd.\r
+FC3357     (base 16)           KAGA FEI Co., Ltd.\r
+                               100-45, Shinyokohama 2-Chome\r
+                               Kohoku-Ku Yokohama-Shi  Kanagawa  222-8508\r
+                               JP\r
+\r
+5C-BB-EE   (hex)               zte corporation\r
+5CBBEE     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+68-41-8F   (hex)               Telechips, Inc.\r
+68418F     (base 16)           Telechips, Inc.\r
+                               19F~23F,Luther Bldg.42, Olympic-ro 35da-gil, Songpa-gu,\r
+                               Seoul  Seoul  05510\r
+                               KR\r
+\r
+BC-9E-BB   (hex)               Nintendo Co.,Ltd\r
+BC9EBB     (base 16)           Nintendo Co.,Ltd\r
+                               11-1 HOKOTATE-CHO KAMITOBA,MINAMI-KU\r
+                               KYOTO  KYOTO  601-8501\r
+                               JP\r
+\r
+50-5A-65   (hex)               AzureWave Technologies, Inc.\r
+505A65     (base 16)           AzureWave Technologies, Inc.\r
+                               8F., No. 94, Baozhong Rd., Xindian Dist.\r
+                               New Taipei City    23144\r
+                               TW\r
+\r
+F8-F0-C5   (hex)               Suzhou Kuhan Information Technologies Co.,Ltd.\r
+F8F0C5     (base 16)           Suzhou Kuhan Information Technologies Co.,Ltd.\r
+                               4F?A5F, SISPARK Building 17, Industrial Park District, Suzhou\r
+                               Suzhou  Jiangsu  215028\r
+                               CN\r
+\r
+F8-DE-73   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+F8DE73     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+EC-1A-02   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+EC1A02     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+3C-3B-99   (hex)               ITEL MOBILE LIMITED\r
+3C3B99     (base 16)           ITEL MOBILE LIMITED\r
+                               RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K\r
+                               Hong Kong  KOWLOON  999077\r
+                               HK\r
+\r
+1C-1A-1B   (hex)               Shanghai Sunmi Technology Co.,Ltd.\r
+1C1A1B     (base 16)           Shanghai Sunmi Technology Co.,Ltd.\r
+                               Room 505, No.388 Song Hu Road, Yang Pu District, Shanghai, China\r
+                               Shanghai  Shanghai  200433\r
+                               CN\r
+\r
+10-2E-00   (hex)               Intel Corporate\r
+102E00     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+80-38-D4   (hex)               Fibercentury Network Technology Co.,Ltd.\r
+8038D4     (base 16)           Fibercentury Network Technology Co.,Ltd.\r
+                               No. 1515 and No. 1516, floor 15, unit 2, building 2, Section 1, Huayang Huafu Avenue, Tianfu new area\r
+                               Chengdu  Sichuan  610000\r
+                               CN\r
+\r
+7C-29-6F   (hex)               Apple, Inc.\r
+7C296F     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+40-ED-CF   (hex)               Apple, Inc.\r
+40EDCF     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+8C-98-6B   (hex)               Apple, Inc.\r
+8C986B     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+D0-39-57   (hex)               Liteon Technology Corporation\r
+D03957     (base 16)           Liteon Technology Corporation\r
+                               4F, 90, Chien 1 Road\r
+                               New Taipei City  Taiwan  23585\r
+                               TW\r
+\r
+1C-86-82   (hex)               Apple, Inc.\r
+1C8682     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+80-54-E3   (hex)               Apple, Inc.\r
+8054E3     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+D0-09-C8   (hex)               Cisco Systems, Inc\r
+D009C8     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+FC-91-89   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
+FC9189     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
+                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
+                               Chengdu  Sichuan  611330\r
+                               CN\r
+\r
+A8-16-9D   (hex)               Hui Zhou Gaoshengda Technology Co.,LTD\r
+A8169D     (base 16)           Hui Zhou Gaoshengda Technology Co.,LTD\r
+                               No.2,Jin-da Road,Huinan Industrial Park\r
+                               Hui Zhou  Guangdong  516025\r
+                               CN\r
+\r
+AC-AD-4B   (hex)               zte corporation\r
+ACAD4B     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+20-3A-43   (hex)               Intel Corporate\r
+203A43     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+44-49-88   (hex)               Intel Corporate\r
+444988     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+90-B4-DD   (hex)               ZPT R&D\r
+90B4DD     (base 16)           ZPT R&D\r
+                               Hovås Snöbärsväg 2, lgh 201\r
+                               Hovås    43654\r
+                               SE\r
+\r
+80-F7-A6   (hex)               Shenzhen C-Data Technology Co., Ltd.\r
+80F7A6     (base 16)           Shenzhen C-Data Technology Co., Ltd.\r
+                               #601, Fl6, Bldg F, No.1008  Yangguang Community, Xili, Nanshan\r
+                               Shenzhen  Guangdong  518055\r
+                               CN\r
+\r
+9C-54-40   (hex)               ChengDu TD Tech\r
+9C5440     (base 16)           ChengDu TD Tech\r
+                               C3 floor, software park, No. 219, Tianhua Second Road\r
+                               Chengdu  Tianfu Avenue, high tech Zone  610041\r
+                               CN\r
+\r
+50-26-EF   (hex)               Murata Manufacturing Co., Ltd.\r
+5026EF     (base 16)           Murata Manufacturing Co., Ltd.\r
+                               1-10-1, Higashikotari\r
+                               Nagaokakyo-shi  Kyoto  617-8555\r
+                               JP\r
+\r
+74-05-7C   (hex)               Qorvo International Pte. Ltd.\r
+74057C     (base 16)           Qorvo International Pte. Ltd.\r
+                               1 Changi Business Park Avenue 1\r
+                               #04-01    486058\r
+                               SG\r
+\r
+F0-22-1D   (hex)               IEEE Registration Authority\r
+F0221D     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+94-1F-A2   (hex)               Wuhan YuXin Semiconductor Co., Ltd.\r
+941FA2     (base 16)           Wuhan YuXin Semiconductor Co., Ltd.\r
+                               15F Haida Innovation Plaza, No. 66 of Chuangye Road, Donghu New Technology Development Zone\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+6C-D1-99   (hex)               vivo Mobile Communication Co., Ltd.\r
+6CD199     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               No.1, vivo Road, Chang'an\r
+                               Dongguan  Guangdong  523860\r
+                               CN\r
+\r
+00-09-EE   (hex)               MEIKYO ELECTRIC CO.,LTD\r
+0009EE     (base 16)           MEIKYO ELECTRIC CO.,LTD\r
+                               Tokyo Ferrite Building, 1-1-14 Tabatashinmachi\r
+                               Tokyo  Kita-ku  114-0012\r
+                               JP\r
+\r
+E8-26-B6   (hex)               Companies House to GlucoRx Technologies Ltd.\r
+E826B6     (base 16)           Companies House to GlucoRx Technologies Ltd.\r
+                               Strathpeffer Road\r
+                               Dingwall  Scotland  IV159QF\r
+                               GB\r
+\r
+80-AB-4D   (hex)               Nokia Solutions and Networks GmbH & Co. KG\r
+80AB4D     (base 16)           Nokia Solutions and Networks GmbH & Co. KG\r
+                               Werinherstrasse 91\r
+                               München  Bavaria  D-81541\r
+                               DE\r
+\r
+4C-BA-7D   (hex)               Gemtek Technology Co., Ltd.\r
+4CBA7D     (base 16)           Gemtek Technology Co., Ltd.\r
+                               No.15-1 Zhonghua Road\r
+                               Hukou  Hsinchu  30352\r
+                               TW\r
+\r
+D0-40-BE   (hex)               NPO RPS LLC\r
+D040BE     (base 16)           NPO RPS LLC\r
+                               Internal territory of the urban settlement of Mosrentgen, the settlement of the Mosrentgen factory, building 1/10, office 206\r
+                               Moscow    108820\r
+                               RU\r
+\r
+F4-4D-AD   (hex)               Cable Matters Inc.\r
+F44DAD     (base 16)           Cable Matters Inc.\r
+                               153 Northboro Road, Suite 5\r
+                               Southborough  MA  01772\r
+                               US\r
+\r
+F0-4A-3D   (hex)               Bosch Thermotechnik GmbH\r
+F04A3D     (base 16)           Bosch Thermotechnik GmbH\r
+                               Sophienstraße 30-32\r
+                               Wetzlar    35576\r
+                               DE\r
+\r
+B4-9D-FD   (hex)               Shenzhen SDMC Technology CO.,Ltd.\r
+B49DFD     (base 16)           Shenzhen SDMC Technology CO.,Ltd.\r
+                               Room 1022, Floor 10, Building A, Customs Building, No. 2, Xin'an 3rd Road, Dalang Community, Xin'an Street, Bao'an District\r
+                               Shenzhen  GUANGDONG  518101\r
+                               CN\r
+\r
+80-76-C2   (hex)               GD Midea Air-Conditioning Equipment Co.,Ltd.\r
+8076C2     (base 16)           GD Midea Air-Conditioning Equipment Co.,Ltd.\r
+                               Midea Global Innovation Center,Beijiao Town,Shunde\r
+                               Foshan  Guangdong  528311\r
+                               CN\r
+\r
+F8-D2-AC   (hex)               Technicolor CH USA Inc.\r
+F8D2AC     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+B0-BC-7A   (hex)               Harman/Becker Automotive Systems GmbH\r
+B0BC7A     (base 16)           Harman/Becker Automotive Systems GmbH\r
+                               Becker-Göring-Straße 16\r
+                               Karlsbad  Baden-Württemberg  76307\r
+                               DE\r
+\r
+A0-A0-01   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+A0A001     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+DC-06-82   (hex)               Accessia Technology Ltd.\r
+DC0682     (base 16)           Accessia Technology Ltd.\r
+                               Boundary House, Cricket Field Rd\r
+                               Uxbridge    UB8 1QG\r
+                               GB\r
+\r
+44-D2-67   (hex)               Snorble\r
+44D267     (base 16)           Snorble\r
+                               PO Box 40\r
+                               Skillman  NJ  08558\r
+                               US\r
+\r
+78-49-46   (hex)               Cambridge Mobile Telematics, Inc.\r
+784946     (base 16)           Cambridge Mobile Telematics, Inc.\r
+                               One Broadway, 14th Floor\r
+                               Cambridge  MA  02142\r
+                               US\r
+\r
+F4-1A-9C   (hex)               Xiaomi Communications Co Ltd\r
+F41A9C     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+00-1A-EB   (hex)               Allied Telesis K.K.\r
+001AEB     (base 16)           Allied Telesis K.K.\r
+                               No.2 TOC Bldg.\r
+                               Shinagawa-ku  Tokyo  141-0031\r
+                               JP\r
+\r
+10-D6-80   (hex)               Tendyron Corporation\r
+10D680     (base 16)           Tendyron Corporation\r
+                               Tendyron Building,Zhongguancun NO.1 Park,Beiqing Road,Haidian District,Beijing,China\r
+                               Beijing    100000\r
+                               CN\r
+\r
+0C-FC-18   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+0CFC18     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
 9C-FF-C2   (hex)               AVI Systems GmbH\r
 9CFFC2     (base 16)           AVI Systems GmbH\r
                                Dr. Franz Wilhelmstraße 2A\r
@@ -40031,12 +40790,6 @@ BC3E07     (base 16)           Hitron Technologies. Inc
                                Gyeonggi-do    KSXX0024\r
                                KR\r
 \r
-9C-DB-07   (hex)               Thum+Mahr GmbH\r
-9CDB07     (base 16)           Thum+Mahr GmbH\r
-                               Heinrich-Hertz-Strasse 1-3\r
-                               Monheim am Rhein  NRW  40789\r
-                               DE\r
-\r
 DC-EB-69   (hex)               Technicolor CH USA Inc.\r
 DCEB69     (base 16)           Technicolor CH USA Inc.\r
                                5030 Sugarloaf Parkway Bldg 6 \r
@@ -40355,9 +41108,6 @@ F8501C     (base 16)            Tianjin Geneuo Technology Co.,Ltd
                                Mountain View  CA  94043\r
                                US\r
 \r
-F8-C2-49   (hex)               Private\r
-F8C249     (base 16)           Private\r
-\r
 B8-31-B5   (hex)               Microsoft Corporation\r
 B831B5     (base 16)           Microsoft Corporation\r
                                One Microsoft Way\r
@@ -51629,12 +52379,6 @@ D8FEE3     (base 16)           D-Link International
                                Singapore  Singapore  609917\r
                                SG\r
 \r
-58-F3-87   (hex)               HCCP\r
-58F387     (base 16)           HCCP\r
-                               Gabriel Metsulaan 4a\r
-                               EINDHOVEN    5611SP\r
-                               NL\r
-\r
 3C-97-7E   (hex)               IPS Technology Limited\r
 3C977E     (base 16)           IPS Technology Limited\r
                                7 Floor,E  block,Dong Hai Wang Building\r
@@ -54494,12 +55238,6 @@ C8208E     (base 16)           Storagedata
                                Seoul    137-720\r
                                KR\r
 \r
-28-E2-97   (hex)               Shanghai InfoTM Microelectronics Co.,Ltd.\r
-28E297     (base 16)           Shanghai InfoTM Microelectronics Co.,Ltd.\r
-                               building 11,NO.115,lane 572,BiBo Road,\r
-                               ShangHai    201203\r
-                               CN\r
-\r
 34-B5-71   (hex)               PLDS\r
 34B571     (base 16)           PLDS\r
                                Schanzenfeldstrasse 2\r
@@ -56126,12 +56864,6 @@ D4AAFF     (base 16)           MICRO WORLD
                                Taipei    114\r
                                TW\r
 \r
-00-26-7F   (hex)               Zenterio AB\r
-00267F     (base 16)           Zenterio AB\r
-                               Diskettgatan 11B\r
-                               Linköping    58335\r
-                               SE\r
-\r
 00-26-98   (hex)               Cisco Systems, Inc\r
 002698     (base 16)           Cisco Systems, Inc\r
                                80 West Tasman Drive\r
@@ -64652,12 +65384,6 @@ D4AAFF     (base 16)           MICRO WORLD
                                Salt Lake City  UT  84115\r
                                US\r
 \r
-00-03-B1   (hex)               Hospira Inc.\r
-0003B1     (base 16)           Hospira Inc.\r
-                               755 Jarvis Drive\r
-                               Morgan Hill  CA  95037\r
-                               US\r
-\r
 00-03-B3   (hex)               IA Link Systems Co., Ltd.\r
 0003B3     (base 16)           IA Link Systems Co., Ltd.\r
                                6F-4, No. 81 Hsin Tai\r
@@ -71543,12 +72269,6 @@ B04414     (base 16)           New H3C Technologies Co., Ltd
                                Hangzhou  Zhejiang  310052\r
                                CN\r
 \r
-48-4B-D4   (hex)               Technicolor CH USA Inc.\r
-484BD4     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 30-96-10   (hex)               Huawei Device Co., Ltd.\r
 309610     (base 16)           Huawei Device Co., Ltd.\r
                                No.2 of Xincheng Road, Songshan Lake Zone\r
@@ -72941,12 +73661,6 @@ F8ABE5     (base 16)           shenzhen worldelite electronics co., LTD
                                Shenzhen  Guangdong  51800\r
                                CN\r
 \r
-E0-DB-D1   (hex)               Technicolor CH USA Inc.\r
-E0DBD1     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 CC-ED-21   (hex)               Nokia Shanghai Bell Co., Ltd.\r
 CCED21     (base 16)           Nokia Shanghai Bell Co., Ltd.\r
                                No.388 Ning Qiao Road,Jin Qiao Pudong Shanghai\r
@@ -73673,12 +74387,6 @@ ACEC85     (base 16)           eero inc.
                                San Francisco  CA  94107\r
                                US\r
 \r
-EC-A8-1F   (hex)               Technicolor CH USA Inc.\r
-ECA81F     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 C0-F8-27   (hex)               Rapidmax Technology Corporation\r
 C0F827     (base 16)           Rapidmax Technology Corporation\r
                                3F., No.531, Zhongzheng Rd. Xindian Dist.\r
@@ -73829,12 +74537,6 @@ C4C36B     (base 16)           Apple, Inc.
                                Chengdu  Sichuan  611330\r
                                CN\r
 \r
-28-77-77   (hex)               zte corporation\r
-287777     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 00-91-9E   (hex)               Intel Corporate\r
 00919E     (base 16)           Intel Corporate\r
                                Lot 8, Jalan Hi-Tech 2/3  \r
@@ -74093,18 +74795,6 @@ E0C58F     (base 16)           China Mobile IOT Company Limited
                                Shenzhen  GuangDong  518000\r
                                CN\r
 \r
-30-B9-30   (hex)               zte corporation\r
-30B930     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-94-98-69   (hex)               zte corporation\r
-949869     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 7C-66-EF   (hex)               Hon Hai Precision IND.CO.,LTD\r
 7C66EF     (base 16)           Hon Hai Precision IND.CO.,LTD\r
                                No. 66 Chung Shan Road TU-Cheng Industrial district TAIPEI TAIWAN \r
@@ -74297,12 +74987,6 @@ E4936A     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
                                DONG GUAN  GUANG DONG  523860\r
                                CN\r
 \r
-F8-56-C3   (hex)               zte corporation\r
-F856C3     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 7C-FC-16   (hex)               Apple, Inc.\r
 7CFC16     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
@@ -74579,18 +75263,6 @@ DC8C1B     (base 16)           vivo Mobile Communication Co., Ltd.
                                Dongguan  Guangdong  523860\r
                                CN\r
 \r
-54-1F-8D   (hex)               zte corporation\r
-541F8D     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-2C-F1-BB   (hex)               zte corporation\r
-2CF1BB     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 CC-71-90   (hex)               VIETNAM POST AND TELECOMMUNICATION INDUSTRY TECHNOLOGY JOINT STOCK COMPANY\r
 CC7190     (base 16)           VIETNAM POST AND TELECOMMUNICATION INDUSTRY TECHNOLOGY JOINT STOCK COMPANY\r
                                HIGH TECH INDUSTRIAL ZONE I,HOA LAC, HIGH TECH PARK, HA BANG, THACH THAT\r
@@ -75029,18 +75701,6 @@ A4438C     (base 16)           ARRIS Group, Inc.
                                Chongqing   China  401120\r
                                CN\r
 \r
-D8-4A-2B   (hex)               zte corporation\r
-D84A2B     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-D0-F9-9B   (hex)               zte corporation\r
-D0F99B     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 98-67-2E   (hex)               Skullcandy\r
 98672E     (base 16)           Skullcandy\r
                                6301 N. LANDMARK DRIVE\r
@@ -75473,12 +76133,6 @@ D833B7     (base 16)           Sagemcom Broadband SAS
                                Rueil Malmaison Cedex  hauts de seine  92848\r
                                FR\r
 \r
-44-0C-EE   (hex)               Robert Bosch Elektronika Kft\r
-440CEE     (base 16)           Robert Bosch Elektronika Kft\r
-                               Robert Bosch u. 1.\r
-                               Hatvan  Heves County  3000\r
-                               HU\r
-\r
 D8-50-A1   (hex)               Hunan Danuo Technology Co.,LTD\r
 D850A1     (base 16)           Hunan Danuo Technology Co.,LTD\r
                                No. 89, Guoqing South Road, Beihu District, Chenzhou City, Hunan Province (in Xiangnan International Logistics Park)\r
@@ -75503,24 +76157,6 @@ D850A1     (base 16)           Hunan Danuo Technology Co.,LTD
                                Hong Kong  Hong Kong  999077\r
                                HK\r
 \r
-7C-6C-F0   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
-7C6CF0     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
-                               4/F, H-3 Building, Qiao Cheng Eastern Industrial Park, Overseas Chinese Town, Shenzhen \r
-                               Shenzhen   guangdong  518053\r
-                               CN\r
-\r
-00-C3-0A   (hex)               Xiaomi Communications Co Ltd\r
-00C30A     (base 16)           Xiaomi Communications Co Ltd\r
-                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
-                               Beijing  Haidian District  100085\r
-                               CN\r
-\r
-88-52-EB   (hex)               Xiaomi Communications Co Ltd\r
-8852EB     (base 16)           Xiaomi Communications Co Ltd\r
-                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
-                               Beijing  Haidian District  100085\r
-                               CN\r
-\r
 B4-28-75   (hex)               Futecho Solutions Private Limited\r
 B42875     (base 16)           Futecho Solutions Private Limited\r
                                504, Commercial Complex, Savitri Cinema Compound, GK2\r
@@ -75539,6 +76175,24 @@ B42875     (base 16)           Futecho Solutions Private Limited
                                San Francisco  CA  94107\r
                                US\r
 \r
+00-C3-0A   (hex)               Xiaomi Communications Co Ltd\r
+00C30A     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+88-52-EB   (hex)               Xiaomi Communications Co Ltd\r
+8852EB     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+7C-6C-F0   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
+7C6CF0     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
+                               4/F, H-3 Building, Qiao Cheng Eastern Industrial Park, Overseas Chinese Town, Shenzhen \r
+                               Shenzhen   guangdong  518053\r
+                               CN\r
+\r
 00-A0-A2   (hex)               B810 S.R.L.\r
 00A0A2     (base 16)           B810 S.R.L.\r
                                Via E. Lazzaretti 2/1\r
@@ -75611,12 +76265,6 @@ DC9A7D     (base 16)           HISENSE VISUAL TECHNOLOGY CO.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
-30-CB-36   (hex)               Belden Singapore Pte. Ltd.\r
-30CB36     (base 16)           Belden Singapore Pte. Ltd.\r
-                               151 Lorong Chuan #05-01 New Tech Park Singapore\r
-                               Singapore    556741\r
-                               SG\r
-\r
 B8-3F-D2   (hex)               Mellanox Technologies, Inc.\r
 B83FD2     (base 16)           Mellanox Technologies, Inc.\r
                                350 Oakmead Parkway, Suite 100 \r
@@ -75629,6 +76277,12 @@ B83FD2     (base 16)           Mellanox Technologies, Inc.
                                 Chiyoda-ku  Tokyo  100-0004\r
                                JP\r
 \r
+30-CB-36   (hex)               Belden Singapore Pte. Ltd.\r
+30CB36     (base 16)           Belden Singapore Pte. Ltd.\r
+                               151 Lorong Chuan #05-01 New Tech Park Singapore\r
+                               Singapore    556741\r
+                               SG\r
+\r
 8C-17-59   (hex)               Intel Corporate\r
 8C1759     (base 16)           Intel Corporate\r
                                Lot 8, Jalan Hi-Tech 2/3  \r
@@ -75641,29 +76295,11 @@ B83FD2     (base 16)          Mellanox Technologies, Inc.
                                San Jose  CA  95131\r
                                US\r
 \r
-6C-A4-01   (hex)               essensys plc\r
-6CA401     (base 16)           essensys plc\r
-                               Aldgate Tower, Leman Street\r
-                               London    E1 8FA\r
-                               GB\r
-\r
-34-92-C2   (hex)               Square Route Co., Ltd.\r
-3492C2     (base 16)           Square Route Co., Ltd.\r
-                               Area-Shinagawa 13F, 1-9-36, Konan, Minato-ku\r
-                               Tokyo  Tokyo  108-0075\r
-                               JP\r
-\r
-34-BD-20   (hex)               Hangzhou Hikrobot Technology Co., Ltd.\r
-34BD20     (base 16)           Hangzhou Hikrobot Technology Co., Ltd.\r
-                               Room 304, Unit B, Building 2, 399 Danfeng Road, Binjiang District, Hangzhou, Zhejiang\r
-                               Hangzhou    310052\r
-                               CN\r
-\r
-64-C2-69   (hex)               eero inc.\r
-64C269     (base 16)           eero inc.\r
-                               660 3rd Street\r
-                               San Francisco  CA  94107\r
-                               US\r
+BC-6E-6D   (hex)               EM Microelectronic\r
+BC6E6D     (base 16)           EM Microelectronic\r
+                               Rue des Sors 3\r
+                               Marin-Epagnier  Neuchatel  2074\r
+                               CH\r
 \r
 B0-4A-6A   (hex)               Samsung Electronics Co.,Ltd\r
 B04A6A     (base 16)           Samsung Electronics Co.,Ltd\r
@@ -75683,30 +76319,48 @@ A8798D     (base 16)          Samsung Electronics Co.,Ltd
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
+34-92-C2   (hex)               Square Route Co., Ltd.\r
+3492C2     (base 16)           Square Route Co., Ltd.\r
+                               Area-Shinagawa 13F, 1-9-36, Konan, Minato-ku\r
+                               Tokyo  Tokyo  108-0075\r
+                               JP\r
+\r
 28-3D-C2   (hex)               Samsung Electronics Co.,Ltd\r
 283DC2     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
-BC-6E-6D   (hex)               EM Microelectronic\r
-BC6E6D     (base 16)           EM Microelectronic\r
-                               Rue des Sors 3\r
-                               Marin-Epagnier  Neuchatel  2074\r
-                               CH\r
-\r
 00-D4-9E   (hex)               Intel Corporate\r
 00D49E     (base 16)           Intel Corporate\r
                                Lot 8, Jalan Hi-Tech 2/3  \r
                                Kulim  Kedah  09000\r
                                MY\r
 \r
+6C-A4-01   (hex)               essensys plc\r
+6CA401     (base 16)           essensys plc\r
+                               Aldgate Tower, Leman Street\r
+                               London    E1 8FA\r
+                               GB\r
+\r
 CC-F3-05   (hex)               SHENZHEN TIAN XING CHUANG ZHAN ELECTRONIC CO.,LTD\r
 CCF305     (base 16)           SHENZHEN TIAN XING CHUANG ZHAN ELECTRONIC CO.,LTD\r
                                Second floor, Building A, FengHangAvenue, Hangcheng Street, Bao'an District\r
                                Shenzhen  Guangdong  518126\r
                                CN\r
 \r
+34-BD-20   (hex)               Hangzhou Hikrobot Technology Co., Ltd.\r
+34BD20     (base 16)           Hangzhou Hikrobot Technology Co., Ltd.\r
+                               Room 304, Unit B, Building 2, 399 Danfeng Road, Binjiang District, Hangzhou, Zhejiang\r
+                               Hangzhou    310052\r
+                               CN\r
+\r
+64-C2-69   (hex)               eero inc.\r
+64C269     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
 AC-2A-A1   (hex)               Cisco Systems, Inc\r
 AC2AA1     (base 16)           Cisco Systems, Inc\r
                                80 West Tasman Drive\r
@@ -75725,16 +76379,34 @@ F8E94F     (base 16)          Cisco Systems, Inc
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-E0-6C-C5   (hex)               Huawei Device Co., Ltd.\r
-E06CC5     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
+B8-D6-1A   (hex)               Espressif Inc.\r
+B8D61A     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
                                CN\r
 \r
-30-96-3B   (hex)               Huawei Device Co., Ltd.\r
-30963B     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
+BC-F4-D4   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+BCF4D4     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+                               B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
+                               Nanning  Guangxi  530007\r
+                               CN\r
+\r
+D8-9C-8E   (hex)               Comcast Cable Corporation\r
+D89C8E     (base 16)           Comcast Cable Corporation\r
+                               1800 Arch Street\r
+                               Philadelphia  PA  19103\r
+                               US\r
+\r
+74-56-3C   (hex)               GIGA-BYTE TECHNOLOGY CO.,LTD.\r
+74563C     (base 16)           GIGA-BYTE TECHNOLOGY CO.,LTD.\r
+                               Pin-Jen City, Taoyuan, Taiwan, R.O.C.\r
+                               Pin-Jen  Taoyuan  324\r
+                               TW\r
+\r
+EC-55-1C   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+EC551C     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
                                CN\r
 \r
 8C-6B-DB   (hex)               Huawei Device Co., Ltd.\r
@@ -75761,6 +76433,24 @@ E06CC5     (base 16)           Huawei Device Co., Ltd.
                                Dongguan  Guangdong  523808\r
                                CN\r
 \r
+E0-6C-C5   (hex)               Huawei Device Co., Ltd.\r
+E06CC5     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+30-96-3B   (hex)               Huawei Device Co., Ltd.\r
+30963B     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+90-B5-7F   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
+90B57F     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
+                               Room 601,Block B ,Digital Building,Garden City\r
+                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
+                               CN\r
+\r
 98-59-7A   (hex)               Intel Corporate\r
 98597A     (base 16)           Intel Corporate\r
                                Lot 8, Jalan Hi-Tech 2/3  \r
@@ -75773,11 +76463,11 @@ E06CC5     (base 16)          Huawei Device Co., Ltd.
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-B8-D6-1A   (hex)               Espressif Inc.\r
-B8D61A     (base 16)           Espressif Inc.\r
-                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
-                               Shanghai  Shanghai  201203\r
-                               CN\r
+B4-83-51   (hex)               Intel Corporate\r
+B48351     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
 \r
 00-25-CA   (hex)               Laird Connectivity\r
 0025CA     (base 16)           Laird Connectivity\r
@@ -75785,66 +76475,18 @@ B8D61A     (base 16)          Espressif Inc.
                                Cedarburg  WI  53012\r
                                US\r
 \r
-90-B5-7F   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
-90B57F     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
-                               Room 601,Block B ,Digital Building,Garden City\r
-                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
-                               CN\r
-\r
-74-56-3C   (hex)               GIGA-BYTE TECHNOLOGY CO.,LTD.\r
-74563C     (base 16)           GIGA-BYTE TECHNOLOGY CO.,LTD.\r
-                               Pin-Jen City, Taoyuan, Taiwan, R.O.C.\r
-                               Pin-Jen  Taoyuan  324\r
-                               TW\r
-\r
-D8-9C-8E   (hex)               Comcast Cable Corporation\r
-D89C8E     (base 16)           Comcast Cable Corporation\r
-                               1800 Arch Street\r
-                               Philadelphia  PA  19103\r
-                               US\r
-\r
 04-B9-7D   (hex)               AiVIS Co., Itd.\r
 04B97D     (base 16)           AiVIS Co., Itd.\r
                                112, Dumipo-ro, Jung-gu \r
                                Incheon  Incheon  22394\r
                                KR\r
 \r
-BC-F4-D4   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
-BCF4D4     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
-                               B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
-                               Nanning  Guangxi  530007\r
-                               CN\r
-\r
 C4-C0-63   (hex)               New H3C Technologies Co., Ltd\r
 C4C063     (base 16)           New H3C Technologies Co., Ltd\r
                                466 Changhe Road, Binjiang District\r
                                Hangzhou  Zhejiang  310052\r
                                CN\r
 \r
-EC-55-1C   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-EC551C     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
-                               CN\r
-\r
-E0-79-8D   (hex)               Silicon Laboratories\r
-E0798D     (base 16)           Silicon Laboratories\r
-                               400 West Cesar Chavez Street\r
-                               Austin  TX  78701\r
-                               US\r
-\r
-B4-83-51   (hex)               Intel Corporate\r
-B48351     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
-34-AD-61   (hex)               CELESTICA INC.\r
-34AD61     (base 16)           CELESTICA INC.\r
-                               1900-5140 Yonge Street PO Box 42   \r
-                               Toronto  Ontario  M2N 6L7\r
-                               CA\r
-\r
 54-43-B2   (hex)               Espressif Inc.\r
 5443B2     (base 16)           Espressif Inc.\r
                                Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
@@ -75857,12 +76499,18 @@ C0DD8A     (base 16)          Facebook Technologies, LLC
                                Menlo Park  CA  94025\r
                                US\r
 \r
-AC-D3-1D   (hex)               Cisco Meraki\r
-ACD31D     (base 16)           Cisco Meraki\r
-                               500 Terry A. Francois Blvd\r
-                               San Francisco    94158\r
+E0-79-8D   (hex)               Silicon Laboratories\r
+E0798D     (base 16)           Silicon Laboratories\r
+                               400 West Cesar Chavez Street\r
+                               Austin  TX  78701\r
                                US\r
 \r
+34-AD-61   (hex)               CELESTICA INC.\r
+34AD61     (base 16)           CELESTICA INC.\r
+                               1900-5140 Yonge Street PO Box 42   \r
+                               Toronto  Ontario  M2N 6L7\r
+                               CA\r
+\r
 10-96-1A   (hex)               CHIPSEA TECHNOLOGIES (SHENZHEN) CORP.\r
 10961A     (base 16)           CHIPSEA TECHNOLOGIES (SHENZHEN) CORP.\r
                                9F,BLOCK A,GARDEN CITY DIGITAL BUILDING,NO.1079 NANHAI ROAD,NANSHAN DISTRICT\r
@@ -75875,18 +76523,6 @@ BCE9E2     (base 16)           Brocade Communications Systems LLC
                                San Jose  CA  95131\r
                                US\r
 \r
-00-18-48   (hex)               Vecima Networks Inc.\r
-001848     (base 16)           Vecima Networks Inc.\r
-                               150 Cardinal Place \r
-                               Saskatoon  SK  S7L 6H7\r
-                               CA\r
-\r
-2C-55-3C   (hex)               Vecima Networks Inc.\r
-2C553C     (base 16)           Vecima Networks Inc.\r
-                               150 Cardinal Place \r
-                               Saskatoon  SK  S7L 6H7\r
-                               CA\r
-\r
 AC-BF-71   (hex)               Bose Corporation\r
 ACBF71     (base 16)           Bose Corporation\r
                                The Mountain\r
@@ -75899,6 +76535,12 @@ ACBF71     (base 16)           Bose Corporation
                                Piscataway  NJ  08554\r
                                US\r
 \r
+AC-D3-1D   (hex)               Cisco Meraki\r
+ACD31D     (base 16)           Cisco Meraki\r
+                               500 Terry A. Francois Blvd\r
+                               San Francisco    94158\r
+                               US\r
+\r
 74-84-69   (hex)               Nintendo Co.,Ltd\r
 748469     (base 16)           Nintendo Co.,Ltd\r
                                11-1 HOKOTATE-CHO KAMITOBA,MINAMI-KU\r
@@ -75941,6 +76583,18 @@ B41974     (base 16)           Apple, Inc.
                                Shenzhen  Guangdong  518117\r
                                CN\r
 \r
+00-18-48   (hex)               Vecima Networks Inc.\r
+001848     (base 16)           Vecima Networks Inc.\r
+                               150 Cardinal Place \r
+                               Saskatoon  SK  S7L 6H7\r
+                               CA\r
+\r
+2C-55-3C   (hex)               Vecima Networks Inc.\r
+2C553C     (base 16)           Vecima Networks Inc.\r
+                               150 Cardinal Place \r
+                               Saskatoon  SK  S7L 6H7\r
+                               CA\r
+\r
 60-95-BD   (hex)               Apple, Inc.\r
 6095BD     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
@@ -75971,12 +76625,6 @@ B41974     (base 16)           Apple, Inc.
                                Spring  TX  77389\r
                                US\r
 \r
-74-6F-88   (hex)               zte corporation\r
-746F88     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 98-C8-1C   (hex)               BAYTEC LIMITED\r
 98C81C     (base 16)           BAYTEC LIMITED\r
                                107C, 31/f, The gateway, Tower 5, Harbour City, 15 canton road, Tsim Sha Tsui, Hong Kong\r
@@ -75989,30 +76637,24 @@ D0989C     (base 16)          ConMet
                                Vancouver    WA  98661\r
                                US\r
 \r
-1C-A4-10   (hex)               Amlogic, Inc.\r
-1CA410     (base 16)           Amlogic, Inc.\r
-                               2518 Mission College Blvd, Suite 120\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 24-26-D6   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 2426D6     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-70-A6-BD   (hex)               Honor Device Co., Ltd.\r
-70A6BD     (base 16)           Honor Device Co., Ltd.\r
-                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
-                               Shenzhen   Guangdong  518040\r
-                               CN\r
-\r
 EC-81-9C   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 EC819C     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
+1C-A4-10   (hex)               Amlogic, Inc.\r
+1CA410     (base 16)           Amlogic, Inc.\r
+                               2518 Mission College Blvd, Suite 120\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
 20-0B-16   (hex)               Texas Instruments\r
 200B16     (base 16)           Texas Instruments\r
                                12500 TI Blvd\r
@@ -76037,23 +76679,23 @@ F85548     (base 16)          Texas Instruments
                                Dallas  TX  75243\r
                                US\r
 \r
+70-A6-BD   (hex)               Honor Device Co., Ltd.\r
+70A6BD     (base 16)           Honor Device Co., Ltd.\r
+                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
+                               Shenzhen   Guangdong  518040\r
+                               CN\r
+\r
 4C-9E-6C   (hex)               BROADEX TECHNOLOGIES CO.LTD\r
 4C9E6C     (base 16)           BROADEX TECHNOLOGIES CO.LTD\r
                                NO.306 YATAI ROAD\r
                                JIAXING  ZHEJIANG  314006\r
                                CN\r
 \r
-AC-A3-2F   (hex)               Solidigm Technology\r
-ACA32F     (base 16)           Solidigm Technology\r
-                               1921 Corporate Center Circle, Suite 3B\r
-                               Longmont    80501\r
-                               US\r
-\r
-AC-71-2E   (hex)               Fortinet, Inc.\r
-AC712E     (base 16)           Fortinet, Inc.\r
-                               899 Kifer Road\r
-                               Sunnyvale    94086\r
-                               US\r
+54-2F-04   (hex)               Shanghai Longcheer Technology Co., Ltd.\r
+542F04     (base 16)           Shanghai Longcheer Technology Co., Ltd.\r
+                               Bldg 1,No.401,Caobao RD,Xuhui Dist\r
+                               Shanghai    200233\r
+                               CN\r
 \r
 E4-B6-33   (hex)               Wuxi Stars Microsystem Technology Co., Ltd\r
 E4B633     (base 16)           Wuxi Stars Microsystem Technology Co., Ltd\r
@@ -76073,16 +76715,10 @@ E4B633     (base 16)          Wuxi Stars Microsystem Technology Co., Ltd
                                Dongguan  Guangdong  523808\r
                                CN\r
 \r
-98-D9-3D   (hex)               Demant Enterprise A/S\r
-98D93D     (base 16)           Demant Enterprise A/S\r
-                               Kongebakken 9\r
-                               Smorum    2765\r
-                               DK\r
-\r
-B4-A6-78   (hex)               Zhejiang Tmall Technology Co., Ltd.\r
-B4A678     (base 16)           Zhejiang Tmall Technology Co., Ltd.\r
-                               No.969 Wenyi West Road, Wuchang Street, Yuhang District\r
-                               Hangzhou  Zhejiang  310024\r
+54-E1-5B   (hex)               Huawei Device Co., Ltd.\r
+54E15B     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
                                CN\r
 \r
 AC-C4-BD   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
@@ -76091,17 +76727,11 @@ ACC4BD     (base 16)          GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
                                DONG GUAN  GUANG DONG  523860\r
                                CN\r
 \r
-54-E1-5B   (hex)               Huawei Device Co., Ltd.\r
-54E15B     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
-54-2F-04   (hex)               Shanghai Longcheer Technology Co., Ltd.\r
-542F04     (base 16)           Shanghai Longcheer Technology Co., Ltd.\r
-                               Bldg 1,No.401,Caobao RD,Xuhui Dist\r
-                               Shanghai    200233\r
-                               CN\r
+AC-A3-2F   (hex)               Solidigm Technology\r
+ACA32F     (base 16)           Solidigm Technology\r
+                               1921 Corporate Center Circle, Suite 3B\r
+                               Longmont    80501\r
+                               US\r
 \r
 C4-A1-0E   (hex)               IEEE Registration Authority\r
 C4A10E     (base 16)           IEEE Registration Authority\r
@@ -76109,6 +76739,12 @@ C4A10E     (base 16)           IEEE Registration Authority
                                Piscataway  NJ  08554\r
                                US\r
 \r
+AC-71-2E   (hex)               Fortinet, Inc.\r
+AC712E     (base 16)           Fortinet, Inc.\r
+                               899 Kifer Road\r
+                               Sunnyvale    94086\r
+                               US\r
+\r
 0C-EC-84   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
 0CEC84     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
                                Building, No.33, Xiandong Rd, Xili\r
@@ -76127,18 +76763,24 @@ B43939     (base 16)          Shenzhen TINNO Mobile Technology Corp.
                                Shenzhen    518000\r
                                CN\r
 \r
-20-08-89   (hex)               zte corporation\r
-200889     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 70-70-FC   (hex)               GOLD&WATER INDUSTRIAL LIMITED\r
 7070FC     (base 16)           GOLD&WATER INDUSTRIAL LIMITED\r
                                NO.77 Leighton Road, 17/F Leighton Centre Causeway Bay ,HongKong\r
                                HongKong    999077\r
                                HK\r
 \r
+98-D9-3D   (hex)               Demant Enterprise A/S\r
+98D93D     (base 16)           Demant Enterprise A/S\r
+                               Kongebakken 9\r
+                               Smorum    2765\r
+                               DK\r
+\r
+B4-A6-78   (hex)               Zhejiang Tmall Technology Co., Ltd.\r
+B4A678     (base 16)           Zhejiang Tmall Technology Co., Ltd.\r
+                               No.969 Wenyi West Road, Wuchang Street, Yuhang District\r
+                               Hangzhou  Zhejiang  310024\r
+                               CN\r
+\r
 88-F2-BD   (hex)               GD Midea Air-Conditioning Equipment Co.,Ltd.\r
 88F2BD     (base 16)           GD Midea Air-Conditioning Equipment Co.,Ltd.\r
                                Midea Global Innovation Center,Beijiao Town,Shunde\r
@@ -76157,12 +76799,6 @@ A0F895     (base 16)           Shenzhen TINNO Mobile Technology Corp.
                                NEW DELHI  DELHI  110015\r
                                IN\r
 \r
-70-AC-08   (hex)               Silicon Laboratories\r
-70AC08     (base 16)           Silicon Laboratories\r
-                               400 West Cesar Chavez Street\r
-                               Austin  TX  78701\r
-                               US\r
-\r
 2C-07-F6   (hex)               SKG Health Technologies Co., Ltd. \r
 2C07F6     (base 16)           SKG Health Technologies Co., Ltd. \r
                                23A Floor,Building 3,Zhongke R&D Park,No.009,Gaoxin South 1st Road, High-tech Zone Community,Yuehai street, Nanshan District,Shenzhen City,Guangdong Province,P.R.China\r
@@ -76181,24 +76817,6 @@ A47EFA     (base 16)           Withings
                                Issy-les-Moulineaux    92130\r
                                FR\r
 \r
-3C-26-E4   (hex)               Cisco Systems, Inc\r
-3C26E4     (base 16)           Cisco Systems, Inc\r
-                               80 West Tasman Drive\r
-                               San Jose  CA  94568\r
-                               US\r
-\r
-38-91-B7   (hex)               Cisco Systems, Inc\r
-3891B7     (base 16)           Cisco Systems, Inc\r
-                               80 West Tasman Drive\r
-                               San Jose  CA  94568\r
-                               US\r
-\r
-34-5D-A8   (hex)               Cisco Systems, Inc\r
-345DA8     (base 16)           Cisco Systems, Inc\r
-                               80 West Tasman Drive\r
-                               San Jose  CA  94568\r
-                               US\r
-\r
 78-91-DE   (hex)               Guangdong ACIGA Science&Technology Co.,Ltd\r
 7891DE     (base 16)           Guangdong ACIGA Science&Technology Co.,Ltd\r
                                L203 Biguiyuan International Club, Beijiao Town, Shunde District\r
@@ -76211,6 +76829,12 @@ E0806B     (base 16)           Xiaomi Communications Co Ltd
                                Beijing  Haidian District  100085\r
                                CN\r
 \r
+70-AC-08   (hex)               Silicon Laboratories\r
+70AC08     (base 16)           Silicon Laboratories\r
+                               400 West Cesar Chavez Street\r
+                               Austin  TX  78701\r
+                               US\r
+\r
 70-50-E7   (hex)               IEEE Registration Authority\r
 7050E7     (base 16)           IEEE Registration Authority\r
                                445 Hoes Lane\r
@@ -76235,6 +76859,24 @@ B0E45C     (base 16)           Samsung Electronics Co.,Ltd
                                Suwon  Gyeonggi-Do  16677\r
                                KR\r
 \r
+3C-26-E4   (hex)               Cisco Systems, Inc\r
+3C26E4     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+38-91-B7   (hex)               Cisco Systems, Inc\r
+3891B7     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+34-5D-A8   (hex)               Cisco Systems, Inc\r
+345DA8     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
 BC-4C-A0   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 BC4CA0     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
@@ -76247,18 +76889,6 @@ BC4CA0     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
-C4-12-EC   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-C412EC     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
-                               CN\r
-\r
-6C-C2-42   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
-6CC242     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
-                               4F,Block A, Skyworth?Building,\r
-                               Shenzhen  Guangdong  518057\r
-                               CN\r
-\r
 68-7F-F0   (hex)               TP-Link Corporation Limited\r
 687FF0     (base 16)           TP-Link Corporation Limited\r
                                Room 901,9/F.New East Ocean Centre, 9 Science Museum Road\r
@@ -76277,6 +76907,18 @@ DC360C     (base 16)           Hitron Technologies. Inc
                                Bayan Lepas  Penang  11900\r
                                MY\r
 \r
+C4-12-EC   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+C412EC     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+60-CF-69   (hex)               meerecompany\r
+60CF69     (base 16)           meerecompany\r
+                               69-12, Jeongmunsongsan-ro, Yanggam-myeon, Hwaseong-si, Gyeonggi-do, Republic of  Korea\r
+                               Hwaseong-si    18630\r
+                               KR\r
+\r
 4C-62-7B   (hex)               SmartCow AI Technologies Taiwan Ltd.\r
 4C627B     (base 16)           SmartCow AI Technologies Taiwan Ltd.\r
                                16F., No. 102, Songlong Rd., Xinyi Dist.,\r
@@ -76295,6 +76937,18 @@ F82B7F     (base 16)           Huawei Device Co., Ltd.
                                Dongguan  Guangdong  523808\r
                                CN\r
 \r
+40-C3-BC   (hex)               Huawei Device Co., Ltd.\r
+40C3BC     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+34-FE-1C   (hex)               CHOUNG HWA TECH CO.,LTD\r
+34FE1C     (base 16)           CHOUNG HWA TECH CO.,LTD\r
+                               #31 Jangja-ro, Namdong-gu\r
+                               Incheon-si    21532\r
+                               KR\r
+\r
 D8-68-A0   (hex)               Samsung Electronics Co.,Ltd\r
 D868A0     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
@@ -76307,10 +76961,10 @@ D868A0     (base 16)          Samsung Electronics Co.,Ltd
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
-40-C3-BC   (hex)               Huawei Device Co., Ltd.\r
-40C3BC     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
+6C-C2-42   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+6CC242     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+                               4F,Block A, Skyworth?Building,\r
+                               Shenzhen  Guangdong  518057\r
                                CN\r
 \r
 28-53-E0   (hex)               Sintela Ltd\r
@@ -76319,78 +76973,66 @@ D868A0     (base 16)          Samsung Electronics Co.,Ltd
                                Pill  Bristol  BS20 0DH\r
                                GB\r
 \r
-60-CF-69   (hex)               meerecompany\r
-60CF69     (base 16)           meerecompany\r
-                               69-12, Jeongmunsongsan-ro, Yanggam-myeon, Hwaseong-si, Gyeonggi-do, Republic of  Korea\r
-                               Hwaseong-si    18630\r
-                               KR\r
-\r
-34-FE-1C   (hex)               CHOUNG HWA TECH CO.,LTD\r
-34FE1C     (base 16)           CHOUNG HWA TECH CO.,LTD\r
-                               #31 Jangja-ro, Namdong-gu\r
-                               Incheon-si    21532\r
-                               KR\r
-\r
 F4-93-9F   (hex)               Hon Hai Precision Industry Co., Ltd.\r
 F4939F     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
                                GuangDongShenZhen\r
                                ShenZhen  GuangDong  518109\r
                                CN\r
 \r
-A4-AE-12   (hex)               Hon Hai Precision Industry Co., Ltd.\r
-A4AE12     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
-                               GuangDongShenZhen\r
-                               ShenZhen  GuangDong  518109\r
+AC-4E-65   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+AC4E65     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
                                CN\r
 \r
-38-F0-C8   (hex)               Logitech\r
-38F0C8     (base 16)           Logitech\r
-                               7700 Gateway Blvd\r
-                               Newark  CA  94560\r
-                               US\r
-\r
 BC-5D-A3   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
 BC5DA3     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
                                No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
                                Chengdu  Sichuan  611330\r
                                CN\r
 \r
-80-75-1F   (hex)               SKY UK LIMITED\r
-80751F     (base 16)           SKY UK LIMITED\r
+80-72-15   (hex)               SKY UK LIMITED\r
+807215     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
                                Brentwood  Essex  08854\r
                                GB\r
 \r
-C0-A3-6E   (hex)               SKY UK LIMITED\r
-C0A36E     (base 16)           SKY UK LIMITED\r
+B0-3E-51   (hex)               SKY UK LIMITED\r
+B03E51     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
                                Brentwood  Essex  08854\r
                                GB\r
 \r
-00-A3-88   (hex)               SKY UK LIMITED\r
-00A388     (base 16)           SKY UK LIMITED\r
+80-75-1F   (hex)               SKY UK LIMITED\r
+80751F     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
                                Brentwood  Essex  08854\r
                                GB\r
 \r
-AC-4E-65   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
-AC4E65     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
-                               No.5 DongXin Road\r
-                               Wuhan  Hubei  430074\r
+A4-AE-12   (hex)               Hon Hai Precision Industry Co., Ltd.\r
+A4AE12     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
+                               GuangDongShenZhen\r
+                               ShenZhen  GuangDong  518109\r
                                CN\r
 \r
-80-72-15   (hex)               SKY UK LIMITED\r
-807215     (base 16)           SKY UK LIMITED\r
+C0-A3-6E   (hex)               SKY UK LIMITED\r
+C0A36E     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
                                Brentwood  Essex  08854\r
                                GB\r
 \r
-B0-3E-51   (hex)               SKY UK LIMITED\r
-B03E51     (base 16)           SKY UK LIMITED\r
+00-A3-88   (hex)               SKY UK LIMITED\r
+00A388     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
                                Brentwood  Essex  08854\r
                                GB\r
 \r
+38-F0-C8   (hex)               Logitech\r
+38F0C8     (base 16)           Logitech\r
+                               7700 Gateway Blvd\r
+                               Newark  CA  94560\r
+                               US\r
+\r
 1C-EF-03   (hex)               Guangzhou V-SOLUTION Electronic Technology Co., Ltd.\r
 1CEF03     (base 16)           Guangzhou V-SOLUTION Electronic Technology Co., Ltd.\r
                                Room 601,Originality Building B2, NO.162 Science Avenue,Science Town\r
@@ -76403,12 +77045,6 @@ B03E51     (base 16)           SKY UK LIMITED
                                KYOTO  KYOTO  601-8501\r
                                JP\r
 \r
-54-45-38   (hex)               Texas Instruments\r
-544538     (base 16)           Texas Instruments\r
-                               12500 TI Blvd\r
-                               Dallas  TX  75243\r
-                               US\r
-\r
 74-13-EA   (hex)               Intel Corporate\r
 7413EA     (base 16)           Intel Corporate\r
                                Lot 8, Jalan Hi-Tech 2/3  \r
@@ -76433,53 +77069,35 @@ B0DCEF     (base 16)          Intel Corporate
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-2C-A7-74   (hex)               Texas Instruments\r
-2CA774     (base 16)           Texas Instruments\r
-                               12500 TI Blvd\r
-                               Dallas  TX  75243\r
-                               US\r
-\r
-DC-F3-1C   (hex)               Texas Instruments\r
-DCF31C     (base 16)           Texas Instruments\r
-                               12500 TI Blvd\r
-                               Dallas  TX  75243\r
-                               US\r
-\r
 28-BC-05   (hex)               BLU Products Inc\r
 28BC05     (base 16)           BLU Products Inc\r
                                10814 NW 33rd Street\r
                                Miami  FL  33172\r
                                US\r
 \r
+2C-A7-74   (hex)               Texas Instruments\r
+2CA774     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
 18-4E-03   (hex)               HMD Global Oy\r
 184E03     (base 16)           HMD Global Oy\r
                                Bertel Jungin aukio 9\r
                                Espoo    02600\r
                                FI\r
 \r
-40-22-D8   (hex)               Espressif Inc.\r
-4022D8     (base 16)           Espressif Inc.\r
-                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
-                               Shanghai  Shanghai  201203\r
-                               CN\r
-\r
 E0-08-71   (hex)               Dongguan Liesheng Electronic Co., Ltd.\r
 E00871     (base 16)           Dongguan Liesheng Electronic Co., Ltd.\r
                                F5, Building B, North Block, Gaosheng Tech Park, No. 84 Zhongli Road, Nancheng District, Dongguan Ci\r
                                dongguan   guangdong  523000\r
                                CN\r
 \r
-90-65-60   (hex)               EM Microelectronic\r
-906560     (base 16)           EM Microelectronic\r
-                               Rue des Sors 3\r
-                               Marin-Epagnier  Neuchatel  2074\r
-                               CH\r
-\r
-A0-FB-83   (hex)               Honor Device Co., Ltd.\r
-A0FB83     (base 16)           Honor Device Co., Ltd.\r
-                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
-                               Shenzhen   Guangdong  518040\r
-                               CN\r
+9C-95-6E   (hex)               Microchip Technology Inc.\r
+9C956E     (base 16)           Microchip Technology Inc.\r
+                               2355 W. Chandler Blvd.\r
+                               Chandler  AZ  85224\r
+                               US\r
 \r
 DC-0B-09   (hex)               Cisco Systems, Inc\r
 DC0B09     (base 16)           Cisco Systems, Inc\r
@@ -76493,17 +77111,17 @@ DC0B09     (base 16)          Cisco Systems, Inc
                                San Jose  CA  94568\r
                                US\r
 \r
-88-0A-A3   (hex)               Juniper Networks\r
-880AA3     (base 16)           Juniper Networks\r
-                               1133 Innovation Way\r
-                               Sunnyvale  CA  94089\r
+DC-F3-1C   (hex)               Texas Instruments\r
+DCF31C     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
                                US\r
 \r
-04-D9-C8   (hex)               Hon Hai Precision Industry Co., Ltd.\r
-04D9C8     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
-                               GuangDongShenZhen\r
-                               ShenZhen  GuangDong  518109\r
-                               CN\r
+54-45-38   (hex)               Texas Instruments\r
+544538     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
 \r
 78-C2-13   (hex)               Sagemcom Broadband SAS\r
 78C213     (base 16)           Sagemcom Broadband SAS\r
@@ -76511,6 +77129,12 @@ DC0B09     (base 16)           Cisco Systems, Inc
                                Rueil Malmaison Cedex  hauts de seine  92848\r
                                FR\r
 \r
+40-22-D8   (hex)               Espressif Inc.\r
+4022D8     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
 A0-36-BC   (hex)               ASUSTek COMPUTER INC.\r
 A036BC     (base 16)           ASUSTek COMPUTER INC.\r
                                15,Li-Te Rd., Peitou, Taipei 112, Taiwan\r
@@ -76523,29 +77147,23 @@ A036BC     (base 16)          ASUSTek COMPUTER INC.
                                Cranbrook  British Columbia  V1C 2L9\r
                                CA\r
 \r
-9C-95-6E   (hex)               Microchip Technology Inc.\r
-9C956E     (base 16)           Microchip Technology Inc.\r
-                               2355 W. Chandler Blvd.\r
-                               Chandler  AZ  85224\r
-                               US\r
-\r
 84-0B-BB   (hex)               MitraStar Technology Corp.\r
 840BBB     (base 16)           MitraStar Technology Corp.\r
                                No. 6, Innovation Road II,\r
                                Hsinchu    300\r
                                TW\r
 \r
-70-B3-06   (hex)               Apple, Inc.\r
-70B306     (base 16)           Apple, Inc.\r
-                               1 Infinite Loop\r
-                               Cupertino  CA  95014\r
-                               US\r
+04-D9-C8   (hex)               Hon Hai Precision Industry Co., Ltd.\r
+04D9C8     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
+                               GuangDongShenZhen\r
+                               ShenZhen  GuangDong  518109\r
+                               CN\r
 \r
-B8-49-6D   (hex)               Apple, Inc.\r
-B8496D     (base 16)           Apple, Inc.\r
-                               1 Infinite Loop\r
-                               Cupertino  CA  95014\r
-                               US\r
+A0-FB-83   (hex)               Honor Device Co., Ltd.\r
+A0FB83     (base 16)           Honor Device Co., Ltd.\r
+                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
+                               Shenzhen   Guangdong  518040\r
+                               CN\r
 \r
 9C-92-4F   (hex)               Apple, Inc.\r
 9C924F     (base 16)           Apple, Inc.\r
@@ -76565,6 +77183,36 @@ F0D793     (base 16)           Apple, Inc.
                                Cupertino  CA  95014\r
                                US\r
 \r
+70-B3-06   (hex)               Apple, Inc.\r
+70B306     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+B8-49-6D   (hex)               Apple, Inc.\r
+B8496D     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+90-65-60   (hex)               EM Microelectronic\r
+906560     (base 16)           EM Microelectronic\r
+                               Rue des Sors 3\r
+                               Marin-Epagnier  Neuchatel  2074\r
+                               CH\r
+\r
+88-0A-A3   (hex)               Juniper Networks\r
+880AA3     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+30-3D-51   (hex)               IEEE Registration Authority\r
+303D51     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
 CC-D3-C1   (hex)               Vestel Elektronik San ve Tic. A.S.\r
 CCD3C1     (base 16)           Vestel Elektronik San ve Tic. A.S.\r
                                Organize san\r
@@ -76577,6 +77225,24 @@ ECBE5F     (base 16)           Vestel Elektronik San ve Tic. A.S.
                                Manisa  Turket  45030\r
                                TR\r
 \r
+F4-BB-C7   (hex)               vivo Mobile Communication Co., Ltd.\r
+F4BBC7     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               No.1, vivo Road, Chang'an\r
+                               Dongguan  Guangdong  523860\r
+                               CN\r
+\r
+4C-36-4E   (hex)               Panasonic Connect Co., Ltd.\r
+4C364E     (base 16)           Panasonic Connect Co., Ltd.\r
+                               4-1-62 Minoshima, Hakata-ku\r
+                               Fukuoka-shi  Fukuoka  812-8531\r
+                               JP\r
+\r
+44-71-47   (hex)               Beijing Xiaomi Electronics Co.,Ltd\r
+447147     (base 16)           Beijing Xiaomi Electronics Co.,Ltd\r
+                               Xiaomi Campus\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
 A8-DC-5A   (hex)               Digital Watchdog\r
 A8DC5A     (base 16)           Digital Watchdog\r
                                16220 Bloomfield Ave\r
@@ -76589,48 +77255,36 @@ A8DC5A     (base 16)          Digital Watchdog
                                NEW TAIPEI CITY    23585\r
                                TW\r
 \r
-30-3D-51   (hex)               IEEE Registration Authority\r
-303D51     (base 16)           IEEE Registration Authority\r
-                               445 Hoes Lane\r
-                               Piscataway  NJ  08554\r
+64-37-A4   (hex)               TOKYOSHUHA CO.,LTD.\r
+6437A4     (base 16)           TOKYOSHUHA CO.,LTD.\r
+                               1-8-9 KANDAIZUMICHO\r
+                               CHIYODA-KU  TOKYO  101-0024\r
+                               JP\r
+\r
+90-CA-FA   (hex)               Google, Inc.\r
+90CAFA     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
                                US\r
 \r
+38-A8-9B   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+38A89B     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
 00-FB-F9   (hex)               Axiado Corporation\r
 00FBF9     (base 16)           Axiado Corporation\r
                                2610 Orchard Parkway, Suite 300\r
                                San Jose  CA  95134\r
                                US\r
 \r
-44-71-47   (hex)               Beijing Xiaomi Electronics Co.,Ltd\r
-447147     (base 16)           Beijing Xiaomi Electronics Co.,Ltd\r
-                               Xiaomi Campus\r
-                               Beijing  Beijing  100085\r
-                               CN\r
-\r
-F4-BB-C7   (hex)               vivo Mobile Communication Co., Ltd.\r
-F4BBC7     (base 16)           vivo Mobile Communication Co., Ltd.\r
-                               No.1, vivo Road, Chang'an\r
-                               Dongguan  Guangdong  523860\r
-                               CN\r
-\r
 DC-AA-43   (hex)               Shenzhen Terca Information Technology Co., Ltd.\r
 DCAA43     (base 16)           Shenzhen Terca Information Technology Co., Ltd.\r
                                Room1401, Block A, Building 12 , Shenzhen Bay Technology and Eco-Park , No. 18 Keji South Road , Nanshan District , Shenzhen\r
                                SHENZHEN  GUANGDONG  518000\r
                                CN\r
 \r
-4C-36-4E   (hex)               Panasonic Connect Co., Ltd.\r
-4C364E     (base 16)           Panasonic Connect Co., Ltd.\r
-                               4-1-62 Minoshima, Hakata-ku\r
-                               Fukuoka-shi  Fukuoka  812-8531\r
-                               JP\r
-\r
-98-66-10   (hex)               zte corporation\r
-986610     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 88-B4-36   (hex)               FUJIFILM Corporation\r
 88B436     (base 16)           FUJIFILM Corporation\r
                                1-324,Uetake,Kita-ku\r
@@ -76643,24 +77297,837 @@ DCAA43     (base 16)         Shenzhen Terca Information Technology Co., Ltd.
                                Ottawa  Ontario  K2K 2W7\r
                                CA\r
 \r
-38-A8-9B   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
-38A89B     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
-                               No.5 DongXin Road\r
-                               Wuhan  Hubei  430074\r
+44-16-FA   (hex)               Samsung Electronics Co.,Ltd\r
+4416FA     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+FC-67-1F   (hex)               Tuya Smart Inc.\r
+FC671F     (base 16)           Tuya Smart Inc.\r
+                               160 Greentree Drive, Suite 101\r
+                               Dover  DE  19904\r
+                               US\r
+\r
+84-3C-4C   (hex)               Robert Bosch SRL\r
+843C4C     (base 16)           Robert Bosch SRL\r
+                               Horia Macelariu 30-34\r
+                               Bucharest    013937\r
+                               RO\r
+\r
+6C-72-E2   (hex)               amitek\r
+6C72E2     (base 16)           amitek\r
+                               #311, KETI, 226, Chemdangwari-ro, Buk-gu, Gwangju, 61011, Rep. of KOREA\r
+                               Gwangju    61011\r
+                               KR\r
+\r
+78-F1-C6   (hex)               Cisco Systems, Inc\r
+78F1C6     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+34-1B-2D   (hex)               Cisco Systems, Inc\r
+341B2D     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+64-B5-F2   (hex)               Samsung Electronics Co.,Ltd\r
+64B5F2     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+10-E8-40   (hex)               ZOWEE TECHNOLOGY(HEYUAN) CO., LTD.\r
+10E840     (base 16)           ZOWEE TECHNOLOGY(HEYUAN) CO., LTD.\r
+                               Runye Precision Manufacturing Industrial Park,among the north of Xiangjing Road, the west of Xinpi Road and the south of Yangzi Road, locatd in the High-tech Zone, Heyuan City Guangdong Province\r
+                               Heyuan  Guangdong  517000\r
                                CN\r
 \r
-64-37-A4   (hex)               TOKYOSHUHA CO.,LTD.\r
-6437A4     (base 16)           TOKYOSHUHA CO.,LTD.\r
-                               1-8-9 KANDAIZUMICHO\r
-                               CHIYODA-KU  TOKYO  101-0024\r
+44-05-E8   (hex)               twareLAB\r
+4405E8     (base 16)           twareLAB\r
+                               338 Gwanggyojungang-ro\r
+                               yongin  gyeonggi  16942\r
+                               KR\r
+\r
+8C-06-CB   (hex)               Toradex AG\r
+8C06CB     (base 16)           Toradex AG\r
+                               Ebenaustrasse 10 \r
+                               Horw  LU  6048\r
+                               CH\r
+\r
+A4-0E-75   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+A40E75     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+78-C5-7D   (hex)               Zyxel Communications Corporation\r
+78C57D     (base 16)           Zyxel Communications Corporation\r
+                               No. 6 Innovation Road II, Science Park\r
+                               Hsichu  Taiwan  300\r
+                               TW\r
+\r
+98-9D-E5   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+989DE5     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+44-5A-DF   (hex)               MIKAMI & CO., LTD.\r
+445ADF     (base 16)           MIKAMI & CO., LTD.\r
+                               1-5-23 Eda-Nishi, Aoba-Ku\r
+                               Yokohama-Shi  Kanagawa-Pre  225-0014\r
                                JP\r
 \r
-90-CA-FA   (hex)               Google, Inc.\r
-90CAFA     (base 16)           Google, Inc.\r
-                               1600 Amphitheatre Parkway\r
-                               Mountain View  CA  94043\r
+8C-35-92   (hex)               Guangzhou Shiyuan Electronic Technology Company Limited\r
+8C3592     (base 16)           Guangzhou Shiyuan Electronic Technology Company Limited\r
+                               No.6, 4th Yunpu Road, Yunpu industry District\r
+                               Guangzhou  Guangdong  510530\r
+                               CN\r
+\r
+6C-B1-33   (hex)               Apple, Inc.\r
+6CB133     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+28-E7-1D   (hex)               Arista Networks\r
+28E71D     (base 16)           Arista Networks\r
+                               5453 Great America Parkway\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+A0-46-5A   (hex)               Motorola Mobility LLC, a Lenovo Company\r
+A0465A     (base 16)           Motorola Mobility LLC, a Lenovo Company\r
+                               222 West Merchandise Mart Plaza\r
+                               Chicago  IL  60654\r
+                               US\r
+\r
+08-6E-9C   (hex)               Huawei Device Co., Ltd.\r
+086E9C     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+C4-AC-AA   (hex)               Apple, Inc.\r
+C4ACAA     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+2C-32-6A   (hex)               Apple, Inc.\r
+2C326A     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+88-28-7D   (hex)               AltoBeam (China) Inc.\r
+88287D     (base 16)           AltoBeam (China) Inc.\r
+                               B808, Tsinghua Tongfang Hi-Tech Plaza, Haidian\r
+                               Beijing  Beijing  100083\r
+                               CN\r
+\r
+D0-DA-D7   (hex)               Apple, Inc.\r
+D0DAD7     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+C4-D4-96   (hex)               Shenzhen Excelsecu Data Technology Co.,Ltd\r
+C4D496     (base 16)           Shenzhen Excelsecu Data Technology Co.,Ltd\r
+                               Unit 701-708,7/F,South Block,SDGI Building A,No.2,Kefeng Road,YueHai Street , Nanshan District,Shenzhen, China.\r
+                               Shenzhen    518057\r
+                               CN\r
+\r
+00-26-7F   (hex)               Oregan Networks Ltd.\r
+00267F     (base 16)           Oregan Networks Ltd.\r
+                               Diskettgatan 11B\r
+                               Linköping    58335\r
+                               SE\r
+\r
+44-8C-AB   (hex)               Beijing Flitlink Vientiane Technology Co., LTD\r
+448CAB     (base 16)           Beijing Flitlink Vientiane Technology Co., LTD\r
+                               Building 23, No. 18, Anning Zhuang East Road, Qinghe, Haidian District, Beijing\r
+                               Beijing    100083\r
+                               CN\r
+\r
+14-21-03   (hex)               Calix Inc.\r
+142103     (base 16)           Calix Inc.\r
+                               2777 Orchard Pkwy\r
+                               San Jose  CA  95131\r
+                               US\r
+\r
+34-25-B4   (hex)               Silicon Laboratories\r
+3425B4     (base 16)           Silicon Laboratories\r
+                               7000 W. William Cannon Dr.\r
+                               Austin  TX  78735\r
+                               US\r
+\r
+28-80-8A   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+28808A     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+34-66-79   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+346679     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+40-B1-5C   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+40B15C     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+00-03-B1   (hex)               ICU Medical, Inc.\r
+0003B1     (base 16)           ICU Medical, Inc.\r
+                               951 Calle Amanecer\r
+                               San Clemente  CA  92673\r
+                               US\r
+\r
+68-26-24   (hex)               Ergatta\r
+682624     (base 16)           Ergatta\r
+                               40 W 25th St Fl 9\r
+                               New York  NY  10010\r
+                               US\r
+\r
+70-4D-E7   (hex)               TECNO MOBILE LIMITED\r
+704DE7     (base 16)           TECNO MOBILE LIMITED\r
+                               ROOMS 05-15, 13A/F., SOUTH TOWER, WORLD FINANCE CENTRE, HARBOUR CITY, 17 CANTON ROAD, TSIM SHA TSUI, KOWLOON, HONG KONG\r
+                               Hong Kong  Hong Kong  999077\r
+                               HK\r
+\r
+74-D8-73   (hex)               GUANGDONG GENIUS TECHNOLOGY CO., LTD.\r
+74D873     (base 16)           GUANGDONG GENIUS TECHNOLOGY CO., LTD.\r
+                               No.168, Middle Road Of East Gate\r
+                               Xiaobian Community  Chang'an Town  523851\r
+                               CN\r
+\r
+4C-24-CE   (hex)               Sichuan AI-Link Technology Co., Ltd.\r
+4C24CE     (base 16)           Sichuan AI-Link Technology Co., Ltd.\r
+                               Anzhou, Industrial Park\r
+                               Mianyang  Sichuan  622650\r
+                               CN\r
+\r
+1C-97-FB   (hex)               CoolBitX Ltd.\r
+1C97FB     (base 16)           CoolBitX Ltd.\r
+                               Suite 102, Cannon Place, P.O. Box 712, N. Sound Rd\r
+                               George Town  Grand Cayman  KY1-9006\r
+                               KY\r
+\r
+A0-21-8B   (hex)               ACE Antenna Co., ltd\r
+A0218B     (base 16)           ACE Antenna Co., ltd\r
+                               Dong Van II Industrial Zone, Bach Thuong Ward, Duy Tien Town\r
+                               Hanam    400000\r
+                               VN\r
+\r
+6C-97-AA   (hex)               AI TECHNOLOGY CO.,LTD.\r
+6C97AA     (base 16)           AI TECHNOLOGY CO.,LTD.\r
+                               2-4-5,AZABUDAI,MINATO-KU\r
+                               Tokyo    106-0041\r
+                               JP\r
+\r
+6C-65-67   (hex)               BELIMO Automation AG\r
+6C6567     (base 16)           BELIMO Automation AG\r
+                               brunnenbachstrasse 1\r
+                               Hinwil  Zurich  8340\r
+                               CH\r
+\r
+20-84-F5   (hex)               Yufei Innovation Software(Shenzhen) Co., Ltd.\r
+2084F5     (base 16)           Yufei Innovation Software(Shenzhen) Co., Ltd.\r
+                               115, Building 15, Maker Town, No.4109, Liuxian Avenue, Pingshan Community, Taoyuan Street, Nanshan District, Shenzhen\r
+                               Shenzhen    518051\r
+                               CN\r
+\r
+30-DE-4B   (hex)               TP-Link Corporation Limited\r
+30DE4B     (base 16)           TP-Link Corporation Limited\r
+                               Room 901,9/F.New East Ocean Centre, 9 Science Museum Road\r
+                                Tsim Sha Tsui  Kowloon  999077\r
+                               HK\r
+\r
+EC-96-BF   (hex)               eSystems MTG GmbH\r
+EC96BF     (base 16)           eSystems MTG GmbH\r
+                               Bahnhofstraße 100\r
+                               Wendlingen    73240\r
+                               DE\r
+\r
+A4-9D-DD   (hex)               Samsung Electronics Co.,Ltd\r
+A49DDD     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+6C-55-63   (hex)               Samsung Electronics Co.,Ltd\r
+6C5563     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+3C-1B-F8   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+3C1BF8     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+D4-92-B9   (hex)               ORION NOVA, S.L.\r
+D492B9     (base 16)           ORION NOVA, S.L.\r
+                               CALLE LARRAMENDI 12C 6A\r
+                               TOLOSA  PAIS VASCO  20400\r
+                               ES\r
+\r
+14-AC-60   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+14AC60     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+                               B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
+                               Nanning  Guangxi  530007\r
+                               CN\r
+\r
+1C-22-85   (hex)               Serrature Meroni SpA\r
+1C2285     (base 16)           Serrature Meroni SpA\r
+                               Via Valsorda\r
+                               INVERIGO  CO  22044\r
+                               IT\r
+\r
+58-F3-87   (hex)               Airios\r
+58F387     (base 16)           Airios\r
+                               Peter Zuidlaan 10\r
+                               Veldhoven    5502 NH\r
+                               NL\r
+\r
+68-B8-BB   (hex)               Beijing Xiaomi Electronics Co.,Ltd\r
+68B8BB     (base 16)           Beijing Xiaomi Electronics Co.,Ltd\r
+                               Xiaomi Campus\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
+50-FD-D5   (hex)               SJI Industry Company\r
+50FDD5     (base 16)           SJI Industry Company\r
+                               54-33, Dongtanhana 1-gil\r
+                               Hwaseong-si  Gyeonggi-do  18423\r
+                               KR\r
+\r
+80-DB-17   (hex)               Juniper Networks\r
+80DB17     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+68-AA-C4   (hex)               Altice Labs S.A.\r
+68AAC4     (base 16)           Altice Labs S.A.\r
+                               NIF 504705610, Rua Eng. José Ferreira Pinto Basto\r
+                               Aveiro    3810-106\r
+                               PT\r
+\r
+D4-20-00   (hex)               IEEE Registration Authority\r
+D42000     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+80-FD-7B   (hex)               BLU Products Inc\r
+80FD7B     (base 16)           BLU Products Inc\r
+                               10814 NW 33rd Street\r
+                               Miami  FL  33172\r
+                               US\r
+\r
+58-93-51   (hex)               Huawei Device Co., Ltd.\r
+589351     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+E0-DB-D1   (hex)               Technicolor CH USA Inc.\r
+E0DBD1     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+EC-A8-1F   (hex)               Technicolor CH USA Inc.\r
+ECA81F     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+2C-A7-EF   (hex)               OnePlus Technology (Shenzhen) Co., Ltd\r
+2CA7EF     (base 16)           OnePlus Technology (Shenzhen) Co., Ltd\r
+                               18C02, 18C03, 18C04 ,18C05,TAIRAN BUILDING,\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+48-4B-D4   (hex)               Technicolor CH USA Inc.\r
+484BD4     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+D4-E9-8A   (hex)               Intel Corporate\r
+D4E98A     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+CC-A1-74   (hex)               Facebook Technologies, LLC\r
+CCA174     (base 16)           Facebook Technologies, LLC\r
+                               1601 Willow Rd\r
+                               Menlo Park  CA  94025\r
+                               US\r
+\r
+8C-FA-DD   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+8CFADD     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+F8-9A-25   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+F89A25     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+6C-3C-8C   (hex)               Dell Inc.\r
+6C3C8C     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
+F8-71-0C   (hex)               Xiaomi Communications Co Ltd\r
+F8710C     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+3C-13-5A   (hex)               Xiaomi Communications Co Ltd\r
+3C135A     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+6C-5C-B1   (hex)               Silicon Laboratories\r
+6C5CB1     (base 16)           Silicon Laboratories\r
+                               7000 W. William Cannon Dr.\r
+                               Austin  TX  78735\r
+                               US\r
+\r
+C0-84-E0   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+C084E0     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+90-01-17   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+900117     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+38-BD-7A   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+38BD7A     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+D0-F4-F7   (hex)               Huawei Device Co., Ltd.\r
+D0F4F7     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+38-9E-80   (hex)               zte corporation\r
+389E80     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+08-3A-8D   (hex)               Espressif Inc.\r
+083A8D     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+30-DF-17   (hex)               ALPSALPINE CO .,LTD\r
+30DF17     (base 16)           ALPSALPINE CO .,LTD\r
+                               nishida 6-1\r
+                               kakuda-City  Miyagi-Pref  981-1595\r
+                               JP\r
+\r
+FC-E9-D8   (hex)               Amazon Technologies Inc.\r
+FCE9D8     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+C4-98-94   (hex)               IEEE Registration Authority\r
+C49894     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+B8-B2-F7   (hex)               DRIMAES INC.\r
+B8B2F7     (base 16)           DRIMAES INC.\r
+                               #301, 19, Seongsuil-ro, Seongdong-gu\r
+                               SEOUL    04779\r
+                               KR\r
+\r
+64-29-43   (hex)               D-Link Corporation\r
+642943     (base 16)           D-Link Corporation\r
+                               No.289, Sinhu 3rd Rd., Neihu District, \r
+                               Taipei City     114\r
+                               TW\r
+\r
+38-65-04   (hex)               Honor Device Co., Ltd.\r
+386504     (base 16)           Honor Device Co., Ltd.\r
+                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
+                               Shenzhen   Guangdong  518040\r
+                               CN\r
+\r
+58-5B-69   (hex)               TVT CO., LTD\r
+585B69     (base 16)           TVT CO., LTD\r
+                               23rd Floor Building B4 Block 9, Shenzhen Bay science and technology ecological garden, Nanshan District,\r
+                                Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+A8-F1-B2   (hex)               Allwinner Technology Co., Ltd\r
+A8F1B2     (base 16)           Allwinner Technology Co., Ltd\r
+                               No.9 Technology Road 2, High-Tech Zone\r
+                               Zhuhai  Guangdong  519085\r
+                               CN\r
+\r
+90-F8-2E   (hex)               Amazon Technologies Inc.\r
+90F82E     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+C4-5A-B1   (hex)               Dell Inc.\r
+C45AB1     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
+94-98-69   (hex)               zte corporation\r
+949869     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+F8-56-C3   (hex)               zte corporation\r
+F856C3     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+54-1F-8D   (hex)               zte corporation\r
+541F8D     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+2C-F1-BB   (hex)               zte corporation\r
+2CF1BB     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+D8-4A-2B   (hex)               zte corporation\r
+D84A2B     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+D0-F9-9B   (hex)               zte corporation\r
+D0F99B     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+74-6F-88   (hex)               zte corporation\r
+746F88     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+20-08-89   (hex)               zte corporation\r
+200889     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+98-66-10   (hex)               zte corporation\r
+986610     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+28-77-77   (hex)               zte corporation\r
+287777     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+30-B9-30   (hex)               zte corporation\r
+30B930     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+70-C9-32   (hex)               Dreame Technology (Suzhou) Limited\r
+70C932     (base 16)           Dreame Technology (Suzhou) Limited\r
+                               Shangjiwan Headquarter, Building E3 Economic Garden, 2288 Wuzhong Blvd\r
+                               Suzhou  Jiangsu  215000\r
+                               CN\r
+\r
+F8-34-5A   (hex)               Hitron Technologies. Inc\r
+F8345A     (base 16)           Hitron Technologies. Inc\r
+                               No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C\r
+                               Hsin-chu  Taiwan  300\r
+                               TW\r
+\r
+E0-B6-68   (hex)               zte corporation\r
+E0B668     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+C4-EB-42   (hex)               Sagemcom Broadband SAS\r
+C4EB42     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+F8-C2-49   (hex)               AMPERE COMPUTING LLC\r
+F8C249     (base 16)           AMPERE COMPUTING LLC\r
+                               4555 GREAT AMERICA PARKWAY\r
+                               SANTA CLARA  CA  95054\r
+                               US\r
+\r
+A0-17-F1   (hex)               Allwinner Technology Co., Ltd\r
+A017F1     (base 16)           Allwinner Technology Co., Ltd\r
+                               No.9 Technology Road 2, High-Tech Zone\r
+                               Zhuhai  Guangdong  519085\r
+                               CN\r
+\r
+2C-6F-4E   (hex)               Hubei Yuan Times Technology Co.,Ltd.\r
+2C6F4E     (base 16)           Hubei Yuan Times Technology Co.,Ltd.\r
+                               No. B1345, Chuanggu Start-up Area, Taizi Lake Cultural and Digital Creative Industry Park, No. 18 Shenlong Avenue, Wuhan Economic & Technological Development Zone\r
+                               wuhan  hubei  430050 \r
+                               CN\r
+\r
+64-8C-BB   (hex)               Texas Instruments\r
+648CBB     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+74-B8-39   (hex)               Texas Instruments\r
+74B839     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+C4-D3-6A   (hex)               Texas Instruments\r
+C4D36A     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+98-89-24   (hex)               Texas Instruments\r
+988924     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+B0-8B-BE   (hex)               ABL GmbH\r
+B08BBE     (base 16)           ABL GmbH\r
+                               Albert-Buettner-Str. 11\r
+                               Lauf    91207\r
+                               DE\r
+\r
+48-8F-4C   (hex)               shenzhen trolink  Technology Co.,Ltd\r
+488F4C     (base 16)           shenzhen trolink  Technology Co.,Ltd\r
+                               F/5 Building -E ,Fenda Hight Technology Park,Sanwei Hangcheng Street,Bao'an ,Shenzhen \r
+                               shenzhen  gangdong  518101\r
+                               CN\r
+\r
+74-4D-6D   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+744D6D     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+34-15-93   (hex)               Ruckus Wireless\r
+341593     (base 16)           Ruckus Wireless\r
+                               350 West Java Drive\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+10-9F-4F   (hex)               New H3C Intelligence Terminal Co., Ltd.\r
+109F4F     (base 16)           New H3C Intelligence Terminal Co., Ltd.\r
+                               Room 406-100, 1 Yichuang Street, China-Singapore Guangzhou Knowledge City, Huangpu District, Guangzhou.\r
+                               Guangzhou   Guangdong  510030\r
+                               CN\r
+\r
+A0-ED-6D   (hex)               Ubee Interactive Co., Limited\r
+A0ED6D     (base 16)           Ubee Interactive Co., Limited\r
+                               Flat/RM 1202, 12/F, AT Tower, 180 Electric Road\r
+                               North Point    00000\r
+                               HK\r
+\r
+AC-C9-06   (hex)               Apple, Inc.\r
+ACC906     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+04-BC-6D   (hex)               Apple, Inc.\r
+04BC6D     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+44-0C-EE   (hex)               Robert Bosch Elektronikai Kft.\r
+440CEE     (base 16)           Robert Bosch Elektronikai Kft.\r
+                               Robert Bosch u. 1.\r
+                               Hatvan  Heves County  3000\r
+                               HU\r
+\r
+30-19-84   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+301984     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+80-DE-CC   (hex)               HYBE Co.,LTD\r
+80DECC     (base 16)           HYBE Co.,LTD\r
+                               42, Hangang-daero\r
+                               Yongsan-gu  Seoul  04389\r
+                               KR\r
+\r
+C4-35-D9   (hex)               Apple, Inc.\r
+C435D9     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+44-D5-06   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
+44D506     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
+                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
+                               Chengdu  Sichuan  611330\r
+                               CN\r
+\r
+2C-69-CC   (hex)               Valeo Detection Systems \r
+2C69CC     (base 16)           Valeo Detection Systems \r
+                               Laiernstrasse 12\r
+                               Bietigheim-Bissingen  baden württemberg  74321\r
+                               DE\r
+\r
+5C-C7-C1   (hex)               Silicon Laboratories\r
+5CC7C1     (base 16)           Silicon Laboratories\r
+                               7000 W. William Cannon Dr.\r
+                               Austin  TX  78735\r
+                               US\r
+\r
+D0-CF-0E   (hex)               Sagemcom Broadband SAS\r
+D0CF0E     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+9C-DB-07   (hex)               Yellowtec GmbH\r
+9CDB07     (base 16)           Yellowtec GmbH\r
+                               Heinrich-Hertz-Strasse 1-3\r
+                               Monheim am Rhein  NRW  40789\r
+                               DE\r
+\r
+D4-61-37   (hex)               IEEE Registration Authority\r
+D46137     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+10-5F-02   (hex)               Private\r
+105F02     (base 16)           Private\r
+\r
+08-08-5C   (hex)               Luna Products\r
+08085C     (base 16)           Luna Products\r
+                               3145 Tiger Run Ct, Ste 110\r
+                               Carlsbad  CA  92010\r
                                US\r
 \r
+B4-57-E6   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+B457E6     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+BC-BD-84   (hex)               zte corporation\r
+BCBD84     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+2C-8A-C7   (hex)               Ubee Interactive Co., Limited\r
+2C8AC7     (base 16)           Ubee Interactive Co., Limited\r
+                               Flat/RM 1202, 12/F, AT Tower, 180 Electric Road\r
+                               North Point    00000\r
+                               HK\r
+\r
+B8-F0-15   (hex)               Juniper Networks\r
+B8F015     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+28-E2-97   (hex)               Shanghai InfoTM Microelectronics Co.,Ltd\r
+28E297     (base 16)           Shanghai InfoTM Microelectronics Co.,Ltd\r
+                               building 11,NO.115,lane 572,BiBo Road,\r
+                               ShangHai    201203\r
+                               CN\r
+\r
+58-F8-5C   (hex)               LLC Proizvodstvennaya Kompania TransService\r
+58F85C     (base 16)           LLC Proizvodstvennaya Kompania TransService\r
+                               Ulitsa Podolskih Kursantov,  build. 3, of. 133\r
+                               Moscow  Moscow  117545\r
+                               RU\r
+\r
+1C-8B-EF   (hex)               Beijing Xiaomi Electronics Co.,Ltd\r
+1C8BEF     (base 16)           Beijing Xiaomi Electronics Co.,Ltd\r
+                               Xiaomi Campus\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
+50-D4-5C   (hex)               Amazon Technologies Inc.\r
+50D45C     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+70-03-3F   (hex)               Pimax Technology(ShangHai)Co.,Ltd\r
+70033F     (base 16)           Pimax Technology(ShangHai)Co.,Ltd\r
+                               3000 Longdong Avenue,Pudong New Area\r
+                               Shanghai    200120\r
+                               CN\r
+\r
+80-F1-A4   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+80F1A4     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+A4-6C-24   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+A46C24     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+78-07-1C   (hex)               Green Energy Options Ltd\r
+78071C     (base 16)           Green Energy Options Ltd\r
+                               3 St. Mary's Court, Main Street\r
+                               Cambridge  Cambridgeshire  CB23 7QS\r
+                               GB\r
+\r
 84-80-94   (hex)               Meter, Inc.\r
 848094     (base 16)           Meter, Inc.\r
                                148 Townsend St\r
@@ -77432,9 +78899,6 @@ E8E8B7     (base 16)            Murata Manufacturing Co., Ltd.
                                Beijing    100053\r
                                CN\r
 \r
-7C-50-DA   (hex)               Private\r
-7C50DA     (base 16)           Private\r
-\r
 64-CC-22   (hex)               Arcadyan Corporation\r
 64CC22     (base 16)           Arcadyan Corporation\r
                                No.8, Sec.2, Guangfu Rd.\r
@@ -77843,12 +79307,6 @@ D49CDD     (base 16)           AMPAK Technology,Inc.
                                Nanjing  Jiangsu  211111\r
                                CN\r
 \r
-A4-81-7A   (hex)               CIG SHANGHAI CO LTD\r
-A4817A     (base 16)           CIG SHANGHAI CO LTD\r
-                               5th Floor, Building 8 No 2388 Chenhang Road\r
-                               SHANGHAI    201114\r
-                               CN\r
-\r
 90-58-51   (hex)               Technicolor CH USA Inc.\r
 905851     (base 16)           Technicolor CH USA Inc.\r
                                5030 Sugarloaf Parkway Bldg 6 \r
@@ -78755,12 +80213,6 @@ FC1D84     (base 16)           Autobase
                                Hong Kong  KOWLOON  999077\r
                                HK\r
 \r
-EC-84-B4   (hex)               CIG SHANGHAI CO LTD\r
-EC84B4     (base 16)           CIG SHANGHAI CO LTD\r
-                               5th Floor, Building 8 No 2388 Chenhang Road\r
-                               SHANGHAI    201114\r
-                               CN\r
-\r
 00-D0-96   (hex)               3COM EUROPE LTD\r
 00D096     (base 16)           3COM EUROPE LTD\r
                                BOUNDARY WAY\r
@@ -100901,12 +102353,6 @@ D8D67E     (base 16)         GSK CNC EQUIPMENT CO.,LTD
                                Taipei    115\r
                                TW\r
 \r
-00-0B-F8   (hex)               Infinera\r
-000BF8     (base 16)           Infinera\r
-                               1322 Bordeaux Drive\r
-                               Sunnyvale  CA  94089\r
-                               US\r
-\r
 00-0B-FF   (hex)               Berkeley Camera Engineering\r
 000BFF     (base 16)           Berkeley Camera Engineering\r
                                127 National Street\r
@@ -101741,12 +103187,6 @@ D8D67E     (base 16)         GSK CNC EQUIPMENT CO.,LTD
                                Junghe  Taipei  235\r
                                TW\r
 \r
-00-09-0F   (hex)               Fortinet Inc.\r
-00090F     (base 16)           Fortinet Inc.\r
-                               1090 Kifer Road\r
-                               Sunnyvale  CA  94086\r
-                               US\r
-\r
 00-09-2C   (hex)               Hitpoint Inc.\r
 00092C     (base 16)           Hitpoint Inc.\r
                                No.7, Fenliao, 2nd Industrial Park, Link\r
@@ -103307,12 +104747,6 @@ D8D67E     (base 16)         GSK CNC EQUIPMENT CO.,LTD
                                    \r
                                IL\r
 \r
-00-03-27   (hex)               ACT'L\r
-000327     (base 16)           ACT'L\r
-                               Avenue de Artisanat 10A\r
-                                   \r
-                               BE\r
-\r
 00-03-2E   (hex)               Scope Information Management, Ltd.\r
 00032E     (base 16)           Scope Information Management, Ltd.\r
                                2F Chanwoo b/o 736 Youksang-dong,\r
@@ -108320,12 +109754,6 @@ A824B8     (base 16)         Nokia
                                Kanata  Ontario  K2K 2E6\r
                                CA\r
 \r
-00-0C-E6   (hex)               Fortinet Inc.\r
-000CE6     (base 16)           Fortinet Inc.\r
-                               899 Kifer Road\r
-                               Sunnyvale  CA  94086\r
-                               US\r
-\r
 90-55-DE   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
 9055DE     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
                                No.5 DongXin Road\r
@@ -110462,9 +111890,6 @@ E0C377     (base 16)          Samsung Electronics Co.,Ltd
                                High Wycombe    HP12 3SL\r
                                GB\r
 \r
-84-60-82   (hex)               Private\r
-846082     (base 16)           Private\r
-\r
 64-03-7F   (hex)               Samsung Electronics Co.,Ltd\r
 64037F     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
@@ -110561,12 +111986,6 @@ C09435     (base 16)         ARRIS Group, Inc.
                                Anyang-si  Gyeonggi-do  14088\r
                                KR\r
 \r
-F8-5E-42   (hex)               Technicolor CH USA Inc.\r
-F85E42     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 30-A0-23   (hex)               ROCK PATH S.R.L\r
 30A023     (base 16)           ROCK PATH S.R.L\r
                                Via Federico Borromeo 2,  20017 Rho (MI), Italy\r
@@ -110771,12 +112190,6 @@ E42761     (base 16)         Honor Device Co., Ltd.
                                GUMI  GYEONG BUK  730-030\r
                                KR\r
 \r
-E4-D3-AA   (hex)               FUJITSU CONNECTED TECHNOLOGIES LIMITED\r
-E4D3AA     (base 16)           FUJITSU CONNECTED TECHNOLOGIES LIMITED\r
-                               Sanki Yamato Building, 7-10-1 Chuorinkan\r
-                               Yamato  Kanagawa  242-8588\r
-                               JP\r
-\r
 C8-A4-0D   (hex)               Cooler Master Technology Inc\r
 C8A40D     (base 16)           Cooler Master Technology Inc\r
                                8F., No. 788-1, Zhongzheng Rd., Zhonghe Dist.\r
@@ -110921,12 +112334,6 @@ F0A225     (base 16)         Amazon Technologies Inc.
                                Reno  NV  89507\r
                                US\r
 \r
-F0-4F-7C   (hex)               Amazon Technologies Inc.\r
-F04F7C     (base 16)           Amazon Technologies Inc.\r
-                               P.O Box 8102 \r
-                               Reno  NV  89507\r
-                               US\r
-\r
 BC-9D-42   (hex)               SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.\r
 BC9D42     (base 16)           SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.\r
                                Bldg56A,6/F,Baotian Rd3,Xixiang Town,Baoan District,\r
@@ -112040,12 +113447,6 @@ A8556A     (base 16)         3S System Technology Inc.
                                New Taipei City    220620\r
                                TW\r
 \r
-00-0B-3A   (hex)               PESA\r
-000B3A     (base 16)           PESA\r
-                               103 Quality Circle, Suite 210\r
-                               Huntsville  AL  35806\r
-                               US\r
-\r
 5C-E4-2A   (hex)               Intel Corporate\r
 5CE42A     (base 16)           Intel Corporate\r
                                Lot 8, Jalan Hi-Tech 2/3  \r
@@ -112604,12 +114005,6 @@ ECC1AB     (base 16)         Guangzhou Shiyuan Electronic Technology Company Limited
                                Guangzhou  Guangdong  510530\r
                                CN\r
 \r
-EC-93-7D   (hex)               Technicolor CH USA Inc.\r
-EC937D     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 18-FC-26   (hex)               Qorvo International Pte. Ltd.\r
 18FC26     (base 16)           Qorvo International Pte. Ltd.\r
                                1 Changi Business Park Avenue 1\r
@@ -113042,9 +114437,6 @@ F8F7B9     (base 16)          HUAWEI TECHNOLOGIES CO.,LTD
                                Kanata  Ontario  K2K 2E6\r
                                CA\r
 \r
-38-A9-EA   (hex)               Private\r
-38A9EA     (base 16)           Private\r
-\r
 08-16-D5   (hex)               GOERTEK INC.\r
 0816D5     (base 16)           GOERTEK INC.\r
                                 GoerTek  park one phase 4 # east unloading platform,The Corner of Weian road & Yingqian street, High-tech Zone, Weifang, Shandong, China 261031\r
@@ -113141,12 +114533,6 @@ E84727     (base 16)         Quectel Wireless Solutions Co.,Ltd.
                                Shanghai    200233\r
                                CN\r
 \r
-D4-E2-CB   (hex)               Technicolor CH USA Inc.\r
-D4E2CB     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 28-C5-38   (hex)               Apple, Inc.\r
 28C538     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
@@ -113948,18 +115334,6 @@ B4B742     (base 16)         Amazon Technologies Inc.
                                Reno  NV  89507\r
                                US\r
 \r
-60-BE-B4   (hex)               S-Bluetech co., limited\r
-60BEB4     (base 16)           S-Bluetech co., limited\r
-                               Room 202, Block A, Donghai Wang Mansion, 369 Bulonglu\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
-\r
-90-DF-7D   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
-90DF7D     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
-                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
-                               Chongqing   China  401120\r
-                               CN\r
-\r
 50-C1-F0   (hex)               NXP Semiconductor (Tianjin) LTD.\r
 50C1F0     (base 16)           NXP Semiconductor (Tianjin) LTD.\r
                                No.15 Xinghua Avenue, Xiqing Economic Development Area\r
@@ -113972,6 +115346,24 @@ F4848D     (base 16)         TP-LINK TECHNOLOGIES CO.,LTD.
                                Shenzhen  Guangdong  518057\r
                                CN\r
 \r
+58-11-22   (hex)               ASUSTek COMPUTER INC.\r
+581122     (base 16)           ASUSTek COMPUTER INC.\r
+                               15,Li-Te Rd., Peitou, Taipei 112, Taiwan\r
+                               Taipei  Taiwan  112\r
+                               TW\r
+\r
+60-BE-B4   (hex)               S-Bluetech co., limited\r
+60BEB4     (base 16)           S-Bluetech co., limited\r
+                               Room 202, Block A, Donghai Wang Mansion, 369 Bulonglu\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+90-DF-7D   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+90DF7D     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
+                               Chongqing   China  401120\r
+                               CN\r
+\r
 A8-54-A2   (hex)               Heimgard Technologies AS\r
 A854A2     (base 16)           Heimgard Technologies AS\r
                                Dronning Mauds gate 15\r
@@ -113996,11 +115388,11 @@ B87EE5     (base 16)                Intelbras
                                São José  Santa Catarina  88104800\r
                                BR\r
 \r
-58-11-22   (hex)               ASUSTek COMPUTER INC.\r
-581122     (base 16)           ASUSTek COMPUTER INC.\r
-                               15,Li-Te Rd., Peitou, Taipei 112, Taiwan\r
-                               Taipei  Taiwan  112\r
-                               TW\r
+94-AB-FE   (hex)               Nokia\r
+94ABFE     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
 \r
 74-69-4A   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
 74694A     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
@@ -114014,12 +115406,6 @@ B87EE5     (base 16)         Intelbras
                                shenzhen    518000\r
                                CN\r
 \r
-94-AB-FE   (hex)               Nokia\r
-94ABFE     (base 16)           Nokia\r
-                               600 March Road\r
-                               Kanata  Ontario  K2K 2E6\r
-                               CA\r
-\r
 98-A9-2D   (hex)               New H3C Technologies Co., Ltd\r
 98A92D     (base 16)           New H3C Technologies Co., Ltd\r
                                466 Changhe Road, Binjiang District\r
@@ -114044,6 +115430,18 @@ B87EE5     (base 16)         Intelbras
                                Austin  TX  78759\r
                                US\r
 \r
+E0-03-6B   (hex)               Samsung Electronics Co.,Ltd\r
+E0036B     (base 16)           Samsung Electronics Co.,Ltd\r
+                               129, Samsung-ro, Youngtongl-Gu\r
+                               Suwon  Gyeonggi-Do  16677\r
+                               KR\r
+\r
+18-69-D4   (hex)               Samsung Electronics Co.,Ltd\r
+1869D4     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
 D4-F0-EA   (hex)               Beijing Xiaomi Mobile Software Co., Ltd\r
 D4F0EA     (base 16)           Beijing Xiaomi Mobile Software Co., Ltd\r
                                The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District\r
@@ -114056,12 +115454,6 @@ D4F0EA     (base 16)         Beijing Xiaomi Mobile Software Co., Ltd
                                Suzhou    215021\r
                                CN\r
 \r
-E0-03-6B   (hex)               Samsung Electronics Co.,Ltd\r
-E0036B     (base 16)           Samsung Electronics Co.,Ltd\r
-                               129, Samsung-ro, Youngtongl-Gu\r
-                               Suwon  Gyeonggi-Do  16677\r
-                               KR\r
-\r
 80-69-1A   (hex)               Belkin International Inc.\r
 80691A     (base 16)           Belkin International Inc.\r
                                12045 East Waterfront Drive\r
@@ -114116,6 +115508,18 @@ E046EE     (base 16)         NETGEAR
                                San Jose  CA  95134\r
                                US\r
 \r
+DC-BE-49   (hex)               ITEL MOBILE LIMITED\r
+DCBE49     (base 16)           ITEL MOBILE LIMITED\r
+                               RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K\r
+                               Hong Kong  KOWLOON  999077\r
+                               HK\r
+\r
+9C-95-61   (hex)               Hui Zhou Gaoshengda Technology Co.,LTD\r
+9C9561     (base 16)           Hui Zhou Gaoshengda Technology Co.,LTD\r
+                               No.75,Zhongkai High-Tech Development District,Huizhou\r
+                               Hui Zhou  Guangdong  516006\r
+                               CN\r
+\r
 9C-4F-5F   (hex)               Google, Inc.\r
 9C4F5F     (base 16)           Google, Inc.\r
                                15 rue Castel\r
@@ -114134,36 +115538,24 @@ A02942     (base 16)                Intel Corporate
                                Hsichu  Taiwan  300\r
                                TW\r
 \r
-04-63-D0   (hex)               Huawei Device Co., Ltd.\r
-0463D0     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
 F0-D4-15   (hex)               Intel Corporate\r
 F0D415     (base 16)           Intel Corporate\r
                                Lot 8, Jalan Hi-Tech 2/3  \r
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-18-69-D4   (hex)               Samsung Electronics Co.,Ltd\r
-1869D4     (base 16)           Samsung Electronics Co.,Ltd\r
-                               #94-1, Imsoo-Dong\r
-                               Gumi  Gyeongbuk  730-350\r
-                               KR\r
+D4-D8-53   (hex)               Intel Corporate\r
+D4D853     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
 \r
-9C-95-61   (hex)               Hui Zhou Gaoshengda Technology Co.,LTD\r
-9C9561     (base 16)           Hui Zhou Gaoshengda Technology Co.,LTD\r
-                               No.75,Zhongkai High-Tech Development District,Huizhou\r
-                               Hui Zhou  Guangdong  516006\r
+04-63-D0   (hex)               Huawei Device Co., Ltd.\r
+0463D0     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
                                CN\r
 \r
-DC-BE-49   (hex)               ITEL MOBILE LIMITED\r
-DCBE49     (base 16)           ITEL MOBILE LIMITED\r
-                               RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K\r
-                               Hong Kong  KOWLOON  999077\r
-                               HK\r
-\r
 14-44-8F   (hex)               Edgecore Networks Corporation\r
 14448F     (base 16)           Edgecore Networks Corporation\r
                                1 Creation RD 3.\r
@@ -114176,6 +115568,18 @@ DCBE49     (base 16)         ITEL MOBILE LIMITED
                                Reno  NV  89507\r
                                US\r
 \r
+C0-ED-E5   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+C0EDE5     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+10-A5-62   (hex)               Iton Technology Corp.\r
+10A562     (base 16)           Iton Technology Corp.\r
+                               Room 1302, Block A, Building 4, Tianan Cyber Park, Huangge Road,Longgang District\r
+                               Shenzhen  Guangdong   518116\r
+                               CN\r
+\r
 D4-A3-EB   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
 D4A3EB     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
                                Room 601,Block B ,Digital Building,Garden City\r
@@ -114206,12 +115610,6 @@ B89FCC     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
                                Kanata  Ontario  K2K 2E6\r
                                CA\r
 \r
-D4-D8-53   (hex)               Intel Corporate\r
-D4D853     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
 8C-76-3F   (hex)               ARRIS Group, Inc.\r
 8C763F     (base 16)           ARRIS Group, Inc.\r
                                6450 Sequence Drive\r
@@ -114230,18 +115628,6 @@ C0A938     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
-C0-ED-E5   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
-C0EDE5     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
-                               NO.18 HAIBIN ROAD,\r
-                               DONG GUAN  GUANG DONG  523860\r
-                               CN\r
-\r
-10-A5-62   (hex)               Iton Technology Corp.\r
-10A562     (base 16)           Iton Technology Corp.\r
-                               Room 1302, Block A, Building 4, Tianan Cyber Park, Huangge Road,Longgang District\r
-                               Shenzhen  Guangdong   518116\r
-                               CN\r
-\r
 5C-24-E2   (hex)               Suzhou Denbom Electronic S&T Co., Ltd\r
 5C24E2     (base 16)           Suzhou Denbom Electronic S&T Co., Ltd\r
                                3F,Building 2, No.415,Changyang Street\r
@@ -114278,12 +115664,6 @@ BCC746     (base 16)         Hon Hai Precision IND.CO.,LTD
                                New Taipei City  Banqiao Dist.  220871\r
                                TW\r
 \r
-64-FD-96   (hex)               Sagemcom Broadband SAS\r
-64FD96     (base 16)           Sagemcom Broadband SAS\r
-                               250, route de l'Empereur\r
-                               Rueil Malmaison Cedex  hauts de seine  92848\r
-                               FR\r
-\r
 FC-B9-7E   (hex)               GE Appliances\r
 FCB97E     (base 16)           GE Appliances\r
                                4000 Buechel Bank Road\r
@@ -114302,6 +115682,12 @@ FCB97E     (base 16)         GE Appliances
                                Beijing    100089\r
                                CN\r
 \r
+64-FD-96   (hex)               Sagemcom Broadband SAS\r
+64FD96     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
 C8-EB-EC   (hex)               Shenzhen YOUHUA Technology Co., Ltd\r
 C8EBEC     (base 16)           Shenzhen YOUHUA Technology Co., Ltd\r
                                Room 407 Shenzhen University-town Business Park,Lishan Road,Taoyuan Street,Nanshan District\r
@@ -114314,23 +115700,11 @@ C8EBEC     (base 16)                Shenzhen YOUHUA Technology Co., Ltd
                                New Taipei City  Taiwan  235\r
                                TW\r
 \r
-E0-D7-38   (hex)               WireStar Networks\r
-E0D738     (base 16)           WireStar Networks\r
-                               PO Box 10966\r
-                               College Station  TX  77842\r
-                               US\r
-\r
-40-42-44   (hex)               Cisco Systems, Inc\r
-404244     (base 16)           Cisco Systems, Inc\r
-                               80 West Tasman Drive\r
-                               San Jose  CA  94568\r
-                               US\r
-\r
-04-B6-BE   (hex)               CIG SHANGHAI CO LTD\r
-04B6BE     (base 16)           CIG SHANGHAI CO LTD\r
-                               5th Floor, Building 8 No 2388 Chenhang Road\r
-                               SHANGHAI    201114\r
-                               CN\r
+94-C5-A6   (hex)               ITEL MOBILE LIMITED\r
+94C5A6     (base 16)           ITEL MOBILE LIMITED\r
+                               RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K\r
+                               Hong Kong  KOWLOON  999077\r
+                               HK\r
 \r
 7C-EC-B1   (hex)               Apple, Inc.\r
 7CECB1     (base 16)           Apple, Inc.\r
@@ -114344,17 +115718,35 @@ E0D738     (base 16)                WireStar Networks
                                Cupertino  CA  95014\r
                                US\r
 \r
+E0-D7-38   (hex)               WireStar Networks\r
+E0D738     (base 16)           WireStar Networks\r
+                               PO Box 10966\r
+                               College Station  TX  77842\r
+                               US\r
+\r
+40-42-44   (hex)               Cisco Systems, Inc\r
+404244     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
 A8-B0-AE   (hex)               BizLink Special Cables Germany GmbH\r
 A8B0AE     (base 16)           BizLink Special Cables Germany GmbH\r
                                Eschstrasse 1\r
                                Friesoythe    26169\r
                                DE\r
 \r
-94-C5-A6   (hex)               ITEL MOBILE LIMITED\r
-94C5A6     (base 16)           ITEL MOBILE LIMITED\r
-                               RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K\r
-                               Hong Kong  KOWLOON  999077\r
-                               HK\r
+F0-B6-61   (hex)               eero inc.\r
+F0B661     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+E0-6A-05   (hex)               Shenzhen YOUHUA Technology Co., Ltd\r
+E06A05     (base 16)           Shenzhen YOUHUA Technology Co., Ltd\r
+                               Room 407 Shenzhen University-town Business Park,Lishan Road,Taoyuan Street,Nanshan District\r
+                               Shenzhen  Guangdong  518055\r
+                               CN\r
 \r
 48-57-D2   (hex)               Broadcom Limited\r
 4857D2     (base 16)           Broadcom Limited\r
@@ -114380,12 +115772,6 @@ D834EE     (base 16)         SHURE INCORPORATED
                                NILES  IL  60714 \r
                                US\r
 \r
-F0-B6-61   (hex)               eero inc.\r
-F0B661     (base 16)           eero inc.\r
-                               660 3rd Street\r
-                               San Francisco  CA  94107\r
-                               US\r
-\r
 04-25-F0   (hex)               Nokia\r
 0425F0     (base 16)           Nokia\r
                                600 March Road\r
@@ -114398,10 +115784,16 @@ F0B661     (base 16)                eero inc.
                                Kyoto    619-0237\r
                                JP\r
 \r
-E0-6A-05   (hex)               Shenzhen YOUHUA Technology Co., Ltd\r
-E06A05     (base 16)           Shenzhen YOUHUA Technology Co., Ltd\r
-                               Room 407 Shenzhen University-town Business Park,Lishan Road,Taoyuan Street,Nanshan District\r
-                               Shenzhen  Guangdong  518055\r
+40-3B-7B   (hex)               Huawei Device Co., Ltd.\r
+403B7B     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+08-30-CE   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+0830CE     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
                                CN\r
 \r
 90-CD-1F   (hex)               Quectel Wireless Solutions Co.,Ltd.\r
@@ -114434,18 +115826,6 @@ E06A05     (base 16)         Shenzhen YOUHUA Technology Co., Ltd
                                Rueil Malmaison Cedex  hauts de seine  92848\r
                                FR\r
 \r
-40-3B-7B   (hex)               Huawei Device Co., Ltd.\r
-403B7B     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
-08-30-CE   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
-0830CE     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
-                               No.5 DongXin Road\r
-                               Wuhan  Hubei  430074\r
-                               CN\r
-\r
 B0-A2-E7   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
 B0A2E7     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
                                Building, No.33, Xiandong Rd, Xili\r
@@ -114464,12 +115844,24 @@ BC4101     (base 16)                Shenzhen TINNO Mobile Technology Corp.
                                Nanshan District, Shenzhen  PRC  518053\r
                                CN\r
 \r
+18-D6-1C   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
+18D61C     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
+                               Building, No.33, Xiandong Rd, Xili\r
+                               Nanshan District, Shenzhen  PRC  518053\r
+                               CN\r
+\r
 74-97-79   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
 749779     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
                                B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
                                Nanning  Guangxi  530007\r
                                CN\r
 \r
+34-CF-6C   (hex)               Hangzhou Taili wireless communication equipment Co.,Ltd\r
+34CF6C     (base 16)           Hangzhou Taili wireless communication equipment Co.,Ltd\r
+                               Room 1901, No.258,  Zhonghe Middle Road, Shangcheng District, Hangzhou\r
+                               Hangzhou  Zhejiang  310003\r
+                               CN\r
+\r
 F8-CD-C8   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
 F8CDC8     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
                                No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
@@ -114482,16 +115874,10 @@ B0285B     (base 16)                JUHUA Technology Inc.
                                Shenzhen City  Guangdong Province  518117\r
                                CN\r
 \r
-18-D6-1C   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
-18D61C     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
-                               Building, No.33, Xiandong Rd, Xili\r
-                               Nanshan District, Shenzhen  PRC  518053\r
-                               CN\r
-\r
-34-CF-6C   (hex)               Hangzhou Taili wireless communication equipment Co.,Ltd\r
-34CF6C     (base 16)           Hangzhou Taili wireless communication equipment Co.,Ltd\r
-                               Room 1901, No.258,  Zhonghe Middle Road, Shangcheng District, Hangzhou\r
-                               Hangzhou  Zhejiang  310003\r
+C8-24-96   (hex)               Jiangsu Yinhe  Electronics Co.,Ltd.\r
+C82496     (base 16)           Jiangsu Yinhe  Electronics Co.,Ltd.\r
+                               No.188 Nanhuan Road, TangQiao Town\r
+                               Zhangjiagang   Jiangsu   215611\r
                                CN\r
 \r
 E0-F6-78   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
@@ -114500,17 +115886,29 @@ E0F678     (base 16)                Fiberhome Telecommunication Technologies Co.,LTD
                                Wuhan  Hubei  430074\r
                                CN\r
 \r
+40-22-30   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
+402230     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
+                               1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+14-5B-B9   (hex)               ConMet\r
+145BB9     (base 16)           ConMet\r
+                               5701 SE Columbia Way\r
+                               Vancouver    WA  98661\r
+                               US\r
+\r
 28-F7-D6   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
 28F7D6     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
                                No.5 DongXin Road\r
                                Wuhan  Hubei  430074\r
                                CN\r
 \r
-C8-24-96   (hex)               Jiangsu Yinhe  Electronics Co.,Ltd.\r
-C82496     (base 16)           Jiangsu Yinhe  Electronics Co.,Ltd.\r
-                               No.188 Nanhuan Road, TangQiao Town\r
-                               Zhangjiagang   Jiangsu   215611\r
-                               CN\r
+B8-B4-09   (hex)               Samsung Electronics Co.,Ltd\r
+B8B409     (base 16)           Samsung Electronics Co.,Ltd\r
+                               129, Samsung-ro, Youngtongl-Gu\r
+                               Suwon  Gyeonggi-Do  16677\r
+                               KR\r
 \r
 24-18-C0   (hex)               E. Wehrle GmbH\r
 2418C0     (base 16)           E. Wehrle GmbH\r
@@ -114518,12 +115916,6 @@ C82496     (base 16)         Jiangsu Yinhe  Electronics Co.,Ltd.
                                78120 Furtwangen  Baden-Württemberg  78120\r
                                DE\r
 \r
-14-5B-B9   (hex)               ConMet\r
-145BB9     (base 16)           ConMet\r
-                               5701 SE Columbia Way\r
-                               Vancouver    WA  98661\r
-                               US\r
-\r
 AC-83-F0   (hex)               Cobalt Digital Inc.\r
 AC83F0     (base 16)           Cobalt Digital Inc.\r
                                2506 Galen Drive\r
@@ -114536,6 +115928,12 @@ AC15A2     (base 16)         TP-Link Corporation Limited
                                 Tsim Sha Tsui  Kowloon  999077\r
                                HK\r
 \r
+AC-DF-9F   (hex)               Arcadyan Corporation\r
+ACDF9F     (base 16)           Arcadyan Corporation\r
+                               No.8, Sec.2, Guangfu Rd.\r
+                               Hsinchu City  Hsinchu  30071\r
+                               TW\r
+\r
 B8-59-C8   (hex)               70mai Co.,Ltd.\r
 B859C8     (base 16)           70mai Co.,Ltd.\r
                                Room 2220, building 2, No. 588, Zixing road\r
@@ -114548,23 +115946,11 @@ A8E207     (base 16)                GOIP Global Services Pvt. Ltd.
                                Noida   Uttar Pradesh  201301\r
                                IN\r
 \r
-40-22-30   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
-402230     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
-                               1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
-\r
-B8-B4-09   (hex)               Samsung Electronics Co.,Ltd\r
-B8B409     (base 16)           Samsung Electronics Co.,Ltd\r
-                               129, Samsung-ro, Youngtongl-Gu\r
-                               Suwon  Gyeonggi-Do  16677\r
-                               KR\r
-\r
-AC-DF-9F   (hex)               Arcadyan Corporation\r
-ACDF9F     (base 16)           Arcadyan Corporation\r
-                               No.8, Sec.2, Guangfu Rd.\r
-                               Hsinchu City  Hsinchu  30071\r
-                               TW\r
+74-E7-98   (hex)               Juniper Networks\r
+74E798     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
 \r
 D4-E2-2F   (hex)               Roku, Inc\r
 D4E22F     (base 16)           Roku, Inc\r
@@ -114602,18 +115988,6 @@ C43CB0     (base 16)         SHENZHEN BILIAN ELECTRONIC CO.，LTD
                                Mianyang  Sichuan  622650\r
                                CN\r
 \r
-D8-7E-6F   (hex)               CASCINATION AG\r
-D87E6F     (base 16)           CASCINATION AG\r
-                               Steigerhubelstrasse 3\r
-                               Bern  Bern  3008\r
-                               CH\r
-\r
-04-4F-7A   (hex)               China Mobile Group Device Co.,Ltd.\r
-044F7A     (base 16)           China Mobile Group Device Co.,Ltd.\r
-                               32 Xuanwumen West Street,Xicheng District\r
-                               Beijing    100053\r
-                               CN\r
-\r
 40-5E-F6   (hex)               Samsung Electronics Co.,Ltd\r
 405EF6     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
@@ -114638,23 +116012,29 @@ D87E6F     (base 16)                CASCINATION AG
                                Reno  NV  89507\r
                                US\r
 \r
+04-4F-7A   (hex)               China Mobile Group Device Co.,Ltd.\r
+044F7A     (base 16)           China Mobile Group Device Co.,Ltd.\r
+                               32 Xuanwumen West Street,Xicheng District\r
+                               Beijing    100053\r
+                               CN\r
+\r
 C0-4E-30   (hex)               Espressif Inc.\r
 C04E30     (base 16)           Espressif Inc.\r
                                Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
                                Shanghai  Shanghai  201203\r
                                CN\r
 \r
-74-E7-98   (hex)               Juniper Networks\r
-74E798     (base 16)           Juniper Networks\r
-                               1133 Innovation Way\r
-                               Sunnyvale  CA  94089\r
-                               US\r
+AC-60-6F   (hex)               Nokia Shanghai Bell Co., Ltd.\r
+AC606F     (base 16)           Nokia Shanghai Bell Co., Ltd.\r
+                               No.388 Ning Qiao Road,Jin Qiao Pudong Shanghai\r
+                               Shanghai     201206\r
+                               CN\r
 \r
-E0-16-B1   (hex)               Advanced Design Technology co.,ltd.\r
-E016B1     (base 16)           Advanced Design Technology co.,ltd.\r
-                               1-1-3 Kotobukicho#10F Mitsukikotobukichobiru\r
-                               Fucyu-city  Tokyo  1830056\r
-                               JP\r
+D8-7E-6F   (hex)               CASCINATION AG\r
+D87E6F     (base 16)           CASCINATION AG\r
+                               Steigerhubelstrasse 3\r
+                               Bern  Bern  3008\r
+                               CH\r
 \r
 54-31-D4   (hex)               TGW Mechanics GmbH\r
 5431D4     (base 16)           TGW Mechanics GmbH\r
@@ -114668,44 +116048,50 @@ E016B1     (base 16)                Advanced Design Technology co.,ltd.
                                Wuhan  Hubei  430206\r
                                CN\r
 \r
-C0-69-11   (hex)               Arista Networks\r
-C06911     (base 16)           Arista Networks\r
-                               5453 Great America Parkway\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-E4-B5-55   (hex)               Huawei Device Co., Ltd.\r
-E4B555     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
-24-A7-DC   (hex)               SKY UK LIMITED\r
-24A7DC     (base 16)           SKY UK LIMITED\r
+00-19-FB   (hex)               SKY UK LIMITED\r
+0019FB     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
                                Brentwood  Essex  08854\r
                                GB\r
 \r
-38-A6-CE   (hex)               SKY UK LIMITED\r
-38A6CE     (base 16)           SKY UK LIMITED\r
+78-3E-53   (hex)               SKY UK LIMITED\r
+783E53     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
                                Brentwood  Essex  08854\r
                                GB\r
 \r
-AC-60-6F   (hex)               Nokia Shanghai Bell Co., Ltd.\r
-AC606F     (base 16)           Nokia Shanghai Bell Co., Ltd.\r
-                               No.388 Ning Qiao Road,Jin Qiao Pudong Shanghai\r
-                               Shanghai     201206\r
-                               CN\r
-\r
-00-19-FB   (hex)               SKY UK LIMITED\r
-0019FB     (base 16)           SKY UK LIMITED\r
+24-A7-DC   (hex)               SKY UK LIMITED\r
+24A7DC     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
                                Brentwood  Essex  08854\r
                                GB\r
 \r
-78-3E-53   (hex)               SKY UK LIMITED\r
-783E53     (base 16)           SKY UK LIMITED\r
+E0-16-B1   (hex)               Advanced Design Technology co.,ltd.\r
+E016B1     (base 16)           Advanced Design Technology co.,ltd.\r
+                               1-1-3 Kotobukicho#10F Mitsukikotobukichobiru\r
+                               Fucyu-city  Tokyo  1830056\r
+                               JP\r
+\r
+E4-B5-55   (hex)               Huawei Device Co., Ltd.\r
+E4B555     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+C0-69-11   (hex)               Arista Networks\r
+C06911     (base 16)           Arista Networks\r
+                               5453 Great America Parkway\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+2C-93-FB   (hex)               Sercomm France Sarl\r
+2C93FB     (base 16)           Sercomm France Sarl\r
+                               2/4 Rue Maurice Hartmann 92370  Issy Les Moulineaux France\r
+                               Moulineaux    92370\r
+                               FR\r
+\r
+38-A6-CE   (hex)               SKY UK LIMITED\r
+38A6CE     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
                                Brentwood  Essex  08854\r
                                GB\r
@@ -114728,18 +116114,6 @@ FCC737     (base 16)         Shaanxi Gangsion Electronic Technology Co., Ltd
                                xi'an  Shaanxi  710076\r
                                CN\r
 \r
-94-28-6F   (hex)               zte corporation\r
-94286F     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-40-0E-F3   (hex)               zte corporation\r
-400EF3     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 1C-46-D1   (hex)               SKY UK LIMITED\r
 1C46D1     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
@@ -114794,11 +116168,11 @@ BC69CB     (base 16)                Panasonic Electric Works Networks Co., Ltd.
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-2C-93-FB   (hex)               Sercomm France Sarl\r
-2C93FB     (base 16)           Sercomm France Sarl\r
-                               2/4 Rue Maurice Hartmann 92370  Issy Les Moulineaux France\r
-                               Moulineaux    92370\r
-                               FR\r
+58-2B-0A   (hex)               Texas Instruments\r
+582B0A     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
 \r
 B4-46-6B   (hex)               REALTIMEID AS\r
 B4466B     (base 16)           REALTIMEID AS\r
@@ -114806,12 +116180,6 @@ B4466B     (base 16)         REALTIMEID AS
                                Snåsa    7760\r
                                NO\r
 \r
-90-6A-EB   (hex)               Microsoft Corporation\r
-906AEB     (base 16)           Microsoft Corporation\r
-                               One Microsoft Way\r
-                               REDMOND  WA  98052\r
-                               US\r
-\r
 C4-EB-39   (hex)               Sagemcom Broadband SAS\r
 C4EB39     (base 16)           Sagemcom Broadband SAS\r
                                250, route de l'Empereur\r
@@ -114824,17 +116192,11 @@ C4EB39     (base 16)                Sagemcom Broadband SAS
                                Taipei City    10690\r
                                TW\r
 \r
-08-9D-F4   (hex)               Intel Corporate\r
-089DF4     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
-DC-46-28   (hex)               Intel Corporate\r
-DC4628     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
+F0-C1-CE   (hex)               GoodWe Technologies CO., Ltd\r
+F0C1CE     (base 16)           GoodWe Technologies CO., Ltd\r
+                               No.90 Zijin Rd.,New District,Suzhou,215011,China\r
+                               Suzhou   JiangSu  215011\r
+                               CN\r
 \r
 0C-91-92   (hex)               Intel Corporate\r
 0C9192     (base 16)           Intel Corporate\r
@@ -114854,23 +116216,23 @@ DC4628     (base 16)                Intel Corporate
                                Shenzhen    518000\r
                                CN\r
 \r
-F0-C1-CE   (hex)               GoodWe Technologies CO., Ltd\r
-F0C1CE     (base 16)           GoodWe Technologies CO., Ltd\r
-                               No.90 Zijin Rd.,New District,Suzhou,215011,China\r
-                               Suzhou   JiangSu  215011\r
-                               CN\r
+08-9D-F4   (hex)               Intel Corporate\r
+089DF4     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
 \r
-58-2B-0A   (hex)               Texas Instruments\r
-582B0A     (base 16)           Texas Instruments\r
-                               12500 TI Blvd\r
-                               Dallas  TX  75243\r
-                               US\r
+DC-46-28   (hex)               Intel Corporate\r
+DC4628     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
 \r
-D8-E8-44   (hex)               zte corporation\r
-D8E844     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
+90-6A-EB   (hex)               Microsoft Corporation\r
+906AEB     (base 16)           Microsoft Corporation\r
+                               One Microsoft Way\r
+                               REDMOND  WA  98052\r
+                               US\r
 \r
 E4-6A-35   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
 E46A35     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
@@ -114896,6 +116258,18 @@ E838A0     (base 16)         Vizio, Inc
                                Irvine  CA  92618\r
                                US\r
 \r
+EC-C0-7A   (hex)               Laird Connectivity\r
+ECC07A     (base 16)           Laird Connectivity\r
+                               3F.-1, No.145, Xianzheng 9th Rd.,\r
+                               Zhubei    30251\r
+                               TW\r
+\r
+68-B9-C2   (hex)               Earda Technologies co Ltd\r
+68B9C2     (base 16)           Earda Technologies co Ltd\r
+                               Block A,Lianfeng Creative Park, #2 Jisheng Rd., Nansha District\r
+                               Guangzhou  Guangdong  511455\r
+                               CN\r
+\r
 C8-1E-C2   (hex)               ITEL MOBILE LIMITED\r
 C81EC2     (base 16)           ITEL MOBILE LIMITED\r
                                RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K\r
@@ -114908,12 +116282,6 @@ C81EC2     (base 16)         ITEL MOBILE LIMITED
                                Hui Zhou  Guangdong  516025\r
                                CN\r
 \r
-68-B9-C2   (hex)               Earda Technologies co Ltd\r
-68B9C2     (base 16)           Earda Technologies co Ltd\r
-                               Block A,Lianfeng Creative Park, #2 Jisheng Rd., Nansha District\r
-                               Guangzhou  Guangdong  511455\r
-                               CN\r
-\r
 68-83-CB   (hex)               Apple, Inc.\r
 6883CB     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
@@ -114932,11 +116300,11 @@ FC1263     (base 16)                ASKEY COMPUTER CORP
                                Shanghai  Shanghai  201114\r
                                CN\r
 \r
-EC-C0-7A   (hex)               Laird Connectivity\r
-ECC07A     (base 16)           Laird Connectivity\r
-                               3F.-1, No.145, Xianzheng 9th Rd.,\r
-                               Zhubei    30251\r
-                               TW\r
+C0-71-AA   (hex)               ShenZhen OnMicro Electronics Co.,Ltd.\r
+C071AA     (base 16)           ShenZhen OnMicro Electronics Co.,Ltd.\r
+                               Room 407-408, West Building, Skyworth Semiconductor Building, GaoXin South 4th Road, Yuehai Street, Nanshan District\r
+                               Shenzhen  GuangDong  518057\r
+                               CN\r
 \r
 9C-05-91   (hex)               Mellanox Technologies, Inc.\r
 9C0591     (base 16)           Mellanox Technologies, Inc.\r
@@ -114944,22 +116312,22 @@ ECC07A     (base 16)                Laird Connectivity
                                Sunnyvale  CA  94085\r
                                US\r
 \r
+70-9C-45   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+709C45     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
 00-09-DF   (hex)               Vestel Elektronik San ve Tic. A.S.\r
 0009DF     (base 16)           Vestel Elektronik San ve Tic. A.S.\r
                                Organize san\r
                                Manisa  Turket  45030\r
                                TR\r
 \r
-C0-71-AA   (hex)               ShenZhen OnMicro Electronics Co.,Ltd.\r
-C071AA     (base 16)           ShenZhen OnMicro Electronics Co.,Ltd.\r
-                               Room 407-408, West Building, Skyworth Semiconductor Building, GaoXin South 4th Road, Yuehai Street, Nanshan District\r
-                               Shenzhen  GuangDong  518057\r
-                               CN\r
-\r
-70-9C-45   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-709C45     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
+FC-07-36   (hex)               Huawei Device Co., Ltd.\r
+FC0736     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
                                CN\r
 \r
 94-A0-7D   (hex)               Huawei Device Co., Ltd.\r
@@ -114974,12 +116342,24 @@ C071AA     (base 16)                ShenZhen OnMicro Electronics Co.,Ltd.
                                New Taipei    23674\r
                                TW\r
 \r
-FC-07-36   (hex)               Huawei Device Co., Ltd.\r
-FC0736     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
+DC-E6-50   (hex)               Extreme Networks, Inc.\r
+DCE650     (base 16)           Extreme Networks, Inc.\r
+                               6480 Via Del Oro\r
+                               San Jose  CA  95119\r
+                               US\r
+\r
+14-2D-79   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+142D79     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
                                CN\r
 \r
+DC-B7-AC   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+DCB7AC     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
 A0-31-31   (hex)               Procenne Digital Security\r
 A03131     (base 16)           Procenne Digital Security\r
                                Eski Buyukdere Cd. No:7/12 Maslak\r
@@ -114992,46 +116372,832 @@ A03131     (base 16)               Procenne Digital Security
                                New Taipei City    22041\r
                                TW\r
 \r
-14-2D-79   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
-142D79     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
-                               No.5 DongXin Road\r
-                               Wuhan  Hubei  430074\r
+CC-5E-F8   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+CC5EF8     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+                               B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
+                               Nanning  Guangxi  530007\r
                                CN\r
 \r
-DC-B7-AC   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
-DCB7AC     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
-                               3333 Scott Blvd\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 A4-9E-69   (hex)               Silicon Laboratories\r
 A49E69     (base 16)           Silicon Laboratories\r
                                400 W Cesar Chavez St, Silicon La\r
                                Austin  TX  78701\r
                                US\r
 \r
-DC-E6-50   (hex)               Extreme Networks, Inc.\r
-DCE650     (base 16)           Extreme Networks, Inc.\r
-                               6480 Via Del Oro\r
-                               San Jose  CA  95119\r
-                               US\r
-\r
 48-73-10   (hex)               Juniper Networks\r
 487310     (base 16)           Juniper Networks\r
                                1133 Innovation Way\r
                                Sunnyvale  CA  94089\r
                                US\r
 \r
-7C-DC-CC   (hex)               Beijing Yixin Techology Co.,Ltd\r
-7CDCCC     (base 16)           Beijing Yixin Techology Co.,Ltd\r
+4C-FC-22   (hex)               SHANGHAI HI-TECH CONTROL SYSTEM CO.,LTD.\r
+4CFC22     (base 16)           SHANGHAI HI-TECH CONTROL SYSTEM CO.,LTD.\r
+                               XinJun Ring Road 777, Caohejing Pujiang Hi-Tech Park, Minhang District\r
+                               Shanghai  Shanghai  201114\r
+                               CN\r
+\r
+40-33-06   (hex)               Taicang T&W Electronics\r
+403306     (base 16)           Taicang T&W Electronics\r
+                               89# Jiang Nan RD\r
+                               Suzhou  Jiangsu  215412\r
+                               CN\r
+\r
+00-0B-F8   (hex)               Infinera, Inc.\r
+000BF8     (base 16)           Infinera, Inc.\r
+                               1322 Bordeaux Drive\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+7C-50-DA   (hex)               E.J Ward\r
+7C50DA     (base 16)           E.J Ward\r
+                               8620 N. New Braunfels, Ste. 200N\r
+                               San Antonio  TX  78217\r
+                               US\r
+\r
+00-5C-C2   (hex)               SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
+005CC2     (base 16)           SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
+                               3/F, Building R1-B, High-Tech Industrial Park, Nanshan District\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+2C-F2-A5   (hex)               Sagemcom Broadband SAS\r
+2CF2A5     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+E4-EC-E8   (hex)               Samsung Electronics Co.,Ltd\r
+E4ECE8     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+C8-90-8A   (hex)               Samsung Electronics Co.,Ltd\r
+C8908A     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+78-3E-A1   (hex)               Nokia Shanghai Bell Co., Ltd.\r
+783EA1     (base 16)           Nokia Shanghai Bell Co., Ltd.\r
+                               No.388 Ning Qiao Road,Jin Qiao Pudong Shanghai\r
+                               Shanghai     201206\r
+                               CN\r
+\r
+B0-81-01   (hex)               Honor Device Co., Ltd.\r
+B08101     (base 16)           Honor Device Co., Ltd.\r
+                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
+                               Shenzhen   Guangdong  518040\r
+                               CN\r
+\r
+48-5D-ED   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
+485DED     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
+                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
+                               Chengdu  Sichuan  611330\r
+                               CN\r
+\r
+5C-FC-6E   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
+5CFC6E     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
+                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
+                               Chengdu  Sichuan  611330\r
+                               CN\r
+\r
+30-B0-EA   (hex)               Shenzhen Chuangxin Internet Communication Technology Co., Ltd\r
+30B0EA     (base 16)           Shenzhen Chuangxin Internet Communication Technology Co., Ltd\r
+                                608, building r2-b, Gaoxin industrial village, No. 020, Gaoxin South 7th Road, Gaoxin community, Yuehai street, Nanshan District,\r
+                               ShenZhen  GuangDong  518000\r
+                               CN\r
+\r
+40-1A-58   (hex)               Wistron Neweb Corporation\r
+401A58     (base 16)           Wistron Neweb Corporation\r
+                               No.20,Park Avenue II,Hsinchu Science Park\r
+                               Hsin-Chu  R.O.C.  308\r
+                               TW\r
+\r
+A4-1C-B4   (hex)               DFI Inc\r
+A41CB4     (base 16)           DFI Inc\r
+                               No.157, Shanying Rd., Gueishan Dist., Taoyuan City 333424, Taiwan (R.O.C.)\r
+                               Taoyuan City    333424\r
+                               TW\r
+\r
+34-47-9A   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+34479A     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+7C-DC-CC   (hex)               BEIJING STARBLAZE TECHNOLOGY CO.,LTD\r
+7CDCCC     (base 16)           BEIJING STARBLAZE TECHNOLOGY CO.,LTD\r
                                Unit 907, Building 4, Building 2, No. 9 Fenghao East Road, Haidian District, Beijing \r
                                Beijing    100000\r
                                CN\r
 \r
-CC-5E-F8   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
-CC5EF8     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
-                               B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
-                               Nanning  Guangxi  530007\r
+70-B7-E4   (hex)               Broadcom Limited\r
+70B7E4     (base 16)           Broadcom Limited\r
+                               15191 Alton Parkway\r
+                               Irvine  CA  92618\r
+                               US\r
+\r
+14-23-F2   (hex)               Broadcom Limited\r
+1423F2     (base 16)           Broadcom Limited\r
+                               15191 Alton Parkway\r
+                               Irvine  CA  92618\r
+                               US\r
+\r
+74-08-DE   (hex)               Fujian Landi Commercial Technology Co., Ltd.\r
+7408DE     (base 16)           Fujian Landi Commercial Technology Co., Ltd.\r
+                               Building 3A, Block A, Fuzhou Software Park, No.89 Software Road, Gulou District\r
+                               Fuzhou  Fujian  350008\r
+                               CN\r
+\r
+10-FC-33   (hex)               Huawei Device Co., Ltd.\r
+10FC33     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+94-3C-96   (hex)               Sagemcom Broadband SAS\r
+943C96     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+94-AD-23   (hex)               Apple, Inc.\r
+94AD23     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+20-A5-CB   (hex)               Apple, Inc.\r
+20A5CB     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+F4-21-CA   (hex)               Apple, Inc.\r
+F421CA     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+3C-02-68   (hex)               Infinera, Inc.\r
+3C0268     (base 16)           Infinera, Inc.\r
+                               169 Java Drive\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+BC-89-A7   (hex)               Apple, Inc.\r
+BC89A7     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+04-04-B8   (hex)               China Hualu Panasonic AVC Networks Co., LTD.\r
+0404B8     (base 16)           China Hualu Panasonic AVC Networks Co., LTD.\r
+                               No.1 Hua Road,Qixianling,High Technology Zone,Dalian,Liaoning,China\r
+                               Dalian  LiaoNing  116023\r
+                               CN\r
+\r
+18-D6-DD   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+18D6DD     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+E0-01-A6   (hex)               Edgecore Networks Corporation\r
+E001A6     (base 16)           Edgecore Networks Corporation\r
+                               1 Creation RD 3.\r
+                               Hsinchu    30077\r
+                               TW\r
+\r
+FC-18-03   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+FC1803     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+68-96-2E   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+68962E     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+CC-3D-D1   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+CC3DD1     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+40-C2-BA   (hex)               COMPAL INFORMATION (KUNSHAN) CO., LTD. \r
+40C2BA     (base 16)           COMPAL INFORMATION (KUNSHAN) CO., LTD. \r
+                               NO. 25, THE 3RD Street KUNSHAN EXPORT PROCESSING ZONE \r
+                               KUNSHAN  SUZHOU  215300\r
+                               CN\r
+\r
+F0-82-C0   (hex)               Silicon Laboratories\r
+F082C0     (base 16)           Silicon Laboratories\r
+                               7000 W. William Cannon Dr.\r
+                               Austin  TX  78735\r
+                               US\r
+\r
+80-BC-37   (hex)               Ruckus Wireless\r
+80BC37     (base 16)           Ruckus Wireless\r
+                               350 West Java Drive\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+60-C7-BE   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+60C7BE     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
+                               Chongqing   China  401120\r
+                               CN\r
+\r
+20-36-26   (hex)               TP-Link Corporation Limited\r
+203626     (base 16)           TP-Link Corporation Limited\r
+                               Room 901,9/F.New East Ocean Centre, 9 Science Museum Road\r
+                                Tsim Sha Tsui  Kowloon  999077\r
+                               HK\r
+\r
+54-C4-5B   (hex)               Arcadyan Corporation\r
+54C45B     (base 16)           Arcadyan Corporation\r
+                               No.8, Sec.2, Guangfu Rd.\r
+                               Hsinchu City  Hsinchu  30071\r
+                               TW\r
+\r
+00-0B-3A   (hex)               PESA Inc.\r
+000B3A     (base 16)           PESA Inc.\r
+                               103 Quality Circle, Suite 210\r
+                               Huntsville  AL  35806\r
+                               US\r
+\r
+24-F0-D3   (hex)               Samsung Electronics Co.,Ltd\r
+24F0D3     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+58-20-71   (hex)               Samsung Electronics Co.,Ltd\r
+582071     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+24-DC-0F   (hex)               Phytium Technology Co.,Ltd.\r
+24DC0F     (base 16)           Phytium Technology Co.,Ltd.\r
+                               Building5,XinAn Business Square,Haiyuan Middle Road Binhai New District,\r
+                               Tianjin    300450\r
+                               CN\r
+\r
+68-49-92   (hex)               Cisco Meraki\r
+684992     (base 16)           Cisco Meraki\r
+                               500 Terry A. Francois Blvd\r
+                               San Francisco    94158\r
+                               US\r
+\r
+F8-5E-42   (hex)               Technicolor CH USA Inc.\r
+F85E42     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+EC-93-7D   (hex)               Technicolor CH USA Inc.\r
+EC937D     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+D4-E2-CB   (hex)               Technicolor CH USA Inc.\r
+D4E2CB     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+F8-A4-FB   (hex)               Nanjing Decowell Automation Co.,LTD\r
+F8A4FB     (base 16)           Nanjing Decowell Automation Co.,LTD\r
+                               Building 3, Zifeng Research and Innovation Park phase II, Qiaolin Street, Pukou District\r
+                               Nanjing  Jiangsu  211806\r
+                               CN\r
+\r
+80-BE-AF   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+80BEAF     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+F8-9B-6E   (hex)               Nokia Solutions and Networks GmbH & Co. KG\r
+F89B6E     (base 16)           Nokia Solutions and Networks GmbH & Co. KG\r
+                               Werinherstrasse 91\r
+                               München  Bavaria  D-81541\r
+                               DE\r
+\r
+E0-C2-64   (hex)               Intel Corporate\r
+E0C264     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+BC-D0-EB   (hex)               New H3C Technologies Co., Ltd\r
+BCD0EB     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+60-58-01   (hex)               Shandong ZTop Microelectronics Co., Ltd.\r
+605801     (base 16)           Shandong ZTop Microelectronics Co., Ltd.\r
+                               2-1105A5, Jinqiao international, No. 2277, 2nd Ring Road East, Hongjialou Street, Licheng District, Jinan, Shandong Province\r
+                               Jinan    250000\r
+                               CN\r
+\r
+D8-63-0D   (hex)               Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.\r
+D8630D     (base 16)           Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.\r
+                               No.19, Gaoxin 4th Road, Wuhan East Lake High-tech Zone, Wuhan\r
+                               Wuhan  Hubei  430000\r
+                               CN\r
+\r
+14-DC-51   (hex)               Xiamen Cheerzing IOT Technology Co.,Ltd.\r
+14DC51     (base 16)           Xiamen Cheerzing IOT Technology Co.,Ltd.\r
+                               Unit 702 7/F,No.165 East Tapu Road,Siming District\r
+                               Xiamen  FuJian  361002\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               IEEE Registration Authority\r
+D4BABA     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+9C-D8-E3   (hex)               Wuhan Huazhong Numerical Control Co., Ltd\r
+9CD8E3     (base 16)           Wuhan Huazhong Numerical Control Co., Ltd\r
+                               Wuhan Huazhong Numerical Control Co.?Ltd\r
+                               Wuhan  Hubei  430000\r
+                               CN\r
+\r
+F8-07-5D   (hex)               Huawei Device Co., Ltd.\r
+F8075D     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+04-33-1F   (hex)               Huawei Device Co., Ltd.\r
+04331F     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+98-22-6E   (hex)               Amazon Technologies Inc.\r
+98226E     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+C4-AA-C4   (hex)               Zhejiang Dahua Technology Co., Ltd.\r
+C4AAC4     (base 16)           Zhejiang Dahua Technology Co., Ltd.\r
+                               No.1199,Waterfront Road \r
+                               Hangzhou  Zhejiang  310053\r
+                               CN\r
+\r
+64-DB-F7   (hex)               Nokia Shanghai Bell Co., Ltd.\r
+64DBF7     (base 16)           Nokia Shanghai Bell Co., Ltd.\r
+                               No.388 Ning Qiao Road,Jin Qiao Pudong Shanghai\r
+                               Shanghai     201206\r
+                               CN\r
+\r
+3C-A2-C3   (hex)               vivo Mobile Communication Co., Ltd.\r
+3CA2C3     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               No.1, vivo Road, Chang'an\r
+                               Dongguan  Guangdong  523860\r
+                               CN\r
+\r
+14-B3-A1   (hex)               Juniper Networks\r
+14B3A1     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+54-10-2E   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+54102E     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+94-D5-4D   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+94D54D     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+E4-D3-AA   (hex)               FCNT LMITED\r
+E4D3AA     (base 16)           FCNT LMITED\r
+                               Sanki Yamato Building, 7-10-1 Chuorinkan\r
+                               Yamato  Kanagawa  242-8588\r
+                               JP\r
+\r
+5C-47-5E   (hex)               Ring LLC\r
+5C475E     (base 16)           Ring LLC\r
+                               1523 26th St\r
+                               Santa Monica  CA  90404\r
+                               US\r
+\r
+38-A9-EA   (hex)               HK DAPU ELECTRONIC TECHNOLOGY CO., LIMITED\r
+38A9EA     (base 16)           HK DAPU ELECTRONIC TECHNOLOGY CO., LIMITED\r
+                               FLAT/RM 3A-7 12/F, KAISER CENTRE, NO.18 CENTRE STREET, SAI YING PUN, HK\r
+                               HONGKONG    000000\r
+                               HK\r
+\r
+24-E5-0F   (hex)               Google, Inc.\r
+24E50F     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
+70-28-04   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+702804     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
+                               Chongqing   China  401120\r
+                               CN\r
+\r
+C0-91-B9   (hex)               Amazon Technologies Inc.\r
+C091B9     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+94-D8-6B   (hex)               nass magnet Hungária Kft.\r
+94D86B     (base 16)           nass magnet Hungária Kft.\r
+                               Henger u.2\r
+                               Veszprém    8200\r
+                               HU\r
+\r
+14-61-A4   (hex)               Honor Device Co., Ltd.\r
+1461A4     (base 16)           Honor Device Co., Ltd.\r
+                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
+                               Shenzhen   Guangdong  518040\r
+                               CN\r
+\r
+EC-84-B4   (hex)               CIG SHANGHAI CO LTD\r
+EC84B4     (base 16)           CIG SHANGHAI CO LTD\r
+                               5th Floor, Building 8 No 2388 Chenhang Road \r
+                               SHANGHAI    201114\r
+                               CN\r
+\r
+A4-81-7A   (hex)               CIG SHANGHAI CO LTD\r
+A4817A     (base 16)           CIG SHANGHAI CO LTD\r
+                               5th Floor, Building 8 No 2388 Chenhang Road \r
+                               SHANGHAI    201114\r
+                               CN\r
+\r
+5C-21-67   (hex)               Rockwell Automation\r
+5C2167     (base 16)           Rockwell Automation\r
+                               1 Allen-Bradley Dr.\r
+                               Mayfield Heights  OH  44124-6118\r
+                               US\r
+\r
+D0-96-86   (hex)               IEEE Registration Authority\r
+D09686     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+C4-E5-B1   (hex)               Suzhou PanKore Integrated Circuit Technology Co. Ltd.\r
+C4E5B1     (base 16)           Suzhou PanKore Integrated Circuit Technology Co. Ltd.\r
+                               Room168, Building 2, No. 128, West Shenhu Road, Suzhou Industrial Park, Suzhou City, Jiangsu Province, China\r
+                               SuZhou  Jiangsu  215027\r
+                               CN\r
+\r
+AC-C4-A9   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+ACC4A9     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+7C-94-9F   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
+7C949F     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
+                               Room 601,Block B ,Digital Building,Garden City\r
+                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
+                               CN\r
+\r
+3C-2C-A6   (hex)               Beijing Xiaomi Electronics Co.,Ltd\r
+3C2CA6     (base 16)           Beijing Xiaomi Electronics Co.,Ltd\r
+                               Xiaomi Campus\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
+34-F2-23   (hex)               Fujian Newland Communication Science Technology Co.,Ltd.\r
+34F223     (base 16)           Fujian Newland Communication Science Technology Co.,Ltd.\r
+                               F5, Hongzhuo Bldg., 1, Rujiangxi Rd., Fuzhou, Fujian, China\r
+                               Fuzhou  Fujian  350015\r
+                               CN\r
+\r
+E0-75-26   (hex)               China Dragon Technology Limited\r
+E07526     (base 16)           China Dragon Technology Limited\r
+                               B4 Bldg.Haoshan 1st Industry Park,\r
+                               Shenzhen  Guangdong  518104\r
+                               CN\r
+\r
+04-B6-BE   (hex)               CIG SHANGHAI CO LTD\r
+04B6BE     (base 16)           CIG SHANGHAI CO LTD\r
+                               5th Floor, Building 8 No 2388 Chenhang Road \r
+                               SHANGHAI    201114\r
+                               CN\r
+\r
+E4-8E-10   (hex)               CIG SHANGHAI CO LTD\r
+E48E10     (base 16)           CIG SHANGHAI CO LTD\r
+                               5th Floor, Building 8 No 2388 Chenhang Road \r
+                               SHANGHAI    201114\r
+                               CN\r
+\r
+94-BE-09   (hex)               China Mobile Group Device Co.,Ltd.\r
+94BE09     (base 16)           China Mobile Group Device Co.,Ltd.\r
+                               32 Xuanwumen West Street,Xicheng District\r
+                               Beijing    100053\r
+                               CN\r
+\r
+E8-EF-22   (hex)               Siemens Numerical Control Ltd., Nanjing\r
+E8EF22     (base 16)           Siemens Numerical Control Ltd., Nanjing\r
+                               18 Runhuai Road, Lishui Zone\r
+                               Nanjing    211200\r
+                               CN\r
+\r
+78-6C-84   (hex)               Amazon Technologies Inc.\r
+786C84     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+38-64-07   (hex)               Qingdao Intelligent&Precise Electronics Co.,Ltd.\r
+386407     (base 16)           Qingdao Intelligent&Precise Electronics Co.,Ltd.\r
+                               No.218 Qianwangang Road\r
+                               Qingdao  Shangdong  266510\r
+                               CN\r
+\r
+1C-63-A5   (hex)               securityplatform\r
+1C63A5     (base 16)           securityplatform\r
+                               Suite # 771, 815 daewangpangyo-ro, sujeong-gu\r
+                               seongnam-si  gyeonggi-do  13449\r
+                               KR\r
+\r
+94-28-6F   (hex)               zte corporation\r
+94286F     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+40-0E-F3   (hex)               zte corporation\r
+400EF3     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+D8-E8-44   (hex)               zte corporation\r
+D8E844     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+C0-51-5C   (hex)               zte corporation\r
+C0515C     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+9C-63-5B   (hex)               zte corporation\r
+9C635B     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+74-3E-39   (hex)               YUSUR Technology Co., Ltd.\r
+743E39     (base 16)           YUSUR Technology Co., Ltd.\r
+                               Room 1401,building 4,yard 1, Beiqing Road No.81, Haidian District\r
+                               Beijing  Beijing  100086\r
+                               CN\r
+\r
+B8-D4-BC   (hex)               zte corporation\r
+B8D4BC     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+C4-EB-41   (hex)               Sagemcom Broadband SAS\r
+C4EB41     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+C4-EB-43   (hex)               Sagemcom Broadband SAS\r
+C4EB43     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+4C-74-A7   (hex)               IEEE Registration Authority\r
+4C74A7     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+54-C6-FF   (hex)               New H3C Technologies Co., Ltd\r
+54C6FF     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+F4-E9-75   (hex)               New H3C Technologies Co., Ltd\r
+F4E975     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+D4-D4-DA   (hex)               Espressif Inc.\r
+D4D4DA     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+04-03-12   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+040312     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+84-60-82   (hex)               Hyperloop Technologies, Inc dba Virgin Hyperloop\r
+846082     (base 16)           Hyperloop Technologies, Inc dba Virgin Hyperloop\r
+                               2159 Bay Street\r
+                               LOS ANGELES  CA  90021\r
+                               US\r
+\r
+E8-AA-CB   (hex)               Samsung Electronics Co.,Ltd\r
+E8AACB     (base 16)           Samsung Electronics Co.,Ltd\r
+                               129, Samsung-ro, Youngtongl-Gu\r
+                               Suwon  Gyeonggi-Do  16677\r
+                               KR\r
+\r
+F0-4F-7C   (hex)               Amazon Technologies Inc.\r
+F04F7C     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+D4-3A-2C   (hex)               Google, Inc.\r
+D43A2C     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
+E0-4B-41   (hex)               Hangzhou Beilian Low Carbon Technology Co., Ltd.\r
+E04B41     (base 16)           Hangzhou Beilian Low Carbon Technology Co., Ltd.\r
+                               Room 2502, area a, building 1, No. 57, jianger Road, Changhe street, Binjiang District,\r
+                               HangZhou  ZheJiang   310000\r
+                               CN\r
+\r
+88-B8-6F   (hex)               Infinix mobility limited\r
+88B86F     (base 16)           Infinix mobility limited\r
+                               RMS 05-15, 13A/F SOUTH TOWER WORLD FINANCE CTR HARBOUR CITY 17 CANTON RD TST KLN HONG KONG\r
+                               HongKong  HongKong  999077\r
+                               HK\r
+\r
+28-0A-EE   (hex)               Renesas Electronics (Penang) Sdn. Bhd.\r
+280AEE     (base 16)           Renesas Electronics (Penang) Sdn. Bhd.\r
+                               Phase 3, Bayan Lepas FIZ\r
+                               Bayan Lepas  Penang  11900\r
+                               MY\r
+\r
+4C-22-F3   (hex)               Arcadyan Corporation\r
+4C22F3     (base 16)           Arcadyan Corporation\r
+                               No.8, Sec.2, Guangfu Rd.\r
+                               Hsinchu City  Hsinchu  30071\r
+                               TW\r
+\r
+38-53-19   (hex)               34ED LLC DBA Centegix\r
+385319     (base 16)           34ED LLC DBA Centegix\r
+                               2120 Powers Ferry Rd, Suite 110\r
+                               Atlanta  GA  30339\r
+                               US\r
+\r
+20-0C-86   (hex)               GX India Pvt Ltd\r
+200C86     (base 16)           GX India Pvt Ltd\r
+                               595, SECTOR-8, IMT MANESAR\r
+                               GURGAON  Haryana  122051\r
+                               IN\r
+\r
+70-AE-D5   (hex)               Apple, Inc.\r
+70AED5     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+00-09-0F   (hex)               Fortinet, Inc.\r
+00090F     (base 16)           Fortinet, Inc.\r
+                               1090 Kifer Road\r
+                               Sunnyvale  CA  94086\r
+                               US\r
+\r
+00-0C-E6   (hex)               Fortinet, Inc.\r
+000CE6     (base 16)           Fortinet, Inc.\r
+                               899 Kifer Road\r
+                               Sunnyvale  CA  94086\r
+                               US\r
+\r
+C4-7B-80   (hex)               Protempis, LLC\r
+C47B80     (base 16)           Protempis, LLC\r
+                               3333 Warrenville Road, Ste 200\r
+                               Lisle  IL  60532-1999\r
+                               US\r
+\r
+9C-88-24   (hex)               PetroCloud LLC\r
+9C8824     (base 16)           PetroCloud LLC\r
+                               8308 Sterling St\r
+                               Irving  TX  75063\r
+                               US\r
+\r
+54-D7-E3   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+54D7E3     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+5C-2F-AF   (hex)               HomeWizard B.V.\r
+5C2FAF     (base 16)           HomeWizard B.V.\r
+                               Keyserswey 79\r
+                               Noordwijk  Zuid-Holland  2201CX\r
+                               NL\r
+\r
+78-30-F5   (hex)               TBT Inc.\r
+7830F5     (base 16)           TBT Inc.\r
+                               10, Seounsandan-ro-4gil, Gyeyang-gu\r
+                               Incheon    21072\r
+                               KR\r
+\r
+88-AF-7B   (hex)               Nanjing Powercore Tech Co.,Ltd\r
+88AF7B     (base 16)           Nanjing Powercore Tech Co.,Ltd\r
+                               Room 104-9, Block B, Animation Building, 11 Xinghuo Road, Jiangbei New Area, Nanjing\r
+                                Nanjing    210000\r
+                               CN\r
+\r
+8C-8E-0D   (hex)               zte corporation\r
+8C8E0D     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+04-00-67   (hex)               Stanley Black & Decker\r
+040067     (base 16)           Stanley Black & Decker\r
+                               701 E Joppa Rd\r
+                               Towson  MD  21286\r
+                               US\r
+\r
+E0-B9-8A   (hex)               Shenzhen Taike industrial automation company,Ltd\r
+E0B98A     (base 16)           Shenzhen Taike industrial automation company,Ltd\r
+                               34F,building B,Zhongzhou holding financial center,No.88 Haide 1st Road,Haizhu community,Yuehai street,Nanshan District,Shenzhen,Guangdong\r
+                               Shenzhen  Guangdong  518064\r
+                               CN\r
+\r
+A0-24-F9   (hex)               Chengdu InnovaTest Technology Co., Ltd\r
+A024F9     (base 16)           Chengdu InnovaTest Technology Co., Ltd\r
+                               High Tech District\r
+                               Chengdu  Sichuan  610000\r
+                               CN\r
+\r
+70-47-77   (hex)               Ruckus Wireless\r
+704777     (base 16)           Ruckus Wireless\r
+                               350 West Java Drive\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+FC-3F-A6   (hex)               eero inc.\r
+FC3FA6     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+00-03-27   (hex)               HMS Industrial Networks\r
+000327     (base 16)           HMS Industrial Networks\r
+                               P O Box 4126\r
+                               Halmstad  Halland  300 04\r
+                               SE\r
+\r
+78-96-A3   (hex)               Extreme Networks, Inc.\r
+7896A3     (base 16)           Extreme Networks, Inc.\r
+                               6480 Via Del Oro\r
+                               San Jose  CA  95119\r
+                               US\r
+\r
+48-C1-EE   (hex)               Honor Device Co., Ltd.\r
+48C1EE     (base 16)           Honor Device Co., Ltd.\r
+                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
+                               Shenzhen   Guangdong  518040\r
+                               CN\r
+\r
+7C-64-6C   (hex)               LG Electronics\r
+7C646C     (base 16)           LG Electronics\r
+                               222 LG-ro, JINWI-MYEON\r
+                               Pyeongtaek-si  Gyeonggi-do  451-713\r
+                               KR\r
+\r
+CC-08-7B   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+CC087B     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
                                CN\r
 \r
 F8-D0-27   (hex)               Seiko Epson Corporation\r
@@ -115238,9 +117404,6 @@ ACDE48     (base 16)          Private
 00-50-C7   (hex)               Private\r
 0050C7     (base 16)           Private\r
 \r
-00-20-67   (hex)               Private\r
-002067     (base 16)           Private\r
-\r
 48-01-C5   (hex)               OnePlus Technology (Shenzhen) Co., Ltd\r
 4801C5     (base 16)           OnePlus Technology (Shenzhen) Co., Ltd\r
                                18C02, 18C03, 18C04 ,18C05,TAIRAN BUILDING,\r
@@ -116111,9 +118274,6 @@ D0EC35     (base 16)          Cisco Systems, Inc
                                San Jose  CA  94568\r
                                US\r
 \r
-10-AE-60   (hex)               Private\r
-10AE60     (base 16)           Private\r
-\r
 BC-CF-4F   (hex)               Zyxel Communications Corporation\r
 BCCF4F     (base 16)           Zyxel Communications Corporation\r
                                No. 6 Innovation Road II, Science Park\r
@@ -131717,12 +133877,6 @@ E4AB46     (base 16)         UAB Selteka
                                HAIFA    31008\r
                                IL\r
 \r
-10-09-0C   (hex)               Janome Sewing Machine Co., Ltd.\r
-10090C     (base 16)           Janome Sewing Machine Co., Ltd.\r
-                               1463 Hazama-Machi\r
-                               Hachioji-Shi  Tokyo  193-0941\r
-                               JP\r
-\r
 E0-1C-EE   (hex)               Bravo Tech, Inc.\r
 E01CEE     (base 16)           Bravo Tech, Inc.\r
                                6185 Phyllis Dr. Unit D.\r
@@ -146096,9 +148250,6 @@ ACBD70     (base 16)          Huawei Device Co., Ltd.
                                Dongguan  Guangdong  523808\r
                                CN\r
 \r
-C0-2E-26   (hex)               Private\r
-C02E26     (base 16)           Private\r
-\r
 34-D2-62   (hex)               SZ DJI TECHNOLOGY CO.,LTD\r
 34D262     (base 16)           SZ DJI TECHNOLOGY CO.,LTD\r
                                6/F,HKUST SZ IER Bldg,9 Yuexing 1st Rd\r
@@ -147566,12 +149717,6 @@ C0E3A0     (base 16)         Renesas Electronics (Penang) Sdn. Bhd.
                                Bayan Lepas  Penang  11900\r
                                MY\r
 \r
-F4-C1-14   (hex)               Technicolor CH USA Inc.\r
-F4C114     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 8C-E4-68   (hex)               Guangzhou Sageran Technology Co., Ltd.\r
 8CE468     (base 16)           Guangzhou Sageran Technology Co., Ltd.\r
                                Room 1902, Ruian Guangzhou Center, 374 Beijing Road, Yuexiu District\r
@@ -148364,24 +150509,12 @@ F01D2D     (base 16)                Cisco Systems, Inc
                                São José  Santa Catarina  88104800\r
                                BR\r
 \r
-F8-3B-1D   (hex)               Technicolor CH USA Inc.\r
-F83B1D     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 D4-1B-81   (hex)               CHONGQING FUGUI ELECTRONICS CO.,LTD.\r
 D41B81     (base 16)           CHONGQING FUGUI ELECTRONICS CO.,LTD.\r
                                Building D21,No.1, East Zone 1st Road,Xiyong Town,Shapingba District\r
                                Chongqing  Chongqing  401332\r
                                CN\r
 \r
-F4-0B-9F   (hex)               CIG SHANGHAI CO LTD\r
-F40B9F     (base 16)           CIG SHANGHAI CO LTD\r
-                               5th Floor, Building 8 No 2388 Chenhang Road\r
-                               SHANGHAI    201114\r
-                               CN\r
-\r
 78-45-B3   (hex)               Huawei Device Co., Ltd.\r
 7845B3     (base 16)           Huawei Device Co., Ltd.\r
                                No.2 of Xincheng Road, Songshan Lake Zone\r
@@ -148958,12 +151091,6 @@ A03D6E     (base 16)         Cisco Systems, Inc
                                Shenzhen  GuangDong  518000\r
                                CN\r
 \r
-E4-BF-FA   (hex)               Technicolor CH USA Inc.\r
-E4BFFA     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 8C-64-D4   (hex)               Hyeco Smart Tech Co.,Ltd\r
 8C64D4     (base 16)           Hyeco Smart Tech Co.,Ltd\r
                                12 Beiqian Lane,Industrial Park\r
@@ -150413,12 +152540,6 @@ B4CDF5     (base 16)         CUB ELECPARTS INC.
                                Fuhsin Township, Changhua County  Taiwan  50648\r
                                TW\r
 \r
-D8-8C-73   (hex)               zte corporation\r
-D88C73     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 38-65-B2   (hex)               Apple, Inc.\r
 3865B2     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
@@ -150719,12 +152840,6 @@ E075AA     (base 16)         Beijing Jingling Information System Technology Co., Ltd.
                                Beijing    100080\r
                                CN\r
 \r
-54-CE-82   (hex)               zte corporation\r
-54CE82     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 F4-CE-48   (hex)               Extreme Networks, Inc.\r
 F4CE48     (base 16)           Extreme Networks, Inc.\r
                                6480 Via Del Oro\r
@@ -150839,9 +152954,6 @@ C89665     (base 16)          Microsoft Corporation
                                Madison  TN  37115\r
                                US\r
 \r
-6C-91-06   (hex)               Private\r
-6C9106     (base 16)           Private\r
-\r
 40-91-51   (hex)               Espressif Inc.\r
 409151     (base 16)           Espressif Inc.\r
                                Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
@@ -151286,9 +153398,6 @@ E070EA     (base 16)          HP Inc.
                                Piscataway  NJ  08554\r
                                US\r
 \r
-D4-AD-FC   (hex)               Private\r
-D4ADFC     (base 16)           Private\r
-\r
 1C-73-E2   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 1C73E2     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
@@ -151391,9 +153500,6 @@ F8FCE1     (base 16)          Amazon Technologies Inc.
                                Xiamen City  Fujian Province  361001\r
                                CN\r
 \r
-64-44-D5   (hex)               Private\r
-6444D5     (base 16)           Private\r
-\r
 DC-62-94   (hex)               Guangzhou Lango Electronics Technology Co.,Ltd.\r
 DC6294     (base 16)           Guangzhou Lango Electronics Technology Co.,Ltd.\r
                                Room 238, Room 406, No. 1, Yichuang Street, Huangpu District\r
@@ -151466,9 +153572,6 @@ D45763     (base 16)          Apple, Inc.
                                Cupertino  CA  95014\r
                                US\r
 \r
-04-9F-15   (hex)               Private\r
-049F15     (base 16)           Private\r
-\r
 48-3E-5E   (hex)               SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
 483E5E     (base 16)           SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
                                NO.8 Tangzhuang Road,Suzhou Industrial Park,Su ZhouCity,JiangSu Province,China\r
@@ -152291,16 +154394,10 @@ D83DCC     (base 16)                shenzhen UDD Technologies,co.,Ltd
                                Round Rock  TX  78682\r
                                US\r
 \r
-B4-E2-65   (hex)               Shenzhen SDMC Technology Co.,LTD\r
-B4E265     (base 16)           Shenzhen SDMC Technology Co.,LTD\r
-                               19/F, Changhong Science & Technology Mansion, No.18, Keji South 12th Road, High-tech Industrial Park, Nanshan District\r
-                               Shenzhen  GUANGDONG  518027\r
-                               CN\r
-\r
-EC-7C-5C   (hex)               Juniper Networks\r
-EC7C5C     (base 16)           Juniper Networks\r
-                               1133 Innovation Way\r
-                               Sunnyvale  CA  94089\r
+CC-60-C8   (hex)               Microsoft Corporation\r
+CC60C8     (base 16)           Microsoft Corporation\r
+                               One Microsoft Way\r
+                               REDMOND  WA  98052\r
                                US\r
 \r
 00-EB-D8   (hex)               MERCUSYS TECHNOLOGIES CO., LTD.\r
@@ -152309,12 +154406,6 @@ EC7C5C     (base 16)         Juniper Networks
                                Shenzhen  Guangdong  518057\r
                                CN\r
 \r
-CC-60-C8   (hex)               Microsoft Corporation\r
-CC60C8     (base 16)           Microsoft Corporation\r
-                               One Microsoft Way\r
-                               REDMOND  WA  98052\r
-                               US\r
-\r
 6C-8D-77   (hex)               Cisco Systems, Inc\r
 6C8D77     (base 16)           Cisco Systems, Inc\r
                                80 West Tasman Drive\r
@@ -152333,6 +154424,12 @@ B417A8     (base 16)         Facebook Technologies, LLC
                                Menlo Park  CA  94025\r
                                US\r
 \r
+EC-7C-5C   (hex)               Juniper Networks\r
+EC7C5C     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
 10-54-D2   (hex)               IEEE Registration Authority\r
 1054D2     (base 16)           IEEE Registration Authority\r
                                445 Hoes Lane\r
@@ -152351,12 +154448,6 @@ C4DF39     (base 16)         Realme Chongqing Mobile Telecommunications Corp.,Ltd.
                                Chongqing   China  401120\r
                                CN\r
 \r
-10-63-4B   (hex)               SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
-10634B     (base 16)           SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
-                               3/F, Building R1-B, High-Tech Industrial Park, Nanshan District\r
-                               Shenzhen  Guangdong  518057\r
-                               CN\r
-\r
 80-97-33   (hex)                Shenzhen Elebao Technology Co., Ltd\r
 809733     (base 16)            Shenzhen Elebao Technology Co., Ltd\r
                                F/6, Tower A, Zhihuichuangxin Center Bldg,Qianjin Road, XixiangTown, Bao’an District\r
@@ -152393,18 +154484,6 @@ D8365F     (base 16)         Intelbras
                                Moscow\    117335\r
                                RU\r
 \r
-E8-4D-EC   (hex)               Xerox Corporation\r
-E84DEC     (base 16)           Xerox Corporation\r
-                               800 Phillips Rd\r
-                               Webster  NY  14450\r
-                               US\r
-\r
-C8-B8-2F   (hex)               eero inc.\r
-C8B82F     (base 16)           eero inc.\r
-                               660 3rd Street\r
-                               San Francisco  CA  94107\r
-                               US\r
-\r
 54-78-C9   (hex)               AMPAK Technology,Inc.\r
 5478C9     (base 16)           AMPAK Technology,Inc.\r
                                3F, No.15-1 Zhonghua Road, Hsinchu Industrail Park, Hukou,\r
@@ -152429,78 +154508,72 @@ FC101A     (base 16)                Palo Alto Networks
                                Rueil Malmaison Cedex  hauts de seine  92848\r
                                FR\r
 \r
-B8-5D-C3   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-B85DC3     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
+10-63-4B   (hex)               SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
+10634B     (base 16)           SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
+                               3/F, Building R1-B, High-Tech Industrial Park, Nanshan District\r
+                               Shenzhen  Guangdong  518057\r
                                CN\r
 \r
+E8-4D-EC   (hex)               Xerox Corporation\r
+E84DEC     (base 16)           Xerox Corporation\r
+                               800 Phillips Rd\r
+                               Webster  NY  14450\r
+                               US\r
+\r
+C8-B8-2F   (hex)               eero inc.\r
+C8B82F     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
 B4-3A-E2   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 B43AE2     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-D0-A4-6F   (hex)               China Dragon Technology Limited\r
-D0A46F     (base 16)           China Dragon Technology Limited\r
-                               B4 Bldg.Haoshan 1st Industry Park,\r
-                               Shenzhen  Guangdong  518104\r
-                               CN\r
-\r
 F0-C8-B5   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 F0C8B5     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-2C-60-CD   (hex)               NR ELECTRIC CO., LTD\r
-2C60CD     (base 16)           NR ELECTRIC CO., LTD\r
-                               69,Suyuan Avenue\r
-                               Nanjing  Jiangsu  211102\r
-                               CN\r
-\r
-8C-1E-80   (hex)               Cisco Systems, Inc\r
-8C1E80     (base 16)           Cisco Systems, Inc\r
-                               80 West Tasman Drive\r
-                               San Jose  CA  94568\r
-                               US\r
-\r
-A4-1E-E1   (hex)               Taicang T&W Electronics\r
-A41EE1     (base 16)           Taicang T&W Electronics\r
-                               89# Jiang Nan RD\r
-                               Suzhou  Jiangsu  215412\r
+B8-5D-C3   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+B85DC3     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
                                CN\r
 \r
-E8-FB-1C   (hex)               AzureWave Technology Inc.\r
-E8FB1C     (base 16)           AzureWave Technology Inc.\r
-                               8F., No. 94, Baozhong Rd.\r
-                               New Taipei City  Taiwan  231\r
-                               TW\r
-\r
 B4-A7-C6   (hex)               SERVERCOM (INDIA) PRIVATE LIMITED\r
 B4A7C6     (base 16)           SERVERCOM (INDIA) PRIVATE LIMITED\r
                                E-43/1 OKHLA INDUSTRIAL AREA PHASE-II NEW DELHI SOUTH DELHI\r
                                NEW DELHI    NA\r
                                IN\r
 \r
+D0-A4-6F   (hex)               China Dragon Technology Limited\r
+D0A46F     (base 16)           China Dragon Technology Limited\r
+                               B4 Bldg.Haoshan 1st Industry Park,\r
+                               Shenzhen  Guangdong  518104\r
+                               CN\r
+\r
 1C-76-F2   (hex)               Samsung Electronics Co.,Ltd\r
 1C76F2     (base 16)           Samsung Electronics Co.,Ltd\r
                                129, Samsung-ro, Youngtongl-Gu\r
                                Suwon  Gyeonggi-Do  16677\r
                                KR\r
 \r
-80-C3-BA   (hex)               Sennheiser Consumer Audio GmbH\r
-80C3BA     (base 16)           Sennheiser Consumer Audio GmbH\r
-                               Am Labor 1\r
-                               Wedemark  Niedersachsen  30900\r
-                               DE\r
-\r
 40-35-E6   (hex)               Samsung Electronics Co.,Ltd\r
 4035E6     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
+2C-60-CD   (hex)               NR ELECTRIC CO., LTD\r
+2C60CD     (base 16)           NR ELECTRIC CO., LTD\r
+                               69,Suyuan Avenue\r
+                               Nanjing  Jiangsu  211102\r
+                               CN\r
+\r
 28-6B-35   (hex)               Intel Corporate\r
 286B35     (base 16)           Intel Corporate\r
                                Lot 8, Jalan Hi-Tech 2/3  \r
@@ -152513,6 +154586,18 @@ B4A7C6     (base 16)         SERVERCOM (INDIA) PRIVATE LIMITED
                                Piscataway  NJ  08554\r
                                US\r
 \r
+A4-1E-E1   (hex)               Taicang T&W Electronics\r
+A41EE1     (base 16)           Taicang T&W Electronics\r
+                               89# Jiang Nan RD\r
+                               Suzhou  Jiangsu  215412\r
+                               CN\r
+\r
+E8-FB-1C   (hex)               AzureWave Technology Inc.\r
+E8FB1C     (base 16)           AzureWave Technology Inc.\r
+                               8F., No. 94, Baozhong Rd.\r
+                               New Taipei City  Taiwan  231\r
+                               TW\r
+\r
 C0-EE-40   (hex)               Laird Connectivity\r
 C0EE40     (base 16)           Laird Connectivity\r
                                50 South Main St\r
@@ -152525,72 +154610,12 @@ A47D9F     (base 16)                Shenzhen iComm Semiconductor CO.,LTD
                                Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
                                CN\r
 \r
-84-EA-97   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
-84EA97     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
-                               Room 601,Block B ,Digital Building,Garden City\r
-                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
-                               CN\r
-\r
-14-B2-E5   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
-14B2E5     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
-                               Room 601,Block B ,Digital Building,Garden City\r
-                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
-                               CN\r
-\r
-E0-CB-56   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
-E0CB56     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
-                               Room 601,Block B ,Digital Building,Garden City\r
-                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
-                               CN\r
-\r
 30-04-5C   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
 30045C     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
                                1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
                                Shenzhen  Guangdong  518000\r
                                CN\r
 \r
-90-79-CF   (hex)               zte corporation\r
-9079CF     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-88-8F-A4   (hex)               Huawei Device Co., Ltd.\r
-888FA4     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
-3C-82-C0   (hex)               Technicolor CH USA Inc.\r
-3C82C0     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
-C4-DE-E2   (hex)               Espressif Inc.\r
-C4DEE2     (base 16)           Espressif Inc.\r
-                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
-                               Shanghai  Shanghai  201203\r
-                               CN\r
-\r
-68-B6-B3   (hex)               Espressif Inc.\r
-68B6B3     (base 16)           Espressif Inc.\r
-                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
-                               Shanghai  Shanghai  201203\r
-                               CN\r
-\r
-FC-A0-5A   (hex)               Oray.com co., LTD.\r
-FCA05A     (base 16)           Oray.com co., LTD.\r
-                               8008Rm, building No.1 GuoDing d. Yangpu District\r
-                               Shanghai  Shanghai  200433\r
-                               CN\r
-\r
-90-48-6C   (hex)               Ring LLC\r
-90486C     (base 16)           Ring LLC\r
-                               1523 26th St\r
-                               Santa Monica  CA  90404\r
-                               US\r
-\r
 3C-46-45   (hex)               Shanghai Infinity Wireless Technologies Co.,Ltd.\r
 3C4645     (base 16)           Shanghai Infinity Wireless Technologies Co.,Ltd.\r
                                Room 522, Building A, No.1687 Changyang Road, Yangpu District, Shanghai\r
@@ -152615,12 +154640,30 @@ A4F933     (base 16)                Intel Corporate
                                Kulim  Kedah  09000\r
                                MY\r
 \r
+88-8F-A4   (hex)               Huawei Device Co., Ltd.\r
+888FA4     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
 50-68-AC   (hex)               Huawei Device Co., Ltd.\r
 5068AC     (base 16)           Huawei Device Co., Ltd.\r
                                No.2 of Xincheng Road, Songshan Lake Zone\r
                                Dongguan  Guangdong  523808\r
                                CN\r
 \r
+90-79-CF   (hex)               zte corporation\r
+9079CF     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+8C-1E-80   (hex)               Cisco Systems, Inc\r
+8C1E80     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
 50-39-2F   (hex)               INGRAM MICRO SERVICES\r
 50392F     (base 16)           INGRAM MICRO SERVICES\r
                                100 CHEMIN DE BAILLOT\r
@@ -152645,11 +154688,53 @@ FC8417     (base 16)                Honor Device Co., Ltd.
                                San Diego  CA  92121\r
                                US\r
 \r
-AC-B5-66   (hex)               Renesas Electronics (Penang) Sdn. Bhd.\r
-ACB566     (base 16)           Renesas Electronics (Penang) Sdn. Bhd.\r
-                               Phase 3, Bayan Lepas FIZ\r
-                               Bayan Lepas  Penang  11900\r
-                               MY\r
+C4-DE-E2   (hex)               Espressif Inc.\r
+C4DEE2     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+68-B6-B3   (hex)               Espressif Inc.\r
+68B6B3     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+FC-A0-5A   (hex)               Oray.com co., LTD.\r
+FCA05A     (base 16)           Oray.com co., LTD.\r
+                               8008Rm, building No.1 GuoDing d. Yangpu District\r
+                               Shanghai  Shanghai  200433\r
+                               CN\r
+\r
+84-EA-97   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
+84EA97     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
+                               Room 601,Block B ,Digital Building,Garden City\r
+                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
+                               CN\r
+\r
+14-B2-E5   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
+14B2E5     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
+                               Room 601,Block B ,Digital Building,Garden City\r
+                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
+                               CN\r
+\r
+E0-CB-56   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
+E0CB56     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
+                               Room 601,Block B ,Digital Building,Garden City\r
+                               Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
+                               CN\r
+\r
+90-48-6C   (hex)               Ring LLC\r
+90486C     (base 16)           Ring LLC\r
+                               1523 26th St\r
+                               Santa Monica  CA  90404\r
+                               US\r
+\r
+3C-82-C0   (hex)               Technicolor CH USA Inc.\r
+3C82C0     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville  GA  30044\r
+                               US\r
 \r
 10-24-07   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 102407     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
@@ -152669,12 +154754,6 @@ D021AC     (base 16)         Yohana
                                Palo Alto  CA  94304\r
                                US\r
 \r
-38-1F-26   (hex)               IEEE Registration Authority\r
-381F26     (base 16)           IEEE Registration Authority\r
-                               445 Hoes Lane\r
-                               Piscataway  NJ  08554\r
-                               US\r
-\r
 7C-E1-52   (hex)               THE GOODYEAR TIRE & RUBBER COMPANY\r
 7CE152     (base 16)           THE GOODYEAR TIRE & RUBBER COMPANY\r
                                200 Innovation Way\r
@@ -152693,17 +154772,17 @@ D021AC     (base 16)                Yohana
                                Mérignac    33700\r
                                FR\r
 \r
-50-E6-36   (hex)               AVM Audiovisuelles Marketing und Computersysteme GmbH\r
-50E636     (base 16)           AVM Audiovisuelles Marketing und Computersysteme GmbH\r
-                               Alt-Moabit 95\r
-                               Berlin  Berlin  10559\r
-                               DE\r
+AC-B5-66   (hex)               Renesas Electronics (Penang) Sdn. Bhd.\r
+ACB566     (base 16)           Renesas Electronics (Penang) Sdn. Bhd.\r
+                               Phase 3, Bayan Lepas FIZ\r
+                               Bayan Lepas  Penang  11900\r
+                               MY\r
 \r
-78-20-BD   (hex)               Polysense (Beijing) Technologies Co. Ltd\r
-7820BD     (base 16)           Polysense (Beijing) Technologies Co. Ltd\r
-                               9  Shangdi 3rd Street, D508B3/5(4)F Bldg D, Haidian Dist.\r
-                               Beijing    100085\r
-                               CN\r
+38-1F-26   (hex)               IEEE Registration Authority\r
+381F26     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
 \r
 EC-21-25   (hex)               Toshiba Corp.\r
 EC2125     (base 16)           Toshiba Corp.\r
@@ -152711,17 +154790,35 @@ EC2125     (base 16)                Toshiba Corp.
                                Tokyo    105-8001\r
                                JP\r
 \r
+00-E5-F1   (hex)               BUFFALO.INC\r
+00E5F1     (base 16)           BUFFALO.INC\r
+                               AKAMONDORI Bld.,30-20,Ohsu 3-chome,Naka-ku\r
+                               Nagoya  Aichi Pref.  460-8315\r
+                               JP\r
+\r
+34-EE-2A   (hex)               ConMet\r
+34EE2A     (base 16)           ConMet\r
+                               5701 SE Columbia Way\r
+                               Vancouver    WA  98661\r
+                               US\r
+\r
+50-E6-36   (hex)               AVM Audiovisuelles Marketing und Computersysteme GmbH\r
+50E636     (base 16)           AVM Audiovisuelles Marketing und Computersysteme GmbH\r
+                               Alt-Moabit 95\r
+                               Berlin  Berlin  10559\r
+                               DE\r
+\r
 68-4E-05   (hex)               HUNAN FN-LINK TECHNOLOGY LIMITED\r
 684E05     (base 16)           HUNAN FN-LINK TECHNOLOGY LIMITED\r
                                No.8, Litong Road, Liuyan Economic & Tec\r
                                Changsha  HUNAN  410329\r
                                CN\r
 \r
-04-99-BB   (hex)               Apple, Inc.\r
-0499BB     (base 16)           Apple, Inc.\r
-                               1 Infinite Loop\r
-                               Cupertino  CA  95014\r
-                               US\r
+78-20-BD   (hex)               Polysense (Beijing) Technologies Co. Ltd\r
+7820BD     (base 16)           Polysense (Beijing) Technologies Co. Ltd\r
+                               9  Shangdi 3rd Street, D508B3/5(4)F Bldg D, Haidian Dist.\r
+                               Beijing    100085\r
+                               CN\r
 \r
 F0-4D-D4   (hex)               Sagemcom Broadband SAS\r
 F04DD4     (base 16)           Sagemcom Broadband SAS\r
@@ -152729,11 +154826,17 @@ F04DD4     (base 16)                Sagemcom Broadband SAS
                                Rueil Malmaison Cedex  hauts de seine  92848\r
                                FR\r
 \r
-00-E5-F1   (hex)               BUFFALO.INC\r
-00E5F1     (base 16)           BUFFALO.INC\r
-                               AKAMONDORI Bld.,30-20,Ohsu 3-chome,Naka-ku\r
-                               Nagoya  Aichi Pref.  460-8315\r
-                               JP\r
+AC-29-29   (hex)               Infinix mobility limited\r
+AC2929     (base 16)           Infinix mobility limited\r
+                               RMS 05-15, 13A/F SOUTH TOWER WORLD FINANCE CTR HARBOUR CITY 17 CANTON RD TST KLN HONG KONG\r
+                               HongKong  HongKong  999077\r
+                               HK\r
+\r
+5C-1B-F4   (hex)               Apple, Inc.\r
+5C1BF4     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
 \r
 A8-51-AB   (hex)               Apple, Inc.\r
 A851AB     (base 16)           Apple, Inc.\r
@@ -152741,17 +154844,35 @@ A851AB     (base 16)                Apple, Inc.
                                Cupertino  CA  95014\r
                                US\r
 \r
-5C-1B-F4   (hex)               Apple, Inc.\r
-5C1BF4     (base 16)           Apple, Inc.\r
+3C-CE-0D   (hex)               Shenzhen juduoping Technology Co.,Ltd\r
+3CCE0D     (base 16)           Shenzhen juduoping Technology Co.,Ltd\r
+                               Baoan Xin'an Streat\r
+                               Shenzhen    002052\r
+                               CN\r
+\r
+04-99-BB   (hex)               Apple, Inc.\r
+0499BB     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
                                Cupertino  CA  95014\r
                                US\r
 \r
-34-EE-2A   (hex)               ConMet\r
-34EE2A     (base 16)           ConMet\r
-                               5701 SE Columbia Way\r
-                               Vancouver    WA  98661\r
-                               US\r
+60-E9-AA   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+60E9AA     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+                               B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
+                               Nanning  Guangxi  530007\r
+                               CN\r
+\r
+24-0F-5E   (hex)               Shenzhen z-router Technology Co., Ltd\r
+240F5E     (base 16)           Shenzhen z-router Technology Co., Ltd\r
+                               406,Block A,Taojindi Building ,Tenglong Road,Longhua New District,\r
+                               Shenzhen  GuangDong  518000\r
+                               CN\r
+\r
+E8-3A-4B   (hex)               China Mobile Group Device Co.,Ltd.\r
+E83A4B     (base 16)           China Mobile Group Device Co.,Ltd.\r
+                               32 Xuanwumen West Street,Xicheng District\r
+                               Beijing    100053\r
+                               CN\r
 \r
 78-66-9D   (hex)               Hui Zhou Gaoshengda Technology Co.,LTD\r
 78669D     (base 16)           Hui Zhou Gaoshengda Technology Co.,LTD\r
@@ -152765,30 +154886,30 @@ A851AB     (base 16)                Apple, Inc.
                                Delft    2628 XJ\r
                                NL\r
 \r
-90-49-92   (hex)               YSTen Technology Co.,Ltd\r
-904992     (base 16)           YSTen Technology Co.,Ltd\r
-                               Room 1715,17/F North Star Times Tower,Chaoyang District,Beijing.\r
-                               Beijing    100101\r
-                               CN\r
-\r
-AC-29-29   (hex)               Infinix mobility limited\r
-AC2929     (base 16)           Infinix mobility limited\r
-                               RMS 05-15, 13A/F SOUTH TOWER WORLD FINANCE CTR HARBOUR CITY 17 CANTON RD TST KLN HONG KONG\r
-                               HongKong  HongKong  999077\r
-                               HK\r
-\r
-3C-CE-0D   (hex)               Shenzhen juduoping Technology Co.,Ltd\r
-3CCE0D     (base 16)           Shenzhen juduoping Technology Co.,Ltd\r
-                               Baoan Xin'an Streat\r
-                               Shenzhen    002052\r
-                               CN\r
-\r
 00-0E-DD   (hex)               SHURE INCORPORATED\r
 000EDD     (base 16)           SHURE INCORPORATED\r
                                5800 W. TOUHY AVE.\r
                                NILES  IL  60714 \r
                                US\r
 \r
+6C-97-6D   (hex)               Motorola Mobility LLC, a Lenovo Company\r
+6C976D     (base 16)           Motorola Mobility LLC, a Lenovo Company\r
+                               222 West Merchandise Mart Plaza\r
+                               Chicago  IL  60654\r
+                               US\r
+\r
+64-11-A4   (hex)               Motorola Mobility LLC, a Lenovo Company\r
+6411A4     (base 16)           Motorola Mobility LLC, a Lenovo Company\r
+                               222 West Merchandise Mart Plaza\r
+                               Chicago  IL  60654\r
+                               US\r
+\r
+90-49-92   (hex)               YSTen Technology Co.,Ltd\r
+904992     (base 16)           YSTen Technology Co.,Ltd\r
+                               Room 1715,17/F North Star Times Tower,Chaoyang District,Beijing.\r
+                               Beijing    100101\r
+                               CN\r
+\r
 18-FD-74   (hex)               Routerboard.com\r
 18FD74     (base 16)           Routerboard.com\r
                                Mikrotikls SIA\r
@@ -152819,42 +154940,6 @@ E4902A     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
-E8-3A-4B   (hex)               China Mobile Group Device Co.,Ltd.\r
-E83A4B     (base 16)           China Mobile Group Device Co.,Ltd.\r
-                               32 Xuanwumen West Street,Xicheng District\r
-                               Beijing    100053\r
-                               CN\r
-\r
-60-E9-AA   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
-60E9AA     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
-                               B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
-                               Nanning  Guangxi  530007\r
-                               CN\r
-\r
-24-0F-5E   (hex)               Shenzhen z-router Technology Co., Ltd\r
-240F5E     (base 16)           Shenzhen z-router Technology Co., Ltd\r
-                               406,Block A,Taojindi Building ,Tenglong Road,Longhua New District,\r
-                               Shenzhen  GuangDong  518000\r
-                               CN\r
-\r
-6C-97-6D   (hex)               Motorola Mobility LLC, a Lenovo Company\r
-6C976D     (base 16)           Motorola Mobility LLC, a Lenovo Company\r
-                               222 West Merchandise Mart Plaza\r
-                               Chicago  IL  60654\r
-                               US\r
-\r
-64-11-A4   (hex)               Motorola Mobility LLC, a Lenovo Company\r
-6411A4     (base 16)           Motorola Mobility LLC, a Lenovo Company\r
-                               222 West Merchandise Mart Plaza\r
-                               Chicago  IL  60654\r
-                               US\r
-\r
-10-F0-68   (hex)               Ruckus Wireless\r
-10F068     (base 16)           Ruckus Wireless\r
-                               350 West Java Drive\r
-                               Sunnyvale  CA  94089\r
-                               US\r
-\r
 F0-87-7F   (hex)               Magnetar Technology Shenzhen Co., LTD.\r
 F0877F     (base 16)           Magnetar Technology Shenzhen Co., LTD.\r
                                Room211, Building1, No.26 Puzai Road, Pingdi Longgang\r
@@ -152873,10 +154958,10 @@ C8D6B7     (base 16)                Solidigm Technology
                                Longmont  CO  80501\r
                                US\r
 \r
-60-5B-30   (hex)               Dell Inc.\r
-605B30     (base 16)           Dell Inc.\r
-                               One Dell Way\r
-                               Round Rock  TX  78682\r
+10-F0-68   (hex)               Ruckus Wireless\r
+10F068     (base 16)           Ruckus Wireless\r
+                               350 West Java Drive\r
+                               Sunnyvale  CA  94089\r
                                US\r
 \r
 44-3C-9C   (hex)               Pintsch GmbH\r
@@ -152885,6 +154970,18 @@ C8D6B7     (base 16)         Solidigm Technology
                                Dinslaken    46537\r
                                DE\r
 \r
+20-64-DE   (hex)               Sunitec Enterprise Co.,Ltd\r
+2064DE     (base 16)           Sunitec Enterprise Co.,Ltd\r
+                               3F.,No.98-1,Mincyuan Rd.Sindian City\r
+                               Taipei County 231    231141\r
+                               CN\r
+\r
+A4-0F-98   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+A40F98     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
 D8-80-DC   (hex)               Huawei Device Co., Ltd.\r
 D880DC     (base 16)           Huawei Device Co., Ltd.\r
                                No.2 of Xincheng Road, Songshan Lake Zone\r
@@ -152909,18 +155006,6 @@ F46C68     (base 16)         Wistron Neweb Corporation
                                Hsin-Chu  R.O.C.  308\r
                                TW\r
 \r
-84-93-B2   (hex)               zte corporation\r
-8493B2     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-20-64-DE   (hex)               Sunitec Enterprise Co.,Ltd\r
-2064DE     (base 16)           Sunitec Enterprise Co.,Ltd\r
-                               3F.,No.98-1,Mincyuan Rd.Sindian City\r
-                               Taipei County 231    231141\r
-                               CN\r
-\r
 74-B7-25   (hex)               Huawei Device Co., Ltd.\r
 74B725     (base 16)           Huawei Device Co., Ltd.\r
                                No.2 of Xincheng Road, Songshan Lake Zone\r
@@ -152933,12 +155018,6 @@ F46C68     (base 16)         Wistron Neweb Corporation
                                Dongguan  Guangdong  523808\r
                                CN\r
 \r
-A4-0F-98   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
-A40F98     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
-                               NO.18 HAIBIN ROAD,\r
-                               DONG GUAN  GUANG DONG  523860\r
-                               CN\r
-\r
 BC-44-34   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
 BC4434     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
                                Building, No.33, Xiandong Rd, Xili\r
@@ -152951,6 +155030,12 @@ BC4434     (base 16)         Shenzhen TINNO Mobile Technology Corp.
                                Minato-ku  Tokyo  108-0075\r
                                JP\r
 \r
+60-5B-30   (hex)               Dell Inc.\r
+605B30     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
 34-AC-11   (hex)               China Mobile Group Device Co.,Ltd.\r
 34AC11     (base 16)           China Mobile Group Device Co.,Ltd.\r
                                32 Xuanwumen West Street,Xicheng District\r
@@ -153023,6 +155108,24 @@ DC71DD     (base 16)         AX Technologies
                                Singapore    556741\r
                                SG\r
 \r
+3C-69-D1   (hex)               ADC Automotive Distance Control System GmbH\r
+3C69D1     (base 16)           ADC Automotive Distance Control System GmbH\r
+                               Peter-Dornier Strasse 10\r
+                               Lindau  Bavaria  88131\r
+                               DE\r
+\r
+04-BA-D6   (hex)               D-Link Corporation\r
+04BAD6     (base 16)           D-Link Corporation\r
+                               No.289, Sinhu 3rd Rd., Neihu District, \r
+                               Taipei City     114\r
+                               TW\r
+\r
+30-3F-5D   (hex)               PT HAN SUNG ELECTORONICS INDONESIA\r
+303F5D     (base 16)           PT HAN SUNG ELECTORONICS INDONESIA\r
+                               JL.PALEM 1 BLOK DS-6\r
+                               KAWASAN INDUSTRI BATIK LIPPO CIKARANG, DESA CIBATU, KECAMATAN CIKARANG SELATAN  BEKASI JAWA BARAT  17550\r
+                               ID\r
+\r
 30-7F-10   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
 307F10     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
                                NO.18 HAIBIN ROAD,\r
@@ -153047,35 +155150,23 @@ B0FBDD     (base 16)                Shenzhen SuperElectron Technology Co.,Ltd.
                                Shenzhen  Guangdong  518000\r
                                CN\r
 \r
-3C-69-D1   (hex)               ADC Automotive Distance Control System GmbH\r
-3C69D1     (base 16)           ADC Automotive Distance Control System GmbH\r
-                               Peter-Dornier Strasse 10\r
-                               Lindau  Bavaria  88131\r
-                               DE\r
-\r
 E0-9C-8D   (hex)               Seakeeper, Inc.\r
 E09C8D     (base 16)           Seakeeper, Inc.\r
                                45310 Abell House Lane Suite 350\r
                                California  MD  20619\r
                                US\r
 \r
-04-BA-D6   (hex)               D-Link Corporation\r
-04BAD6     (base 16)           D-Link Corporation\r
-                               No.289, Sinhu 3rd Rd., Neihu District, \r
-                               Taipei City     114\r
-                               TW\r
-\r
 34-3A-20   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
 343A20     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
                                3333 Scott Blvd\r
                                Santa Clara  CA  95054\r
                                US\r
 \r
-30-3F-5D   (hex)               PT HAN SUNG ELECTORONICS INDONESIA\r
-303F5D     (base 16)           PT HAN SUNG ELECTORONICS INDONESIA\r
-                               JL.PALEM 1 BLOK DS-6\r
-                               KAWASAN INDUSTRI BATIK LIPPO CIKARANG, DESA CIBATU, KECAMATAN CIKARANG SELATAN  BEKASI JAWA BARAT  17550\r
-                               ID\r
+7C-0C-92   (hex)               Suzhou Mobydata Smart System Co.,Ltd.\r
+7C0C92     (base 16)           Suzhou Mobydata Smart System Co.,Ltd.\r
+                               3f,building E,Yida science Park,No.11 Jinpu Road,SIP,Suzhou,Jiangsu,China\r
+                               Suzhou  Jingsu  215000\r
+                               CN\r
 \r
 18-E9-1D   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 18E91D     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
@@ -153095,6 +155186,12 @@ F46ADD     (base 16)         Liteon Technology Corporation
                                New Taipei City  Taiwan  23585\r
                                TW\r
 \r
+98-D7-42   (hex)               Samsung Electronics Co.,Ltd\r
+98D742     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
 C8-2A-F1   (hex)               TCT mobile ltd\r
 C82AF1     (base 16)           TCT mobile ltd\r
                                No.86 hechang 7th road, zhongkai, Hi-Tech District\r
@@ -153113,60 +155210,12 @@ A842E3     (base 16)                Espressif Inc.
                                Shanghai  Shanghai  201203\r
                                CN\r
 \r
-7C-0C-92   (hex)               Suzhou Mobydata Smart System Co.,Ltd.\r
-7C0C92     (base 16)           Suzhou Mobydata Smart System Co.,Ltd.\r
-                               3f,building E,Yida science Park,No.11 Jinpu Road,SIP,Suzhou,Jiangsu,China\r
-                               Suzhou  Jingsu  215000\r
-                               CN\r
-\r
 04-26-05   (hex)               Bosch Building Automation GmbH\r
 042605     (base 16)           Bosch Building Automation GmbH\r
                                Kapellenweg 42\r
                                Verl    33415\r
                                DE\r
 \r
-3C-FE-AC   (hex)               Cisco Systems, Inc\r
-3CFEAC     (base 16)           Cisco Systems, Inc\r
-                               80 West Tasman Drive\r
-                               San Jose  CA  94568\r
-                               US\r
-\r
-04-A7-41   (hex)               Cisco Systems, Inc\r
-04A741     (base 16)           Cisco Systems, Inc\r
-                               80 West Tasman Drive\r
-                               San Jose  CA  94568\r
-                               US\r
-\r
-A0-88-9D   (hex)               Huawei Device Co., Ltd.\r
-A0889D     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
-98-D7-42   (hex)               Samsung Electronics Co.,Ltd\r
-98D742     (base 16)           Samsung Electronics Co.,Ltd\r
-                               #94-1, Imsoo-Dong\r
-                               Gumi  Gyeongbuk  730-350\r
-                               KR\r
-\r
-D4-9B-74   (hex)               Kinetic Technologies\r
-D49B74     (base 16)           Kinetic Technologies\r
-                               6399 San Ignacio Ave #250\r
-                               San Jose  CA  95119\r
-                               US\r
-\r
-40-F8-DF   (hex)               CANON INC.\r
-40F8DF     (base 16)           CANON INC.\r
-                               30-2 Shimomaruko 3-chome,\r
-                               Ohta-ku  Tokyo  146-8501\r
-                               JP\r
-\r
-20-47-ED   (hex)               SKY UK LIMITED\r
-2047ED     (base 16)           SKY UK LIMITED\r
-                               130 Kings Road\r
-                               Brentwood  Essex  08854\r
-                               GB\r
-\r
 A0-BD-CD   (hex)               SKY UK LIMITED\r
 A0BDCD     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
@@ -153203,6 +155252,42 @@ A0BDCD     (base 16)         SKY UK LIMITED
                                Brentwood  Essex  08854\r
                                GB\r
 \r
+3C-FE-AC   (hex)               Cisco Systems, Inc\r
+3CFEAC     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+04-A7-41   (hex)               Cisco Systems, Inc\r
+04A741     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+A0-88-9D   (hex)               Huawei Device Co., Ltd.\r
+A0889D     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+D4-9B-74   (hex)               Kinetic Technologies\r
+D49B74     (base 16)           Kinetic Technologies\r
+                               6399 San Ignacio Ave #250\r
+                               San Jose  CA  95119\r
+                               US\r
+\r
+20-47-ED   (hex)               SKY UK LIMITED\r
+2047ED     (base 16)           SKY UK LIMITED\r
+                               130 Kings Road\r
+                               Brentwood  Essex  08854\r
+                               GB\r
+\r
+40-F8-DF   (hex)               CANON INC.\r
+40F8DF     (base 16)           CANON INC.\r
+                               30-2 Shimomaruko 3-chome,\r
+                               Ohta-ku  Tokyo  146-8501\r
+                               JP\r
+\r
 F4-6B-8C   (hex)               Hon Hai Precision Industry Co., Ltd.\r
 F46B8C     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
                                GuangDongShenZhen\r
@@ -153215,6 +155300,12 @@ F46B8C     (base 16)         Hon Hai Precision Industry Co., Ltd.
                                Calamba    Lot 1\r
                                PH\r
 \r
+F4-3B-D8   (hex)               Intel Corporate\r
+F43BD8     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
 7C-67-AB   (hex)               Roku, Inc\r
 7C67AB     (base 16)           Roku, Inc\r
                                1155 Coleman Ave\r
@@ -153227,18 +155318,6 @@ F46B8C     (base 16)         Hon Hai Precision Industry Co., Ltd.
                                Piscataway  NJ  08554\r
                                US\r
 \r
-F4-3B-D8   (hex)               Intel Corporate\r
-F43BD8     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
-C8-4B-D6   (hex)               Dell Inc.\r
-C84BD6     (base 16)           Dell Inc.\r
-                               One Dell Way\r
-                               Round Rock  TX  78682\r
-                               US\r
-\r
 E0-86-14   (hex)               Novatel Wireless Solutions, Inc.\r
 E08614     (base 16)           Novatel Wireless Solutions, Inc.\r
                                9710 Scranton Rd., Suite 200\r
@@ -153251,6 +155330,18 @@ A8DE68     (base 16)         Beijing Wide Technology Co.,Ltd
                                Beijing  Beijing  100000\r
                                CN\r
 \r
+3C-4E-56   (hex)               SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD\r
+3C4E56     (base 16)           SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD\r
+                               Unit East Block22-24/F,Skyworth semiconductor design  Bldg., Gaoxin Ave.4.S.,Nanshan District,Shenzhen,China\r
+                               SHENZHEN  GUANGDONG  518057\r
+                               CN\r
+\r
+C8-4B-D6   (hex)               Dell Inc.\r
+C84BD6     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
 6C-30-2A   (hex)               Texas Instruments\r
 6C302A     (base 16)           Texas Instruments\r
                                12500 TI Blvd\r
@@ -153263,6 +155354,12 @@ A8DE68     (base 16)         Beijing Wide Technology Co.,Ltd
                                Dallas  TX  75243\r
                                US\r
 \r
+08-B6-1F   (hex)               Espressif Inc.\r
+08B61F     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
 94-4E-5B   (hex)               Ubee Interactive Co., Limited\r
 944E5B     (base 16)           Ubee Interactive Co., Limited\r
                                Flat/RM 1202, 12/F, AT Tower, 180 Electric Road\r
@@ -153281,12 +155378,6 @@ B4BA9D     (base 16)         SKY UK LIMITED
                                Singapore    048544\r
                                SG\r
 \r
-80-DA-C2   (hex)               Technicolor CH USA Inc.\r
-80DAC2     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 00-41-0E   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
 00410E     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
                                B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
@@ -153299,16 +155390,10 @@ FC6179     (base 16)                IEEE Registration Authority
                                Piscataway  NJ  08554\r
                                US\r
 \r
-3C-4E-56   (hex)               SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD\r
-3C4E56     (base 16)           SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD\r
-                               Unit East Block22-24/F,Skyworth semiconductor design  Bldg., Gaoxin Ave.4.S.,Nanshan District,Shenzhen,China\r
-                               SHENZHEN  GUANGDONG  518057\r
-                               CN\r
-\r
-08-B6-1F   (hex)               Espressif Inc.\r
-08B61F     (base 16)           Espressif Inc.\r
-                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
-                               Shanghai  Shanghai  201203\r
+4C-72-74   (hex)               Shenzhenshi Xinzhongxin Technology Co.Ltd\r
+4C7274     (base 16)           Shenzhenshi Xinzhongxin Technology Co.Ltd\r
+                               Block 3, Dong Huan Industrial Park, Sha Jing Town, Bao’an District, Shenzhen City, Guangdong Province, China\r
+                               ShenZHEN  GuangDong  518104\r
                                CN\r
 \r
 98-A2-C0   (hex)               Cisco Systems, Inc\r
@@ -153323,12 +155408,6 @@ EC74D7     (base 16)         Grandstream Networks Inc
                                boston  MA  02215\r
                                US\r
 \r
-4C-72-74   (hex)               Shenzhenshi Xinzhongxin Technology Co.Ltd\r
-4C7274     (base 16)           Shenzhenshi Xinzhongxin Technology Co.Ltd\r
-                               Block 3, Dong Huan Industrial Park, Sha Jing Town, Bao’an District, Shenzhen City, Guangdong Province, China\r
-                               ShenZHEN  GuangDong  518104\r
-                               CN\r
-\r
 30-63-71   (hex)               Shenzhenshi Xinzhongxin Technology Co.Ltd\r
 306371     (base 16)           Shenzhenshi Xinzhongxin Technology Co.Ltd\r
                                Block 3, Dong Huan Industrial Park, Sha Jing Town, Bao’an District, Shenzhen City, Guangdong Province, China\r
@@ -153341,11 +155420,23 @@ EC74D7     (base 16)                Grandstream Networks Inc
                                Changsha  HUNAN  410329\r
                                CN\r
 \r
-28-01-1C   (hex)               zte corporation\r
-28011C     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
+5C-3E-1B   (hex)               Apple, Inc.\r
+5C3E1B     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+7C-2A-CA   (hex)               Apple, Inc.\r
+7C2ACA     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+28-8E-EC   (hex)               Apple, Inc.\r
+288EEC     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
 \r
 A0-8C-F2   (hex)               YINUOLINK CO.,LTD\r
 A08CF2     (base 16)           YINUOLINK CO.,LTD\r
@@ -153371,22 +155462,22 @@ F4931C     (base 16)                Universal Electronics, Inc.
                                Santa Ana  CA  92707\r
                                US\r
 \r
-5C-3E-1B   (hex)               Apple, Inc.\r
-5C3E1B     (base 16)           Apple, Inc.\r
-                               1 Infinite Loop\r
-                               Cupertino  CA  95014\r
+C8-84-8C   (hex)               Ruckus Wireless\r
+C8848C     (base 16)           Ruckus Wireless\r
+                               350 West Java Drive\r
+                               Sunnyvale  CA  94089\r
                                US\r
 \r
-7C-2A-CA   (hex)               Apple, Inc.\r
-7C2ACA     (base 16)           Apple, Inc.\r
-                               1 Infinite Loop\r
-                               Cupertino  CA  95014\r
-                               US\r
+B0-78-39   (hex)               GD Midea Air-Conditioning Equipment Co.,Ltd.\r
+B07839     (base 16)           GD Midea Air-Conditioning Equipment Co.,Ltd.\r
+                               Midea Global Innovation Center,Beijiao Town,Shunde\r
+                               Foshan  Guangdong  528311\r
+                               CN\r
 \r
-28-8E-EC   (hex)               Apple, Inc.\r
-288EEC     (base 16)           Apple, Inc.\r
-                               1 Infinite Loop\r
-                               Cupertino  CA  95014\r
+74-9E-75   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+749E75     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
                                US\r
 \r
 E0-5A-1B   (hex)               Espressif Inc.\r
@@ -153407,6 +155498,12 @@ CCBA6F     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
+78-5C-5E   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+785C5E     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
 98-81-8A   (hex)               Huawei Device Co., Ltd.\r
 98818A     (base 16)           Huawei Device Co., Ltd.\r
                                No.2 of Xincheng Road, Songshan Lake Zone\r
@@ -153431,42 +155528,24 @@ B4C2F7     (base 16)                Huawei Device Co., Ltd.
                                Shenzhen  Guangdong  518000\r
                                CN\r
 \r
-70-11-0E   (hex)               zte corporation\r
-70110E     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-78-5C-5E   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-785C5E     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
-                               CN\r
-\r
-C8-84-8C   (hex)               Ruckus Wireless\r
-C8848C     (base 16)           Ruckus Wireless\r
-                               350 West Java Drive\r
-                               Sunnyvale  CA  94089\r
-                               US\r
-\r
-B0-78-39   (hex)               GD Midea Air-Conditioning Equipment Co.,Ltd.\r
-B07839     (base 16)           GD Midea Air-Conditioning Equipment Co.,Ltd.\r
-                               Midea Global Innovation Center,Beijiao Town,Shunde\r
-                               Foshan  Guangdong  528311\r
-                               CN\r
-\r
-74-9E-75   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
-749E75     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
-                               3333 Scott Blvd\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 F4-1C-71   (hex)               SHENZHEN SANMU COMMUNICATION TECHNOLOGY CO., LTD\r
 F41C71     (base 16)           SHENZHEN SANMU COMMUNICATION TECHNOLOGY CO., LTD\r
                                17/F,Block 1A,Software Industry Base, XueFu Road,Nanshan  District,\r
                                Shenzhen  GuangDong  518100\r
                                CN\r
 \r
+D8-F5-07   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+D8F507     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+C4-EF-DA   (hex)               Honeywell\r
+C4EFDA     (base 16)           Honeywell\r
+                               9680 Old Bailes Rd, Fort Mill, SC 29707\r
+                               Fort Mill  SC  29707\r
+                               US\r
+\r
 00-25-DF   (hex)               Taser International Inc.\r
 0025DF     (base 16)           Taser International Inc.\r
                                17800 N 85th St.\r
@@ -153485,16 +155564,16 @@ E886CF     (base 16)                Nokia
                                Gruenwald  Bavaria  82031\r
                                DE\r
 \r
-D8-F5-07   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
-D8F507     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
-                               No.5 DongXin Road\r
-                               Wuhan  Hubei  430074\r
+68-1A-A4   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+681AA4     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+                               4F,Block A, Skyworth?Building,\r
+                               Shenzhen  Guangdong  518057\r
                                CN\r
 \r
-C4-EF-DA   (hex)               Honeywell\r
-C4EFDA     (base 16)           Honeywell\r
-                               9680 Old Bailes Rd, Fort Mill, SC 29707\r
-                               Fort Mill  SC  29707\r
+D8-54-82   (hex)               Oxit, LLC\r
+D85482     (base 16)           Oxit, LLC\r
+                               3131 Westinghouse Blvd\r
+                               Charlotte  NC  28273\r
                                US\r
 \r
 08-CB-E5   (hex)               R3 Solutions GmbH\r
@@ -153503,12 +155582,900 @@ C4EFDA     (base 16)               Honeywell
                                Berlin    10719\r
                                DE\r
 \r
-D8-54-82   (hex)               Oxit, LLC\r
-D85482     (base 16)           Oxit, LLC\r
-                               3131 Westinghouse Blvd\r
-                               Charlotte  NC  28273\r
+D4-AD-20   (hex)               Jinan USR IOT Technology Limited\r
+D4AD20     (base 16)           Jinan USR IOT Technology Limited\r
+                               Floor F1 & Part of Floor F2, Building No. 9,Diya shuang chuang Industrial Zone, No.2566,Century Main Road,Gaoxin District Jinan,Shandong China\r
+                               Shandong  Jinan  250014\r
+                               CN\r
+\r
+00-20-67   (hex)               Private\r
+002067     (base 16)           Private\r
+                               445\r
+                               sfgsg  NJ  12345\r
+                               US\r
+\r
+BC-5E-33   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+BC5E33     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+F4-05-95   (hex)               Sagemcom Broadband SAS\r
+F40595     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+BC-10-7B   (hex)               Samsung Electronics Co.,Ltd\r
+BC107B     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+10-AE-60   (hex)               Amazon Technologies Inc.\r
+10AE60     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102\r
+                               Reno  NV  89507\r
+                               US\r
+\r
+1C-FC-17   (hex)               Cisco Systems, Inc\r
+1CFC17     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+50-48-77   (hex)               Honor Device Co., Ltd.\r
+504877     (base 16)           Honor Device Co., Ltd.\r
+                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
+                               Shenzhen   Guangdong  518040\r
+                               CN\r
+\r
+F8-5C-7E   (hex)               Shenzhen Honesty Electronics Co.,Ltd.\r
+F85C7E     (base 16)           Shenzhen Honesty Electronics Co.,Ltd.\r
+                               5/F,Zone B,Chitat Industrial Park,West Longping Road, Longgang District,Shenzhen City\r
+                               Shenzhen  Guangdong  518172\r
+                               CN\r
+\r
+FC-9F-FD   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+FC9FFD     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+1C-B8-BA   (hex)               XIAMEN LEELEN TECHNOLOGY CO., LTD\r
+1CB8BA     (base 16)           XIAMEN LEELEN TECHNOLOGY CO., LTD\r
+                               LEELEN building, No.780 TieShan Road, GuanKou Town , JiMei District \r
+                               Xiamen  Fujian  361021\r
+                               CN\r
+\r
+F0-CC-E0   (hex)               Shenzhen All-Smartlink Technology Co.,Ltd.\r
+F0CCE0     (base 16)           Shenzhen All-Smartlink Technology Co.,Ltd.\r
+                               502, Building B, Guangming Industry Park, Minzhi, Shenzhen, Guangdong, China\r
+                               Shenzhen  Guangdong  518100\r
+                               CN\r
+\r
+44-E2-F1   (hex)               NewRadio Technologies Co. , Ltd.\r
+44E2F1     (base 16)           NewRadio Technologies Co. , Ltd.\r
+                               1408, Building 4, Tianan Yungu, Bantian\r
+                               Shenzhen  Guangdong  518129\r
+                               CN\r
+\r
+78-C1-AE   (hex)               Hangzhou Ezviz Software Co.,Ltd.\r
+78C1AE     (base 16)           Hangzhou Ezviz Software Co.,Ltd.\r
+                               Room 302, Unit B, Building 2, 399 Danfeng Road,Binjiang District\r
+                               Hangzhou  Zhejiang  310051\r
+                               CN\r
+\r
+30-C6-D7   (hex)               New H3C Technologies Co., Ltd\r
+30C6D7     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+F8-24-E4   (hex)               Beyonics Technology Electronic (Changshu) Co., Ltd\r
+F824E4     (base 16)           Beyonics Technology Electronic (Changshu) Co., Ltd\r
+                               18 Yinhuan Road, Changshu New & Hi-tech Industrial Development Zone of Jiangsu\r
+                               Changshu  Jiangsu  215500\r
+                               CN\r
+\r
+10-09-0C   (hex)               JANOME Corporation\r
+10090C     (base 16)           JANOME Corporation\r
+                               1463 Hazama-Machi\r
+                               Hachioji-Shi  Tokyo  193-0941\r
+                               JP\r
+\r
+1C-6A-76   (hex)               Apple, Inc.\r
+1C6A76     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+6C-7E-67   (hex)               Apple, Inc.\r
+6C7E67     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+A4-C6-F0   (hex)               Apple, Inc.\r
+A4C6F0     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+A8-8F-D9   (hex)               Apple, Inc.\r
+A88FD9     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+08-95-42   (hex)               Apple, Inc.\r
+089542     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+D4-F2-42   (hex)               Huawei Device Co., Ltd.\r
+D4F242     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+C0-2E-26   (hex)               iRhythm Technologies, Inc.\r
+C02E26     (base 16)           iRhythm Technologies, Inc.\r
+                               11085 Knott Avenue\r
+                               Cypress  CA  90630\r
+                               US\r
+\r
+74-D7-13   (hex)               Huaqin Technology Co.,Ltd\r
+74D713     (base 16)           Huaqin Technology Co.,Ltd\r
+                               Building 11, No. 399, Keyuan Road, Pudong New Area\r
+                               Shanghai    201203\r
+                               CN\r
+\r
+64-E2-20   (hex)               Qisda Corporation\r
+64E220     (base 16)           Qisda Corporation\r
+                               No. 157, Shanying Rd., Gueishan Dist., Taoyuan City 33341, Taiwan\r
+                               Taoyuan    33341\r
+                               TW\r
+\r
+E4-9C-67   (hex)               Apple, Inc.\r
+E49C67     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+EC-DF-C9   (hex)               Hangzhou Microimage Software Co., Ltd\r
+ECDFC9     (base 16)           Hangzhou Microimage Software Co., Ltd\r
+                               Room 313, Unit B, Building 2, 399 Danfeng Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310051\r
+                               CN\r
+\r
+BC-E0-01   (hex)               SHENZHEN NETIS TECHNOLOGY CO.,LTD\r
+BCE001     (base 16)           SHENZHEN NETIS TECHNOLOGY CO.,LTD\r
+                               8 Floor, Bd B, information port, Langshan RD, Nanshan district, \r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+FC-22-D3   (hex)               FDSYS\r
+FC22D3     (base 16)           FDSYS\r
+                               12, Seonyu-ro 43na-gil, Yeongdeungpo-gu\r
+                               Seoul    07210\r
+                               KR\r
+\r
+4C-5C-DF   (hex)               ITEL MOBILE LIMITED\r
+4C5CDF     (base 16)           ITEL MOBILE LIMITED\r
+                               RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K\r
+                               Hong Kong  KOWLOON  999077\r
+                               HK\r
+\r
+3C-E4-41   (hex)               Amazon Technologies Inc.\r
+3CE441     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+44-42-01   (hex)               Amazon Technologies Inc.\r
+444201     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+40-C1-F6   (hex)               Shenzhen Jingxun Technology Co., Ltd.\r
+40C1F6     (base 16)           Shenzhen Jingxun Technology Co., Ltd.\r
+                               3/F, A5 Building, Zhiyuan Community, No. 1001, Xueyuan Road, Nanshan District\r
+                               Shenzhen    518071\r
+                               CN\r
+\r
+E4-6D-7F   (hex)               Ciena Corporation\r
+E46D7F     (base 16)           Ciena Corporation\r
+                               7035 Ridge Road\r
+                               Hanover  MD  21076\r
+                               US\r
+\r
+84-8D-CE   (hex)               Ciena Corporation\r
+848DCE     (base 16)           Ciena Corporation\r
+                               7035 Ridge Road\r
+                               Hanover  MD  21076\r
+                               US\r
+\r
+9C-C8-93   (hex)               Juniper Networks\r
+9CC893     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+A0-95-7F   (hex)               SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
+A0957F     (base 16)           SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
+                               NO.8 Tangzhuang Road,Suzhou Industrial Park,Su ZhouCity,JiangSu Province,China\r
+                               Suzhou    215021\r
+                               CN\r
+\r
+64-13-5A   (hex)               Itectra A/S\r
+64135A     (base 16)           Itectra A/S\r
+                               Sofiendalsvej 85\r
+                               Aalborg SV    9200\r
+                               DK\r
+\r
+F8-3B-1D   (hex)               Technicolor CH USA Inc.\r
+F83B1D     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+E4-BF-FA   (hex)               Technicolor CH USA Inc.\r
+E4BFFA     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+CC-77-C9   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+CC77C9     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+5C-27-63   (hex)               Itibia Technologies\r
+5C2763     (base 16)           Itibia Technologies\r
+                               1630, 3F, Phase I, International Science Park, No.1355 Jinjihu Avenue,\r
+                               Suzhou  Jiangsu  215021\r
+                               CN\r
+\r
+80-27-6C   (hex)               Cisco Systems, Inc\r
+80276C     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+6C-4E-F6   (hex)               Cisco Systems, Inc\r
+6C4EF6     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+2C-57-2C   (hex)               Allwinner Technology Co., Ltd\r
+2C572C     (base 16)           Allwinner Technology Co., Ltd\r
+                               No.9 Technology Road 2, High-Tech Zone\r
+                               Zhuhai  Guangdong  519085\r
+                               CN\r
+\r
+54-E1-B6   (hex)               Renesas Electronics (Penang) Sdn. Bhd.\r
+54E1B6     (base 16)           Renesas Electronics (Penang) Sdn. Bhd.\r
+                               Phase 3, Bayan Lepas FIZ\r
+                               Bayan Lepas  Penang  11900\r
+                               MY\r
+\r
+F4-C1-14   (hex)               Technicolor CH USA Inc.\r
+F4C114     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+BC-52-74   (hex)               Samsung Electronics Co.,Ltd\r
+BC5274     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+80-DA-C2   (hex)               Technicolor CH USA Inc.\r
+80DAC2     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+3C-06-64   (hex)               Beijing Leagrid Technology Co.,Ltd.\r
+3C0664     (base 16)           Beijing Leagrid Technology Co.,Ltd.\r
+                               No. 86-N2216, Wanxing Road, Changyang, Fangshan District, Beijing\r
+                               Beijing  Beijing  102488\r
+                               CN\r
+\r
+98-CC-E4   (hex)               Shenzhen Mindray Animal Medical Technology Co.,LTD\r
+98CCE4     (base 16)           Shenzhen Mindray Animal Medical Technology Co.,LTD\r
+                               Tower 4, YESUN Intelligent Community 3 ,No.1301-88\r
+                               Shenzhen  Guanguang Road,Guanlan Street,Longhua District  518110\r
+                               CN\r
+\r
+90-09-DF   (hex)               Intel Corporate\r
+9009DF     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+E4-0D-36   (hex)               Intel Corporate\r
+E40D36     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+C8-EF-BC   (hex)               Inspur Communication Technology Co.,Ltd.\r
+C8EFBC     (base 16)           Inspur Communication Technology Co.,Ltd.\r
+                               1306 Inspur street\r
+                               JiNan  ShanDong  250014\r
+                               CN\r
+\r
+50-07-C3   (hex)               Amazon Technologies Inc.\r
+5007C3     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+14-9F-43   (hex)               Cisco Meraki\r
+149F43     (base 16)           Cisco Meraki\r
+                               500 Terry A. Francois Blvd\r
+                               San Francisco    94158\r
+                               US\r
+\r
+8C-84-42   (hex)               Cisco Systems, Inc\r
+8C8442     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+84-F1-17   (hex)               Newseason\r
+84F117     (base 16)           Newseason\r
+                               No. 1 Letang road, Tangxiayong gongyequ, Songgang street, Bao An district, \r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+94-78-06   (hex)               NINGBO SUNVOT TECHNOLOGY CO.,LTD\r
+947806     (base 16)           NINGBO SUNVOT TECHNOLOGY CO.,LTD\r
+                               ROOM 305,NO.1,BUILDING 4,NO.79,XIAOGANG WEISAN ROAD,XIAOGANG STREET,BEILUN DISTRICT\r
+                               NingBo  Zhejiang  315800\r
+                               CN\r
+\r
+CC-CC-77   (hex)               Zaram Technology. Inc.\r
+CCCC77     (base 16)           Zaram Technology. Inc.\r
+                               2nd Fl, Fine Venture Building, 41, Seongnam-daero 925beon-gil, Bundang-gu, Seongnam-si, Gyeonggi-do, Republic of Korea [13496]\r
+                               Bundang-gu    13496\r
+                               KR\r
+\r
+BC-45-8C   (hex)               Shenzhen Topwise Communication Co.,Ltd\r
+BC458C     (base 16)           Shenzhen Topwise Communication Co.,Ltd\r
+                               5/F,Shengtang Building East Block,Tairan Road 9,Futian District,Shenzhen\r
+                               Shenzhen    518042\r
+                               CN\r
+\r
+2C-08-B4   (hex)               Huawei Device Co., Ltd.\r
+2C08B4     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+78-4F-24   (hex)               Taicang T&W Electronics\r
+784F24     (base 16)           Taicang T&W Electronics\r
+                               89# Jiang Nan RD\r
+                               Suzhou  Jiangsu  215412\r
+                               CN\r
+\r
+68-13-E2   (hex)               Eltex Enterprise LTD\r
+6813E2     (base 16)           Eltex Enterprise LTD\r
+                               Timiryazeva street, 17\r
+                               Almaty    050040\r
+                               KZ\r
+\r
+80-C3-BA   (hex)               Sonova Consumer Hearing GmbH\r
+80C3BA     (base 16)           Sonova Consumer Hearing GmbH\r
+                               Am Labor 1\r
+                               Wedemark  Niedersachsen  30900\r
+                               DE\r
+\r
+9C-54-67   (hex)               Nokia\r
+9C5467     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+58-E4-34   (hex)               Juniper Networks\r
+58E434     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+E8-A0-ED   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+E8A0ED     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+B4-E4-6B   (hex)               China Mobile IOT Company Limited\r
+B4E46B     (base 16)           China Mobile IOT Company Limited\r
+                               NO.8 Yu Ma Road, NanAn Area\r
+                               Chongqing  Chongqing  401336\r
+                               CN\r
+\r
+B4-61-42   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+B46142     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+7C-66-9A   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+7C669A     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+CC-1E-97   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+CC1E97     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+B4-04-21   (hex)               zte corporation\r
+B40421     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+E8-43-68   (hex)               zte corporation\r
+E84368     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+48-1B-40   (hex)               Technicolor CH USA Inc.\r
+481B40     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+BC-02-6E   (hex)               Silicon Laboratories\r
+BC026E     (base 16)           Silicon Laboratories\r
+                               7000 W. William Cannon Dr.\r
+                               Austin  TX  78735\r
+                               US\r
+\r
+B4-35-22   (hex)               Silicon Laboratories\r
+B43522     (base 16)           Silicon Laboratories\r
+                               7000 W. William Cannon Dr.\r
+                               Austin  TX  78735\r
+                               US\r
+\r
+F4-0B-9F   (hex)               CIG SHANGHAI CO LTD\r
+F40B9F     (base 16)           CIG SHANGHAI CO LTD\r
+                               5th Floor, Building 8 No 2388 Chenhang Road \r
+                               SHANGHAI    201114\r
+                               CN\r
+\r
+60-57-47   (hex)               CIG SHANGHAI CO LTD\r
+605747     (base 16)           CIG SHANGHAI CO LTD\r
+                               5th Floor, Building 8 No 2388 Chenhang Road\r
+                               SHANGHAI    201114\r
+                               CN\r
+\r
+BC-B9-23   (hex)               Alta Networks\r
+BCB923     (base 16)           Alta Networks\r
+                               192 N. Old Highway 91\r
+                               Hurricane  UT  84737\r
+                               US\r
+\r
+94-F3-92   (hex)               Fortinet, Inc.\r
+94F392     (base 16)           Fortinet, Inc.\r
+                               899 Kifer Road\r
+                               Sunnyvale    94086\r
+                               US\r
+\r
+D4-AD-FC   (hex)               Shenzhen Intellirocks Tech co.,ltd\r
+D4ADFC     (base 16)           Shenzhen Intellirocks Tech co.,ltd\r
+                               No. 2901, 2902, 2903, 2904, 3002, Block C, Section 1, Chuangzhi Yuncheng Building, Liuxian Avenue\r
+                               Shenzhen  Xili Community, Xili Street, Nanshan District, Guangdong  518000\r
+                               CN\r
+\r
+84-93-B2   (hex)               zte corporation\r
+8493B2     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+28-01-1C   (hex)               zte corporation\r
+28011C     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+70-11-0E   (hex)               zte corporation\r
+70110E     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+F8-AA-B3   (hex)               DESSMANN (China) Machinery & Electronic  Co., Ltd\r
+F8AAB3     (base 16)           DESSMANN (China) Machinery & Electronic  Co., Ltd\r
+                               1-3 Bld 1,NO.7 South Jianghui Rd,Binjiang District\r
+                               Hangzhou  Zhejiang  310051\r
+                               CN\r
+\r
+E4-66-AB   (hex)               zte corporation\r
+E466AB     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+64-DB-38   (hex)               zte corporation\r
+64DB38     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+D8-8C-73   (hex)               zte corporation\r
+D88C73     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+54-CE-82   (hex)               zte corporation\r
+54CE82     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+EC-DA-3B   (hex)               Espressif Inc.\r
+ECDA3B     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+64-44-D5   (hex)               TD Tech\r
+6444D5     (base 16)           TD Tech\r
+                               15F, building D, Yeqing building, No. 9, Wangjing North Road, Chaoyang District, Beijing\r
+                               BeiJing    100102\r
+                               CN\r
+\r
+C8-7F-54   (hex)               ASUSTek COMPUTER INC.\r
+C87F54     (base 16)           ASUSTek COMPUTER INC.\r
+                               No.15,Lide Rd., Beitou, Dist.,Taipei 112,Taiwan\r
+                               Taipei  Taiwan  112\r
+                               TW\r
+\r
+6C-70-CB   (hex)               Samsung Electronics Co.,Ltd\r
+6C70CB     (base 16)           Samsung Electronics Co.,Ltd\r
+                               129, Samsung-ro, Youngtongl-Gu\r
+                               Suwon  Gyeonggi-Do  16677\r
+                               KR\r
+\r
+E8-8F-6F   (hex)               TCT mobile ltd\r
+E88F6F     (base 16)           TCT mobile ltd\r
+                               No.86 hechang 7th road, zhongkai, Hi-Tech District\r
+                               Hui Zhou  Guang Dong  516006\r
+                               CN\r
+\r
+84-FC-E6   (hex)               Espressif Inc.\r
+84FCE6     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+B8-5E-71   (hex)               Technicolor CH USA Inc.\r
+B85E71     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+90-7B-C6   (hex)               Texas Instruments\r
+907BC6     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+D4-DA-21   (hex)               Beijing Xiaomi Mobile Software Co., Ltd\r
+D4DA21     (base 16)           Beijing Xiaomi Mobile Software Co., Ltd\r
+                               The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
+C4-79-05   (hex)               Zhejiang Uniview Technologies Co.,Ltd.\r
+C47905     (base 16)           Zhejiang Uniview Technologies Co.,Ltd.\r
+                               No.88,Jiangling Road\r
+                               Hangzhou  Zhejiang,P.R.China  310051\r
+                               CN\r
+\r
+44-B7-D0   (hex)               Microchip Technology Inc.\r
+44B7D0     (base 16)           Microchip Technology Inc.\r
+                               2355 W Chandler Blvd\r
+                               Chandler  AZ  85224-6199\r
+                               US\r
+\r
+90-48-46   (hex)               Texas Instruments\r
+904846     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+6C-91-06   (hex)               Katena Computing Technologies\r
+6C9106     (base 16)           Katena Computing Technologies\r
+                               7244 Carrizo Drive\r
+                               La Jolla  CA  92037\r
+                               US\r
+\r
+50-27-A9   (hex)               eero inc.\r
+5027A9     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+D0-4E-99   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+D04E99     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+20-A7-66   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+20A766     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+3C-05-8E   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+3C058E     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+20-1A-94   (hex)               Apple, Inc.\r
+201A94     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+B0-E5-EF   (hex)               Apple, Inc.\r
+B0E5EF     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+28-8F-F6   (hex)               Apple, Inc.\r
+288FF6     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+58-B9-65   (hex)               Apple, Inc.\r
+58B965     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+74-31-74   (hex)               Apple, Inc.\r
+743174     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+F0-C7-25   (hex)               Apple, Inc.\r
+F0C725     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+A4-11-BB   (hex)               Cisco Systems, Inc\r
+A411BB     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+50-49-21   (hex)               Cisco Systems, Inc\r
+504921     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
                                US\r
 \r
+10-BB-F3   (hex)               HUNAN FN-LINK TECHNOLOGY LIMITED\r
+10BBF3     (base 16)           HUNAN FN-LINK TECHNOLOGY LIMITED\r
+                               No.8, Litong Road, Liuyan Economic & Tec\r
+                               Changsha  HUNAN  410329\r
+                               CN\r
+\r
+90-39-5E   (hex)               Silicon Laboratories\r
+90395E     (base 16)           Silicon Laboratories\r
+                               7000 W. William Cannon Dr.\r
+                               Austin  TX  78735\r
+                               US\r
+\r
+C8-F2-B4   (hex)               Guizhou Huaxin Information Technology Co., Ltd.\r
+C8F2B4     (base 16)           Guizhou Huaxin Information Technology Co., Ltd.\r
+                               Building 1#, Electronic Information Industry Park of Machang Town, Guian New Area, Guizhou Province.\r
+                               Gui'an New Area  Guizhou Province  550025\r
+                               CN\r
+\r
+E0-A1-CE   (hex)               zte corporation\r
+E0A1CE     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+24-A6-FA   (hex)               WEIFANG GOERTEK ELECTRONICS CO.,LTD\r
+24A6FA     (base 16)           WEIFANG GOERTEK ELECTRONICS CO.,LTD\r
+                               Gaoxin 2 Road, Free Trade Zone,Weifang,Shandong,261205,P.R.China\r
+                               Weifang  Shandong  261205\r
+                               CN\r
+\r
+0C-64-22   (hex)               Beijing Wiseasy Technology Co.,Ltd.\r
+0C6422     (base 16)           Beijing Wiseasy Technology Co.,Ltd.\r
+                               Room 01 , 27th Floor, No. 1 Building , No. 36 Xiaoyun Road, Chaoyang District\r
+                               Beijing    100027\r
+                               CN\r
+\r
+2C-75-CB   (hex)               Novitec Co., Ltd.\r
+2C75CB     (base 16)           Novitec Co., Ltd.\r
+                               30-18, Baekjegobun-ro 39-gil, Songpa-gu\r
+                               Seoul    05609\r
+                               KR\r
+\r
+04-9F-15   (hex)               Humane\r
+049F15     (base 16)           Humane\r
+                               969 Folsom St\r
+                               San Francisco  CA  94062\r
+                               US\r
+\r
+38-38-A6   (hex)               Arista Networks\r
+3838A6     (base 16)           Arista Networks\r
+                               5453 Great America Parkway\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+50-23-6D   (hex)               Nintendo Co.,Ltd\r
+50236D     (base 16)           Nintendo Co.,Ltd\r
+                               11-1 HOKOTATE-CHO KAMITOBA,MINAMI-KU\r
+                               KYOTO  KYOTO  601-8501\r
+                               JP\r
+\r
+A0-39-75   (hex)               Leo Bodnar Electronics Ltd\r
+A03975     (base 16)           Leo Bodnar Electronics Ltd\r
+                               Unit 8 New Rookery Farm\r
+                               Silverstone    NN12 8UP\r
+                               GB\r
+\r
+E8-65-5F   (hex)               Dell Inc.\r
+E8655F     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
+EC-83-B7   (hex)               PUWELL CLOUD TECH LIMITED\r
+EC83B7     (base 16)           PUWELL CLOUD TECH LIMITED\r
+                               Room 1702, 17/F, Hong Kong Trade Centre, Nos. 161-167 Des Voeux Road Central, Hong Kong\r
+                               Hong Kong    999077\r
+                               HK\r
+\r
+74-93-DA   (hex)               ASKEY COMPUTER CORP\r
+7493DA     (base 16)           ASKEY COMPUTER CORP\r
+                               10F,No.119,JIANKANG RD,ZHONGHE DIST\r
+                               NEW TAIPEI  TAIWAN  23585\r
+                               TW\r
+\r
+C8-4A-A0   (hex)               Sony Interactive Entertainment Inc.\r
+C84AA0     (base 16)           Sony Interactive Entertainment Inc.\r
+                               1-7-1 Konan\r
+                               Minato-ku  Tokyo  108-0075\r
+                               JP\r
+\r
+4C-96-8A   (hex)               Wacom Co.,Ltd.\r
+4C968A     (base 16)           Wacom Co.,Ltd.\r
+                               Sumitomo Fudosan Shinjuku Grand Tower 31F,8-17-1\r
+                               Nishi-shinjuku,Shinjuku-ku  Tokyo  160-6131\r
+                               JP\r
+\r
+E8-26-8D   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
+E8268D     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
+                               1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+D8-31-2C   (hex)               zte corporation\r
+D8312C     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+9C-55-8F   (hex)               Lockin Technology(Beijing) Co.,Ltd.\r
+9C558F     (base 16)           Lockin Technology(Beijing) Co.,Ltd.\r
+                               12 / F, building B1, No. 1 Zhongguancun, Beiqing Road\r
+                               Beijing  Haidian District  100011\r
+                               CN\r
+\r
+48-55-5E   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+48555E     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+                               4F,Block A, Skyworth?Building,\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+B0-EB-7F   (hex)               Juniper Networks\r
+B0EB7F     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+68-FC-B6   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+68FCB6     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+94-7B-AE   (hex)               Xiaomi Communications Co Ltd\r
+947BAE     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+00-C2-8F   (hex)               Allied Telesis K.K.\r
+00C28F     (base 16)           Allied Telesis K.K.\r
+                               2nd. TOC Bldg. 7-21-11 Nishi-Gotanda, Shinagawa-ku, Tokyo\r
+                               Tokyo    141-0031\r
+                               JP\r
+\r
+D8-AD-49   (hex)               Honor Device Co., Ltd.\r
+D8AD49     (base 16)           Honor Device Co., Ltd.\r
+                               Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District \r
+                               Shenzhen   Guangdong  518040\r
+                               CN\r
+\r
+38-F8-F6   (hex)               Adtran Inc\r
+38F8F6     (base 16)           Adtran Inc\r
+                               901 Explorer Blvd.\r
+                               Huntsville  AL  35806-2807\r
+                               US\r
+\r
+B4-E2-65   (hex)               Shenzhen SDMC Technology CO.,Ltd.\r
+B4E265     (base 16)           Shenzhen SDMC Technology CO.,Ltd.\r
+                               19/F, Changhong Science & Technology Mansion, No.18, Keji South 12th Road, High-tech Industrial Park, Nanshan District\r
+                               Shenzhen  GUANGDONG  518027\r
+                               CN\r
+\r
+38-47-F2   (hex)               Recogni Inc\r
+3847F2     (base 16)           Recogni Inc\r
+                               2590 N 1ST STSuite 320\r
+                               San Jose  CA  95131\r
+                               US\r
+\r
+E0-38-2D   (hex)               IEEE Registration Authority\r
+E0382D     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+DC-D2-FD   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+DCD2FD     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+58-73-D1   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+5873D1     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+4C-B0-87   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+4CB087     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+88-B4-BE   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+88B4BE     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
 7C-8A-E1   (hex)               COMPAL INFORMATION (KUNSHAN) CO., LTD. \r
 7C8AE1     (base 16)           COMPAL INFORMATION (KUNSHAN) CO., LTD. \r
                                NO. 25, THE 3RD Street KUNSHAN EXPORT PROCESSING ZONE \r
@@ -154745,9 +157712,6 @@ D47B35     (base 16)          NEO Monitors AS
                                Santa Clara  CA  95054\r
                                US\r
 \r
-14-07-08   (hex)               Private\r
-140708     (base 16)           Private\r
-\r
 78-A7-EB   (hex)               1MORE\r
 78A7EB     (base 16)           1MORE\r
                                TianliaoBuilding F14\r
@@ -155837,12 +158801,6 @@ DC9088     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
                                Guangzhou  Guangdong  511400\r
                                CN\r
 \r
-80-A7-96   (hex)               Neurotek LLC\r
-80A796     (base 16)           Neurotek LLC\r
-                               3180 18th St, Ste 200\r
-                               San Francisco  CA  94110\r
-                               US\r
-\r
 CC-21-19   (hex)               Samsung Electronics Co.,Ltd\r
 CC2119     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
@@ -162569,12 +165527,6 @@ A47AA4     (base 16)         ARRIS Group, Inc.
                                Hsinchu    300\r
                                TW\r
 \r
-00-09-41   (hex)               Allied Telesis R&D Center K.K.\r
-000941     (base 16)           Allied Telesis R&D Center K.K.\r
-                               Technical Center/No.2 TOC Bldg.\r
-                               Shinagawa-ku    141-0031\r
-                               US\r
-\r
 28-E3-47   (hex)               Liteon Technology Corporation\r
 28E347     (base 16)           Liteon Technology Corporation\r
                                4F,90,Chien 1 Road,ChungHo,Taipei Hsien,Taiwan,\r
@@ -166499,12 +169451,6 @@ C03D46     (base 16)         Shanghai Sango Network Technology Co.,Ltd
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
-FC-D5-D9   (hex)               Shenzhen SDMC Technology Co., Ltd.\r
-FCD5D9     (base 16)           Shenzhen SDMC Technology Co., Ltd.\r
-                               7/F,Block A,Huahan Bldg.,\r
-                               Shenzhen  GuangDong  518000\r
-                               CN\r
-\r
 74-DA-38   (hex)               Edimax Technology Co. Ltd.\r
 74DA38     (base 16)           Edimax Technology Co. Ltd.\r
                                No. 278, Xinhu 1st Road\r
@@ -170879,12 +173825,6 @@ EC2368     (base 16)         IntelliVoice Co.,Ltd.
                                Kawasaki  Kanagawa  211-8668\r
                                JP\r
 \r
-38-95-92   (hex)               Beijing Tendyron Corporation\r
-389592     (base 16)           Beijing Tendyron Corporation\r
-                               1810,Tower B,Jin-ma,Building,17 East Qing Hua Road \r
-                               Beijing    100083\r
-                               CN\r
-\r
 A4-21-8A   (hex)               Nortel Networks\r
 A4218A     (base 16)           Nortel Networks\r
                                CARRETERA BASE AEREA # 5850\r
@@ -171449,12 +174389,6 @@ E0E751     (base 16)         Nintendo Co., Ltd.
                                BURNLEY  LANCASHIRE  BB11 5UB\r
                                GB\r
 \r
-9C-B2-06   (hex)               PROCENTEC\r
-9CB206     (base 16)           PROCENTEC\r
-                               Klopperman 16\r
-                               Wateringen  Zuid Holland  2292JD\r
-                               NL\r
-\r
 88-ED-1C   (hex)               Cudo Communication Co., Ltd.\r
 88ED1C     (base 16)           Cudo Communication Co., Ltd.\r
                                10F ArirangTV 1467-80, Seocho-3dong, Seocho-gu\r
@@ -186698,12 +189632,6 @@ CCB182     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
                                Bangpakong  Chachoengsao  24180\r
                                TH\r
 \r
-5C-7D-7D   (hex)               Technicolor CH USA Inc.\r
-5C7D7D     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 F4-BF-A8   (hex)               Juniper Networks\r
 F4BFA8     (base 16)           Juniper Networks\r
                                1133 Innovation Way\r
@@ -187742,12 +190670,6 @@ F01628     (base 16)         Technicolor (China) Technology Co., Ltd.
                                Dover  DE  19904\r
                                US\r
 \r
-08-A7-C0   (hex)               Technicolor CH USA Inc.\r
-08A7C0     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 28-5B-0C   (hex)               Sichuan Jiuzhou Electronic Technology Co., Ltd.\r
 285B0C     (base 16)           Sichuan Jiuzhou Electronic Technology Co., Ltd.\r
                                No. 259, Jiuzhou Road\r
@@ -187940,12 +190862,6 @@ EC63D7     (base 16)         Intel Corporate
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-7C-9F-07   (hex)               CIG SHANGHAI CO LTD\r
-7C9F07     (base 16)           CIG SHANGHAI CO LTD\r
-                               5th Floor, Building 8 No 2388 Chenhang Road\r
-                               SHANGHAI    201114\r
-                               CN\r
-\r
 1C-87-E3   (hex)               TECNO MOBILE LIMITED\r
 1C87E3     (base 16)           TECNO MOBILE LIMITED\r
                                ROOMS 05-15, 13A/F., SOUTH TOWER, WORLD FINANCE CENTRE, HARBOUR CITY, 17 CANTON ROAD, TSIM SHA TSUI, KOWLOON, HONG KONG\r
@@ -188402,12 +191318,6 @@ C01B23     (base 16)         Sichuan Tianyi Comheart Telecom Co.,LTD
                                PARIS    75015\r
                                FR\r
 \r
-8C-6A-8D   (hex)               Technicolor CH USA Inc.\r
-8C6A8D     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 68-DD-D9   (hex)               HMD Global Oy\r
 68DDD9     (base 16)           HMD Global Oy\r
                                Bertel Jungin aukio 9\r
@@ -188570,12 +191480,6 @@ CCB5D1     (base 16)         Beijing Xiaomi Mobile Software Co., Ltd
                                Shenzhen  Guangdong  518055\r
                                CN\r
 \r
-24-E1-24   (hex)               Xiamen Milesight IoT Co., Ltd.\r
-24E124     (base 16)           Xiamen Milesight IoT Co., Ltd.\r
-                               4/F, No. 63-2 Wanghai Road, 2nd Software Park\r
-                               Xiamen  Fujian  361008\r
-                               CN\r
-\r
 F4-C0-2F   (hex)               BlueBite\r
 F4C02F     (base 16)           BlueBite\r
                                230, Simin-daero\r
@@ -189281,18 +192185,6 @@ A4E11A     (base 16)         Juniper Networks
                                Sunnyvale  CA  94089\r
                                US\r
 \r
-E8-6E-44   (hex)               zte corporation\r
-E86E44     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-00-E7-E3   (hex)               zte corporation\r
-00E7E3     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 9C-54-C2   (hex)               New H3C Technologies Co., Ltd\r
 9C54C2     (base 16)           New H3C Technologies Co., Ltd\r
                                466 Changhe Road, Binjiang District\r
@@ -189359,12 +192251,6 @@ C81CFE     (base 16)         Zebra Technologies Inc.
                                HOLTSVILLE  NY  11742\r
                                US\r
 \r
-1C-9E-CC   (hex)               Technicolor CH USA Inc.\r
-1C9ECC     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
-                               US\r
-\r
 1C-ED-6F   (hex)               AVM Audiovisuelles Marketing und Computersysteme GmbH\r
 1CED6F     (base 16)           AVM Audiovisuelles Marketing und Computersysteme GmbH\r
                                Alt-Moabit 95\r
@@ -189761,18 +192647,6 @@ DC0E96     (base 16)         Palo Alto Networks
                                Santa Clara  CA  95054\r
                                US\r
 \r
-04-20-84   (hex)               zte corporation\r
-042084     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
-B4-5F-84   (hex)               zte corporation\r
-B45F84     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 9C-C2-C4   (hex)               Inspur Electronic Information Industry Co.,Ltd.\r
 9CC2C4     (base 16)           Inspur Electronic Information Industry Co.,Ltd.\r
                                No 224 Shanda Road\r
@@ -190127,12 +193001,6 @@ A01C87     (base 16)         UNIONMAN TECHNOLOGY CO.,LTD
                                Hangzhou  Zhejiang  310052\r
                                CN\r
 \r
-B0-8B-92   (hex)               zte corporation\r
-B08B92     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 78-21-84   (hex)               Espressif Inc.\r
 782184     (base 16)           Espressif Inc.\r
                                Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
@@ -190679,6 +193547,18 @@ BC6193     (base 16)         Xiaomi Communications Co Ltd
                                Beijing  Haidian District  100085\r
                                CN\r
 \r
+94-7F-D8   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+947FD8     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+                               4F,Block A, Skyworth?Building,\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+C8-54-A4   (hex)               Infinix mobility limited\r
+C854A4     (base 16)           Infinix mobility limited\r
+                               RMS 05-15, 13A/F SOUTH TOWER WORLD FINANCE CTR HARBOUR CITY 17 CANTON RD TST KLN HONG KONG\r
+                               HongKong  HongKong  999077\r
+                               HK\r
+\r
 EC-71-DB   (hex)               Reolink Innovation Limited\r
 EC71DB     (base 16)           Reolink Innovation Limited\r
                                705,7/F,FA YUEN COMMERCIAL BUILDING,75-77 FA YUEN STREET\r
@@ -190697,12 +193577,6 @@ F8E57E     (base 16)         Cisco Systems, Inc
                                Seoul  Seocho-Gu  #137-902\r
                                KR\r
 \r
-94-7F-D8   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
-947FD8     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
-                               4F,Block A, Skyworth?Building,\r
-                               Shenzhen  Guangdong  518057\r
-                               CN\r
-\r
 38-5B-44   (hex)               Silicon Laboratories\r
 385B44     (base 16)           Silicon Laboratories\r
                                400 West Cesar Chavez Street\r
@@ -190745,6 +193619,12 @@ EC6073     (base 16)         TP-LINK TECHNOLOGIES CO.,LTD.
                                Shenzhen  Guangdong  518057\r
                                CN\r
 \r
+74-DD-CB   (hex)               China Leadshine Technology Co.,Ltd\r
+74DDCB     (base 16)           China Leadshine Technology Co.,Ltd\r
+                               9-11, Building A3, Nanshan Ipark, No.1001 Xueyuan Avenue, Nanshan?\r
+                               SHENZHEN    518000\r
+                               CN\r
+\r
 10-4D-15   (hex)               Viaanix Inc\r
 104D15     (base 16)           Viaanix Inc\r
                                434 N Main St.\r
@@ -190757,18 +193637,6 @@ EC6073     (base 16)         TP-LINK TECHNOLOGIES CO.,LTD.
                                Shenzhen  Nanshan District  518000\r
                                CN\r
 \r
-C8-54-A4   (hex)               Infinix mobility limited\r
-C854A4     (base 16)           Infinix mobility limited\r
-                               RMS 05-15, 13A/F SOUTH TOWER WORLD FINANCE CTR HARBOUR CITY 17 CANTON RD TST KLN HONG KONG\r
-                               HongKong  HongKong  999077\r
-                               HK\r
-\r
-A0-09-2E   (hex)               zte corporation\r
-A0092E     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
-                               CN\r
-\r
 B0-AF-F7   (hex)               Shenzhen Yipingfang Network Technology Co., Ltd.\r
 B0AFF7     (base 16)           Shenzhen Yipingfang Network Technology Co., Ltd.\r
                                21 / F, Kangjia R & D building, No.28, Keji South 12th Road, Nanshan District, Shenzhen City, Guangdong Province, China\r
@@ -190787,12 +193655,18 @@ B0AFF7     (base 16)                Shenzhen Yipingfang Network Technology Co., Ltd.
                                Changsha  HUNAN  410329\r
                                CN\r
 \r
-74-DD-CB   (hex)               China Leadshine Technology Co.,Ltd\r
-74DDCB     (base 16)           China Leadshine Technology Co.,Ltd\r
-                               9-11, Building A3, Nanshan Ipark, No.1001 Xueyuan Avenue, Nanshan?\r
-                               SHENZHEN    518000\r
+A0-09-2E   (hex)               zte corporation\r
+A0092E     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
                                CN\r
 \r
+14-75-5B   (hex)               Intel Corporate\r
+14755B     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
 A8-B1-3B   (hex)               HP Inc.\r
 A8B13B     (base 16)           HP Inc.\r
                                10300 Energy Dr\r
@@ -190811,6 +193685,12 @@ C43875     (base 16)         Sonos, Inc.
                                Reno  NV  89507\r
                                US\r
 \r
+20-89-8A   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+20898A     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+                               4F,Block A, Skyworth?Building,\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
 DC-A9-56   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
 DCA956     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
                                NO.18 HAIBIN ROAD,\r
@@ -190829,24 +193709,12 @@ BCD206     (base 16)                HUAWEI TECHNOLOGIES CO.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
-20-89-8A   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
-20898A     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
-                               4F,Block A, Skyworth?Building,\r
-                               Shenzhen  Guangdong  518057\r
+CC-82-7F   (hex)               Advantech Technology (CHINA) Co., Ltd.\r
+CC827F     (base 16)           Advantech Technology (CHINA) Co., Ltd.\r
+                               No.666, Han-Pu Rd. Yu-Shan\r
+                               Kun-Shan  Jiang Su  215316\r
                                CN\r
 \r
-14-75-5B   (hex)               Intel Corporate\r
-14755B     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
-F4-E2-04   (hex)               COYOTE SYSTEM\r
-F4E204     (base 16)           COYOTE SYSTEM\r
-                               1, rue Royale\r
-                               Saint-Cloud    92210\r
-                               FR\r
-\r
 F8-4E-58   (hex)               Samsung Electronics Co.,Ltd\r
 F84E58     (base 16)           Samsung Electronics Co.,Ltd\r
                                129, Samsung-ro, Youngtongl-Gu\r
@@ -190859,11 +193727,29 @@ B47064     (base 16)                Samsung Electronics Co.,Ltd
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
-CC-82-7F   (hex)               Advantech Technology (CHINA) Co., Ltd.\r
-CC827F     (base 16)           Advantech Technology (CHINA) Co., Ltd.\r
-                               No.666, Han-Pu Rd. Yu-Shan\r
-                               Kun-Shan  Jiang Su  215316\r
-                               CN\r
+4C-2E-5E   (hex)               Samsung Electronics Co.,Ltd\r
+4C2E5E     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+64-5D-F4   (hex)               Samsung Electronics Co.,Ltd\r
+645DF4     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+D8-10-68   (hex)               Murata Manufacturing Co., Ltd.\r
+D81068     (base 16)           Murata Manufacturing Co., Ltd.\r
+                               1-10-1, Higashikotari\r
+                               Nagaokakyo-shi  Kyoto  617-8555\r
+                               JP\r
+\r
+5C-04-5A   (hex)               Company NA Stage & Light\r
+5C045A     (base 16)           Company NA Stage & Light\r
+                               Lambertu 9\r
+                               M?rupe    LV-2167\r
+                               LV\r
 \r
 88-3F-0C   (hex)               system a.v. co., ltd.\r
 883F0C     (base 16)           system a.v. co., ltd.\r
@@ -190883,17 +193769,11 @@ C8BE35     (base 16)                Extreme Networks, Inc.
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-D8-10-68   (hex)               Murata Manufacturing Co., Ltd.\r
-D81068     (base 16)           Murata Manufacturing Co., Ltd.\r
-                               1-10-1, Higashikotari\r
-                               Nagaokakyo-shi  Kyoto  617-8555\r
-                               JP\r
-\r
-5C-04-5A   (hex)               Company NA Stage & Light\r
-5C045A     (base 16)           Company NA Stage & Light\r
-                               Lambertu 9\r
-                               M?rupe    LV-2167\r
-                               LV\r
+F4-E2-04   (hex)               COYOTE SYSTEM\r
+F4E204     (base 16)           COYOTE SYSTEM\r
+                               1, rue Royale\r
+                               Saint-Cloud    92210\r
+                               FR\r
 \r
 58-C3-56   (hex)               EM Microelectronic\r
 58C356     (base 16)           EM Microelectronic\r
@@ -190919,17 +193799,11 @@ CCDD58     (base 16)                Robert Bosch GmbH
                                Stuttgart    70499\r
                                DE\r
 \r
-4C-2E-5E   (hex)               Samsung Electronics Co.,Ltd\r
-4C2E5E     (base 16)           Samsung Electronics Co.,Ltd\r
-                               #94-1, Imsoo-Dong\r
-                               Gumi  Gyeongbuk  730-350\r
-                               KR\r
-\r
-64-5D-F4   (hex)               Samsung Electronics Co.,Ltd\r
-645DF4     (base 16)           Samsung Electronics Co.,Ltd\r
-                               #94-1, Imsoo-Dong\r
-                               Gumi  Gyeongbuk  730-350\r
-                               KR\r
+D4-E0-53   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+D4E053     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
 \r
 88-FC-5D   (hex)               Cisco Systems, Inc\r
 88FC5D     (base 16)           Cisco Systems, Inc\r
@@ -190961,11 +193835,11 @@ F4C88A     (base 16)                Intel Corporate
                                Beijing    100053\r
                                CN\r
 \r
-D4-E0-53   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
-D4E053     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
-                               3333 Scott Blvd\r
-                               Santa Clara  CA  95054\r
-                               US\r
+50-28-4A   (hex)               Intel Corporate\r
+50284A     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
 \r
 5C-A4-F4   (hex)               zte corporation\r
 5CA4F4     (base 16)           zte corporation\r
@@ -190979,11 +193853,11 @@ D4E053     (base 16)                Aruba, a Hewlett Packard Enterprise Company
                                kakuda-City  Miyagi-Pref  981-1595\r
                                JP\r
 \r
-50-28-4A   (hex)               Intel Corporate\r
-50284A     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
+24-6C-60   (hex)               Huawei Device Co., Ltd.\r
+246C60     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
 \r
 98-C9-7C   (hex)               Shenzhen iComm Semiconductor CO.,LTD\r
 98C97C     (base 16)           Shenzhen iComm Semiconductor CO.,LTD\r
@@ -190991,11 +193865,11 @@ D4E053     (base 16)                Aruba, a Hewlett Packard Enterprise Company
                                Shenzhen  No.1079 Nanhai Road,Nanshan District  518067\r
                                CN\r
 \r
-24-6C-60   (hex)               Huawei Device Co., Ltd.\r
-246C60     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
+30-3E-A7   (hex)               Intel Corporate\r
+303EA7     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
 \r
 28-A3-31   (hex)               Sierra Wireless\r
 28A331     (base 16)           Sierra Wireless\r
@@ -191003,12 +193877,6 @@ D4E053     (base 16)         Aruba, a Hewlett Packard Enterprise Company
                                Richmond  BC  V6V 3A4\r
                                CA\r
 \r
-18-34-AF   (hex)               Kaonmedia CO., LTD.\r
-1834AF     (base 16)           Kaonmedia CO., LTD.\r
-                               884-3, Seongnam-daero, Bundang-gu\r
-                               Seongnam-si  Gyeonggi-do  13517\r
-                               KR\r
-\r
 EC-62-60   (hex)               Espressif Inc.\r
 EC6260     (base 16)           Espressif Inc.\r
                                Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
@@ -191021,23 +193889,23 @@ B06E72     (base 16)                Realme Chongqing Mobile Telecommunications Corp.,Ltd.
                                Chongqing   China  401120\r
                                CN\r
 \r
-30-3E-A7   (hex)               Intel Corporate\r
-303EA7     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
 60-7D-09   (hex)               Luxshare Precision Industry Co., Ltd\r
 607D09     (base 16)           Luxshare Precision Industry Co., Ltd\r
                                2nd floor,A building,Sanyo New Industrial Area,West Area of Maoyi, Shajing Street,Bao'an District\r
                                Shenzhen City  Guangdong Province  518100\r
                                CN\r
 \r
-CC-3E-79   (hex)               ARRIS Group, Inc.\r
-CC3E79     (base 16)           ARRIS Group, Inc.\r
-                               6450 Sequence Drive\r
-                               San Diego  CA  92121\r
-                               US\r
+18-34-AF   (hex)               Kaonmedia CO., LTD.\r
+1834AF     (base 16)           Kaonmedia CO., LTD.\r
+                               884-3, Seongnam-daero, Bundang-gu\r
+                               Seongnam-si  Gyeonggi-do  13517\r
+                               KR\r
+\r
+28-82-7C   (hex)               Bosch Automative products(Suzhou)Co.,Ltd Changzhou Branch\r
+28827C     (base 16)           Bosch Automative products(Suzhou)Co.,Ltd Changzhou Branch\r
+                               No.17 Longmen Road\r
+                               Changzhou  JiangSu  213164\r
+                               CN\r
 \r
 28-F5-D1   (hex)               ARRIS Group, Inc.\r
 28F5D1     (base 16)           ARRIS Group, Inc.\r
@@ -191051,12 +193919,6 @@ CC3E79     (base 16)         ARRIS Group, Inc.
                                San Diego  CA  92121\r
                                US\r
 \r
-28-82-7C   (hex)               Bosch Automative products(Suzhou)Co.,Ltd Changzhou Branch\r
-28827C     (base 16)           Bosch Automative products(Suzhou)Co.,Ltd Changzhou Branch\r
-                               No.17 Longmen Road\r
-                               Changzhou  JiangSu  213164\r
-                               CN\r
-\r
 90-D4-73   (hex)               vivo Mobile Communication Co., Ltd.\r
 90D473     (base 16)           vivo Mobile Communication Co., Ltd.\r
                                No.1, vivo Road, Chang'an\r
@@ -191069,6 +193931,30 @@ CC3E79     (base 16)         ARRIS Group, Inc.
                                Dongguan    523808\r
                                CN\r
 \r
+CC-3E-79   (hex)               ARRIS Group, Inc.\r
+CC3E79     (base 16)           ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego  CA  92121\r
+                               US\r
+\r
+00-16-A3   (hex)               INGETEAM\r
+0016A3     (base 16)           INGETEAM\r
+                               Parque Tecnologico de Bizkaia, Edificio 110\r
+                               Zamudio  Bizkaia  48170\r
+                               ES\r
+\r
+F0-6C-5D   (hex)               Xiaomi Communications Co Ltd\r
+F06C5D     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+24-CF-24   (hex)               Beijing Xiaomi Mobile Software Co., Ltd\r
+24CF24     (base 16)           Beijing Xiaomi Mobile Software Co., Ltd\r
+                               The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
 C8-F0-9E   (hex)               Espressif Inc.\r
 C8F09E     (base 16)           Espressif Inc.\r
                                Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
@@ -191087,16 +193973,16 @@ DC5475     (base 16)                Espressif Inc.
                                San Francisco    94158\r
                                US\r
 \r
-00-16-A3   (hex)               INGETEAM\r
-0016A3     (base 16)           INGETEAM\r
-                               Parque Tecnologico de Bizkaia, Edificio 110\r
-                               Zamudio  Bizkaia  48170\r
-                               ES\r
+28-6F-40   (hex)               Tonly Technology Co. Ltd \r
+286F40     (base 16)           Tonly Technology Co. Ltd \r
+                               Section 37, Zhongkai Hi-Tech Development Zone\r
+                               Huizhou  Guangdong  516006\r
+                               CN\r
 \r
-24-CF-24   (hex)               Beijing Xiaomi Mobile Software Co., Ltd\r
-24CF24     (base 16)           Beijing Xiaomi Mobile Software Co., Ltd\r
-                               The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District\r
-                               Beijing  Beijing  100085\r
+0C-86-C7   (hex)               Jabil Circuit (Guangzhou) Limited\r
+0C86C7     (base 16)           Jabil Circuit (Guangzhou) Limited\r
+                               Huangpu 128, JunCheng Road\r
+                               GuangZhou  Guangdong  510530\r
                                CN\r
 \r
 1C-0D-7D   (hex)               Apple, Inc.\r
@@ -191117,48 +194003,6 @@ DC5475     (base 16)         Espressif Inc.
                                Cupertino  CA  95014\r
                                US\r
 \r
-F0-6C-5D   (hex)               Xiaomi Communications Co Ltd\r
-F06C5D     (base 16)           Xiaomi Communications Co Ltd\r
-                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
-                               Beijing  Haidian District  100085\r
-                               CN\r
-\r
-40-B0-2F   (hex)               Miele & Cie. KG\r
-40B02F     (base 16)           Miele & Cie. KG\r
-                               Carl-Miele-Straße 29\r
-                               Gütersloh    33332\r
-                               DE\r
-\r
-18-66-F0   (hex)               Jupiter Systems\r
-1866F0     (base 16)           Jupiter Systems\r
-                               31015 Huntwood Ave\r
-                               Hayward  CA  94544-7007\r
-                               US\r
-\r
-74-60-4C   (hex)               RØDE\r
-74604C     (base 16)           RØDE\r
-                               107 Carnarvon St\r
-                               Silverwater  NSW  2128\r
-                               AU\r
-\r
-28-6F-40   (hex)               Tonly Technology Co. Ltd \r
-286F40     (base 16)           Tonly Technology Co. Ltd \r
-                               Section 37, Zhongkai Hi-Tech Development Zone\r
-                               Huizhou  Guangdong  516006\r
-                               CN\r
-\r
-BC-C7-DA   (hex)               Earda Technologies co Ltd\r
-BCC7DA     (base 16)           Earda Technologies co Ltd\r
-                               Block A,Lianfeng Creative Park, #2 Jisheng Rd., Nansha District\r
-                               Guangzhou  Guangdong  511455\r
-                               CN\r
-\r
-0C-86-C7   (hex)               Jabil Circuit (Guangzhou) Limited\r
-0C86C7     (base 16)           Jabil Circuit (Guangzhou) Limited\r
-                               Huangpu 128, JunCheng Road\r
-                               GuangZhou  Guangdong  510530\r
-                               CN\r
-\r
 14-94-6C   (hex)               Apple, Inc.\r
 14946C     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
@@ -191171,11 +194015,17 @@ BCC7DA     (base 16)                Earda Technologies co Ltd
                                Piscataway  NJ  08554\r
                                US\r
 \r
-58-00-32   (hex)               Genexis B.V.\r
-580032     (base 16)           Genexis B.V.\r
-                               Lodewijkstraat 1A\r
-                               Eindhoven    5652AC\r
-                               NL\r
+74-60-4C   (hex)               RØDE\r
+74604C     (base 16)           RØDE\r
+                               107 Carnarvon St\r
+                               Silverwater  NSW  2128\r
+                               AU\r
+\r
+40-B0-2F   (hex)               Miele & Cie. KG\r
+40B02F     (base 16)           Miele & Cie. KG\r
+                               Carl-Miele-Straße 29\r
+                               Gütersloh    33332\r
+                               DE\r
 \r
 B4-7D-76   (hex)               KNS Group LLC\r
 B47D76     (base 16)           KNS Group LLC\r
@@ -191189,18 +194039,6 @@ C0AD97     (base 16)         TECNO MOBILE LIMITED
                                Hong Kong  Hong Kong  999077\r
                                HK\r
 \r
-B0-38-E2   (hex)               Wanan Hongsheng Electronic Co.Ltd\r
-B038E2     (base 16)           Wanan Hongsheng Electronic Co.Ltd\r
-                               1st section of industrial pack,Wan'An County,Ji'An City,jiangxi province\r
-                               Wanan  China/jiangxi  343800\r
-                               CN\r
-\r
-4C-53-69   (hex)               YanFeng Visteon(ChongQing) Automotive Electronic Co.,Ltd\r
-4C5369     (base 16)           YanFeng Visteon(ChongQing) Automotive Electronic Co.,Ltd\r
-                               No.8,Gang’an 2nd Road,Jiangbei District,Chongqing,P.R.China\r
-                               ChongQing  ChongQing  400025\r
-                               CN\r
-\r
 70-A9-83   (hex)               Cisco Systems, Inc\r
 70A983     (base 16)           Cisco Systems, Inc\r
                                80 West Tasman Drive\r
@@ -191213,22 +194051,16 @@ BCFAEB     (base 16)                Cisco Systems, Inc
                                San Jose  CA  94568\r
                                US\r
 \r
-74-76-7D   (hex)               shenzhen kexint technology co.,ltd\r
-74767D     (base 16)           shenzhen kexint technology co.,ltd\r
-                               5th Floor, Building 2, Chunhu Industrial Park, Dongshen Road, Pinghu Street, Longgang District, Shenzhen City\r
-                               shenzhen  guangdong  518000\r
-                               CN\r
-\r
-E0-48-D8   (hex)               Guangzhi Wulian Technology(Guangzhou) Co., Ltd\r
-E048D8     (base 16)           Guangzhi Wulian Technology(Guangzhou) Co., Ltd\r
-                               Room 1407, Fuli yingkai building, No. 16, Huaxia Road, Tianhe District, \r
-                               Guangzhou    510623\r
-                               CN\r
+18-66-F0   (hex)               Jupiter Systems\r
+1866F0     (base 16)           Jupiter Systems\r
+                               31015 Huntwood Ave\r
+                               Hayward  CA  94544-7007\r
+                               US\r
 \r
-F8-E4-A4   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
-F8E4A4     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
-                               No.5 DongXin Road\r
-                               Wuhan  Hubei  430074\r
+BC-C7-DA   (hex)               Earda Technologies co Ltd\r
+BCC7DA     (base 16)           Earda Technologies co Ltd\r
+                               Block A,Lianfeng Creative Park, #2 Jisheng Rd., Nansha District\r
+                               Guangzhou  Guangdong  511455\r
                                CN\r
 \r
 84-85-53   (hex)               Biznes Systema Telecom, LLC\r
@@ -191237,6 +194069,12 @@ F8E4A4     (base 16)         Fiberhome Telecommunication Technologies Co.,LTD
                                Moscow    121087\r
                                RU\r
 \r
+58-00-32   (hex)               Genexis B.V.\r
+580032     (base 16)           Genexis B.V.\r
+                               Lodewijkstraat 1A\r
+                               Eindhoven    5652AC\r
+                               NL\r
+\r
 D8-88-63   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 D88863     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
@@ -191255,6 +194093,36 @@ C03E50     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
+4C-53-69   (hex)               YanFeng Visteon(ChongQing) Automotive Electronic Co.,Ltd\r
+4C5369     (base 16)           YanFeng Visteon(ChongQing) Automotive Electronic Co.,Ltd\r
+                               No.8,Gang’an 2nd Road,Jiangbei District,Chongqing,P.R.China\r
+                               ChongQing  ChongQing  400025\r
+                               CN\r
+\r
+74-76-7D   (hex)               shenzhen kexint technology co.,ltd\r
+74767D     (base 16)           shenzhen kexint technology co.,ltd\r
+                               5th Floor, Building 2, Chunhu Industrial Park, Dongshen Road, Pinghu Street, Longgang District, Shenzhen City\r
+                               shenzhen  guangdong  518000\r
+                               CN\r
+\r
+B0-38-E2   (hex)               Wanan Hongsheng Electronic Co.Ltd\r
+B038E2     (base 16)           Wanan Hongsheng Electronic Co.Ltd\r
+                               1st section of industrial pack,Wan'An County,Ji'An City,jiangxi province\r
+                               Wanan  China/jiangxi  343800\r
+                               CN\r
+\r
+E0-48-D8   (hex)               Guangzhi Wulian Technology(Guangzhou) Co., Ltd\r
+E048D8     (base 16)           Guangzhi Wulian Technology(Guangzhou) Co., Ltd\r
+                               Room 1407, Fuli yingkai building, No. 16, Huaxia Road, Tianhe District, \r
+                               Guangzhou    510623\r
+                               CN\r
+\r
+F8-E4-A4   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+F8E4A4     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
 A0-C9-8B   (hex)               Nokia Solutions and Networks GmbH & Co. KG\r
 A0C98B     (base 16)           Nokia Solutions and Networks GmbH & Co. KG\r
                                Werinherstrasse 91\r
@@ -191267,6 +194135,12 @@ A0C98B     (base 16)         Nokia Solutions and Networks GmbH & Co. KG
                                Dongguan  Guangdong  523808\r
                                CN\r
 \r
+80-5B-65   (hex)               LG Innotek\r
+805B65     (base 16)           LG Innotek\r
+                               26, Hanamsandan 5beon-ro\r
+                               Gwangju  Gwangsan-gu  506-731\r
+                               KR\r
+\r
 4C-9D-22   (hex)               ACES Co.,Ltd\r
 4C9D22     (base 16)           ACES Co.,Ltd\r
                                TianGong Avenue #916, Tianfu New Area\r
@@ -191279,28 +194153,22 @@ A0C98B     (base 16)                Nokia Solutions and Networks GmbH & Co. KG
                                Shinagawa-ku   Tokyo  141-8610\r
                                JP\r
 \r
-B8-F0-B9   (hex)               zte corporation\r
-B8F0B9     (base 16)           zte corporation\r
-                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
-                               shenzhen  guangdong  518057\r
+00-73-8D   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
+00738D     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
+                               Building, No.33, Xiandong Rd, Xili\r
+                               Nanshan District, Shenzhen  PRC  518053\r
                                CN\r
 \r
-80-5B-65   (hex)               LG Innotek\r
-805B65     (base 16)           LG Innotek\r
-                               26, Hanamsandan 5beon-ro\r
-                               Gwangju  Gwangsan-gu  506-731\r
-                               KR\r
-\r
 D4-43-0E   (hex)               Zhejiang Dahua Technology Co., Ltd.\r
 D4430E     (base 16)           Zhejiang Dahua Technology Co., Ltd.\r
                                No.1199,Waterfront Road \r
                                Hangzhou  Zhejiang  310053\r
                                CN\r
 \r
-00-73-8D   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
-00738D     (base 16)           Shenzhen TINNO Mobile Technology Corp.\r
-                               Building, No.33, Xiandong Rd, Xili\r
-                               Nanshan District, Shenzhen  PRC  518053\r
+F8-5E-0B   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+F85E0B     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
+                               Chongqing   China  401120\r
                                CN\r
 \r
 44-D3-AD   (hex)               Shenzhen TINNO Mobile Technology Corp.\r
@@ -191309,18 +194177,30 @@ D4430E     (base 16)                Zhejiang Dahua Technology Co., Ltd.
                                Nanshan District, Shenzhen  PRC  518053\r
                                CN\r
 \r
-F8-5E-0B   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
-F85E0B     (base 16)           Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
-                               No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.\r
-                               Chongqing   China  401120\r
-                               CN\r
-\r
 94-D3-31   (hex)               Xiaomi Communications Co Ltd\r
 94D331     (base 16)           Xiaomi Communications Co Ltd\r
                                #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
                                Beijing  Haidian District  100085\r
                                CN\r
 \r
+34-DD-04   (hex)               Minut AB\r
+34DD04     (base 16)           Minut AB\r
+                               Baltzarsgatan 23\r
+                               Malmö    21136\r
+                               SE\r
+\r
+60-1E-98   (hex)               Axevast Technology\r
+601E98     (base 16)           Axevast Technology\r
+                               5F., No. 20, Guanqian Road, Zhongzheng District\r
+                               Taipei City    100007\r
+                               TW\r
+\r
+A8-F7-D9   (hex)               Mist Systems, Inc.\r
+A8F7D9     (base 16)           Mist Systems, Inc.\r
+                               1601 South De Anza Blvd, Suite 248\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
 5C-8C-30   (hex)               Taicang T&W Electronics\r
 5C8C30     (base 16)           Taicang T&W Electronics\r
                                89# Jiang Nan RD\r
@@ -191339,18 +194219,6 @@ F85E0B     (base 16)         Realme Chongqing Mobile Telecommunications Corp.,Ltd.
                                San Jose  CA  94568\r
                                US\r
 \r
-34-DD-04   (hex)               Minut AB\r
-34DD04     (base 16)           Minut AB\r
-                               Baltzarsgatan 23\r
-                               Malmö    21136\r
-                               SE\r
-\r
-E8-AC-23   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-E8AC23     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
-                               CN\r
-\r
 68-D9-27   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 68D927     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
@@ -191387,17 +194255,11 @@ E8AC23     (base 16)                HUAWEI TECHNOLOGIES CO.,LTD
                                Shanghai    200233\r
                                CN\r
 \r
-60-1E-98   (hex)               Axevast Technology\r
-601E98     (base 16)           Axevast Technology\r
-                               5F., No. 20, Guanqian Road, Zhongzheng District\r
-                               Taipei City    100007\r
-                               TW\r
-\r
-A8-F7-D9   (hex)               Mist Systems, Inc.\r
-A8F7D9     (base 16)           Mist Systems, Inc.\r
-                               1601 South De Anza Blvd, Suite 248\r
-                               Cupertino  CA  95014\r
-                               US\r
+E8-AC-23   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+E8AC23     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
 \r
 2C-3B-70   (hex)               AzureWave Technology Inc.\r
 2C3B70     (base 16)           AzureWave Technology Inc.\r
@@ -191423,6 +194285,12 @@ F4227A     (base 16)         Guangdong Seneasy Intelligent Technology Co., Ltd.
                                Piscataway  NJ  08554\r
                                US\r
 \r
+DC-8D-B7   (hex)               ATW TECHNOLOGY, INC.\r
+DC8DB7     (base 16)           ATW TECHNOLOGY, INC.\r
+                               1F, No.236 Ba’ai Street, Shulin District\r
+                               New Taipei City    23845\r
+                               TW\r
+\r
 A4-75-B9   (hex)               Samsung Electronics Co.,Ltd\r
 A475B9     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
@@ -191435,18 +194303,18 @@ A475B9     (base 16)                Samsung Electronics Co.,Ltd
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
-6C-60-D0   (hex)               Huawei Device Co., Ltd.\r
-6C60D0     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
 1C-F8-D0   (hex)               Samsung Electronics Co.,Ltd\r
 1CF8D0     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
                                Gumi  Gyeongbuk  730-350\r
                                KR\r
 \r
+6C-60-D0   (hex)               Huawei Device Co., Ltd.\r
+6C60D0     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
 64-0E-6A   (hex)               SECO-LARM USA Inc\r
 640E6A     (base 16)           SECO-LARM USA Inc\r
                                16842 Millikan\r
@@ -191459,12 +194327,6 @@ A475B9     (base 16)         Samsung Electronics Co.,Ltd
                                San Jose  CA  95110\r
                                US\r
 \r
-DC-8D-B7   (hex)               ATW TECHNOLOGY, INC.\r
-DC8DB7     (base 16)           ATW TECHNOLOGY, INC.\r
-                               1F, No.236 Ba’ai Street, Shulin District\r
-                               New Taipei City    23845\r
-                               TW\r
-\r
 70-20-84   (hex)               Hon Hai Precision Industry Co., Ltd.\r
 702084     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
                                GuangDongShenZhen\r
@@ -191477,12 +194339,6 @@ DC8DB7     (base 16)         ATW TECHNOLOGY, INC.
                                ShenZhen  GuangDong  518109\r
                                CN\r
 \r
-1C-A0-B8   (hex)               Hon Hai Precision Industry Co., Ltd.\r
-1CA0B8     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
-                               GuangDongShenZhen\r
-                               ShenZhen  GuangDong  518109\r
-                               CN\r
-\r
 18-AA-1E   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
 18AA1E     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
                                4F,Block A, Skyworth?Building,\r
@@ -191501,6 +194357,18 @@ D452EE     (base 16)         SKY UK LIMITED
                                Brentwood  Essex  08854\r
                                GB\r
 \r
+1C-A0-B8   (hex)               Hon Hai Precision Industry Co., Ltd.\r
+1CA0B8     (base 16)           Hon Hai Precision Industry Co., Ltd.\r
+                               GuangDongShenZhen\r
+                               ShenZhen  GuangDong  518109\r
+                               CN\r
+\r
+E8-EF-05   (hex)               MIND TECH INTERNATIONAL LIMITED\r
+E8EF05     (base 16)           MIND TECH INTERNATIONAL LIMITED\r
+                               FLAT E 2/F RIALTO MANSION 183 KING'S RD NORTH POINT HK\r
+                               Hong Kong    999077\r
+                               HK\r
+\r
 90-21-06   (hex)               SKY UK LIMITED\r
 902106     (base 16)           SKY UK LIMITED\r
                                130 Kings Road\r
@@ -191519,11 +194387,17 @@ F08756     (base 16)                Zyxel Communications Corporation
                                Hsichu  Taiwan  300\r
                                TW\r
 \r
-E8-EF-05   (hex)               MIND TECH INTERNATIONAL LIMITED\r
-E8EF05     (base 16)           MIND TECH INTERNATIONAL LIMITED\r
-                               FLAT E 2/F RIALTO MANSION 183 KING'S RD NORTH POINT HK\r
-                               Hong Kong    999077\r
-                               HK\r
+18-C3-00   (hex)               Nokia\r
+18C300     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+D4-4D-77   (hex)               Nokia\r
+D44D77     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
 \r
 48-27-E2   (hex)               Espressif Inc.\r
 4827E2     (base 16)           Espressif Inc.\r
@@ -191531,6 +194405,12 @@ E8EF05     (base 16)         MIND TECH INTERNATIONAL LIMITED
                                Shanghai  Shanghai  201203\r
                                CN\r
 \r
+F4-6D-3F   (hex)               Intel Corporate\r
+F46D3F     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
 58-B3-8F   (hex)               New H3C Technologies Co., Ltd\r
 58B38F     (base 16)           New H3C Technologies Co., Ltd\r
                                466 Changhe Road, Binjiang District\r
@@ -191543,30 +194423,12 @@ E8EF05     (base 16)                MIND TECH INTERNATIONAL LIMITED
                                Zhenjiang  Jiangsu  212003\r
                                CN\r
 \r
-F4-6D-3F   (hex)               Intel Corporate\r
-F46D3F     (base 16)           Intel Corporate\r
-                               Lot 8, Jalan Hi-Tech 2/3  \r
-                               Kulim  Kedah  09000\r
-                               MY\r
-\r
 6C-72-4A   (hex)               Onkyo Technology K.K.\r
 6C724A     (base 16)           Onkyo Technology K.K.\r
                                Lux Building (5th floor),1-1-41 Kawamata\r
                                Higashiosaka City  Osaka  577-0063\r
                                JP\r
 \r
-18-C3-00   (hex)               Nokia\r
-18C300     (base 16)           Nokia\r
-                               600 March Road\r
-                               Kanata  Ontario  K2K 2E6\r
-                               CA\r
-\r
-D4-4D-77   (hex)               Nokia\r
-D44D77     (base 16)           Nokia\r
-                               600 March Road\r
-                               Kanata  Ontario  K2K 2E6\r
-                               CA\r
-\r
 DC-05-39   (hex)               Cisco Systems, Inc\r
 DC0539     (base 16)           Cisco Systems, Inc\r
                                80 West Tasman Drive\r
@@ -191579,6 +194441,18 @@ DC0539     (base 16)         Cisco Systems, Inc
                                East Greenwich  RI  02818\r
                                US\r
 \r
+E0-F3-18   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
+E0F318     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
+                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
+                               Chengdu  Sichuan  611330\r
+                               CN\r
+\r
+C4-64-F2   (hex)               Infinix mobility limited\r
+C464F2     (base 16)           Infinix mobility limited\r
+                               RMS 05-15, 13A/F SOUTH TOWER WORLD FINANCE CTR HARBOUR CITY 17 CANTON RD TST KLN HONG KONG\r
+                               HongKong  HongKong  999077\r
+                               HK\r
+\r
 B0-1F-47   (hex)               Heights Telecom T ltd\r
 B01F47     (base 16)           Heights Telecom T ltd\r
                                Moshe Lerer 15\r
@@ -191633,17 +194507,11 @@ BC1541     (base 16)                Nokia
                                Kanata  Ontario  K2K 2E6\r
                                CA\r
 \r
-E0-F3-18   (hex)               Sichuan Tianyi Comheart Telecom Co.,LTD\r
-E0F318     (base 16)           Sichuan Tianyi Comheart Telecom Co.,LTD\r
-                               No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County\r
-                               Chengdu  Sichuan  611330\r
-                               CN\r
-\r
-C4-64-F2   (hex)               Infinix mobility limited\r
-C464F2     (base 16)           Infinix mobility limited\r
-                               RMS 05-15, 13A/F SOUTH TOWER WORLD FINANCE CTR HARBOUR CITY 17 CANTON RD TST KLN HONG KONG\r
-                               HongKong  HongKong  999077\r
-                               HK\r
+94-6D-AE   (hex)               Mellanox Technologies, Inc.\r
+946DAE     (base 16)           Mellanox Technologies, Inc.\r
+                               350 Oakmead Parkway, Suite 100 \r
+                               Sunnyvale  CA  94085\r
+                               US\r
 \r
 E4-A6-34   (hex)               Universal Electronics, Inc.\r
 E4A634     (base 16)           Universal Electronics, Inc.\r
@@ -191657,44 +194525,50 @@ E4A634     (base 16)                Universal Electronics, Inc.
                                Racho Santa MArgarita  CA  92688\r
                                US\r
 \r
-14-65-6A   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-14656A     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+50-63-91   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+506391     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-6C-B7-E2   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-6CB7E2     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+E8-A3-4E   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+E8A34E     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-C4-75-EA   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-C475EA     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+04-18-92   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+041892     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-90-25-F2   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-9025F2     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+14-65-6A   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+14656A     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-50-63-91   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-506391     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+AC-B6-87   (hex)               Arcadyan Corporation\r
+ACB687     (base 16)           Arcadyan Corporation\r
+                               No.8, Sec.2, Guangfu Rd.\r
+                               Hsinchu City  Hsinchu  30071\r
+                               TW\r
+\r
+6C-B7-E2   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+6CB7E2     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-E8-A3-4E   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-E8A34E     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+C4-75-EA   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+C475EA     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-04-18-92   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-041892     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+90-25-F2   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+9025F2     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
@@ -191711,36 +194585,24 @@ E8A34E     (base 16)                HUAWEI TECHNOLOGIES CO.,LTD
                                Hsinchu  Hsinchu,Taiwan R.O.C.  30352\r
                                TW\r
 \r
+EC-E6-1D   (hex)               Huawei Device Co., Ltd.\r
+ECE61D     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
 48-6D-BB   (hex)               Vestel Elektronik San ve Tic. A.S.\r
 486DBB     (base 16)           Vestel Elektronik San ve Tic. A.S.\r
                                Organize san\r
                                Manisa  Turket  45030\r
                                TR\r
 \r
-94-6D-AE   (hex)               Mellanox Technologies, Inc.\r
-946DAE     (base 16)           Mellanox Technologies, Inc.\r
-                               350 Oakmead Parkway, Suite 100 \r
-                               Sunnyvale  CA  94085\r
-                               US\r
-\r
 00-84-ED   (hex)               LEXMARK INTERNATIONAL, INC.\r
 0084ED     (base 16)           LEXMARK INTERNATIONAL, INC.\r
                                740 W. New Circle Rd.\r
                                Lexington  KY  40550\r
                                US\r
 \r
-AC-B6-87   (hex)               Arcadyan Corporation\r
-ACB687     (base 16)           Arcadyan Corporation\r
-                               No.8, Sec.2, Guangfu Rd.\r
-                               Hsinchu City  Hsinchu  30071\r
-                               TW\r
-\r
-B4-3A-31   (hex)               Silicon Laboratories\r
-B43A31     (base 16)           Silicon Laboratories\r
-                               400 West Cesar Chavez\r
-                               Austin  TX  78701\r
-                               US\r
-\r
 4C-63-AD   (hex)               Huawei Device Co., Ltd.\r
 4C63AD     (base 16)           Huawei Device Co., Ltd.\r
                                No.2 of Xincheng Road, Songshan Lake Zone\r
@@ -191765,11 +194627,11 @@ DCDB27     (base 16)                Huawei Device Co., Ltd.
                                Santa Clara  CA  95054\r
                                US\r
 \r
-EC-E6-1D   (hex)               Huawei Device Co., Ltd.\r
-ECE61D     (base 16)           Huawei Device Co., Ltd.\r
-                               No.2 of Xincheng Road, Songshan Lake Zone\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
+B4-3A-31   (hex)               Silicon Laboratories\r
+B43A31     (base 16)           Silicon Laboratories\r
+                               400 West Cesar Chavez\r
+                               Austin  TX  78701\r
+                               US\r
 \r
 CC-96-E5   (hex)               Dell Inc.\r
 CC96E5     (base 16)           Dell Inc.\r
@@ -191777,14 +194639,836 @@ CC96E5     (base 16)               Dell Inc.
                                Round Rock  TX  78682\r
                                US\r
 \r
-40-75-C3   (hex)               Technicolor CH USA Inc.\r
-4075C3     (base 16)           Technicolor CH USA Inc.\r
-                               5030 Sugarloaf Parkway Bldg 6 \r
-                               Lawrenceville  GA  30044\r
+74-24-9F   (hex)               TIBRO Corp.\r
+74249F     (base 16)           TIBRO Corp.\r
+                               251 Little Falls Drive\r
+                               Wilmington  DE  19808\r
                                US\r
 \r
+34-DF-20   (hex)               Shenzhen Comstar .Technology Co.,Ltd\r
+34DF20     (base 16)           Shenzhen Comstar .Technology Co.,Ltd\r
+                               4th Floor,Block B,Building 6,Evergrande Fashion Valley, Dalang Street, Longhua District,Shenzhen\r
+                               Shenzhen  Guangdong  518109\r
+                               CN\r
+\r
 F4-1A-B0   (hex)               Shenzhen Xingguodu Technology Co., Ltd.\r
 F41AB0     (base 16)           Shenzhen Xingguodu Technology Co., Ltd.\r
                                18th Floor, Block B, Building 10, Shenzhen Bay Science and Technology Ecological Park, Nanshan District, Shenzhen\r
                                Shenzhen  Guangdong  518000\r
                                CN\r
+\r
+D8-83-32   (hex)               TaiXin Semiconductor Co., Ltd\r
+D88332     (base 16)           TaiXin Semiconductor Co., Ltd\r
+                               3 Floor Building No 2, Guangwan Bay No.1 Tangjia Town, Zhuhai City\r
+                               Zhuhai  Guangdong  519000\r
+                               CN\r
+\r
+88-9C-AD   (hex)               Cisco Systems, Inc\r
+889CAD     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+A4-51-5E   (hex)               Juniper Networks\r
+A4515E     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+18-C3-F4   (hex)               IEEE Registration Authority\r
+18C3F4     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+44-8E-EC   (hex)               China Mobile Group Device Co.,Ltd.\r
+448EEC     (base 16)           China Mobile Group Device Co.,Ltd.\r
+                               32 Xuanwumen West Street,Xicheng District\r
+                               Beijing    100053\r
+                               CN\r
+\r
+F0-26-F8   (hex)               Worldcns Co.,Ltd.\r
+F026F8     (base 16)           Worldcns Co.,Ltd.\r
+                               B-1813 67, Saebitgongwon-ro, Gwangmyeong-si, Gyeonggi-do, Republic of Korea\r
+                               Gwangmyeong    14348\r
+                               KR\r
+\r
+14-07-08   (hex)               CP PLUS GMBH & CO. KG\r
+140708     (base 16)           CP PLUS GMBH & CO. KG\r
+                               Hans Henny Jahnn Weg 9\r
+                               Hamburg    D22085\r
+                               DE\r
+\r
+68-27-5F   (hex)               zte corporation\r
+68275F     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+44-41-F0   (hex)               zte corporation\r
+4441F0     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+8C-6A-3B   (hex)               Samsung Electronics Co.,Ltd\r
+8C6A3B     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+24-11-53   (hex)               Samsung Electronics Co.,Ltd\r
+241153     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+14-D4-24   (hex)               AzureWave Technology Inc.\r
+14D424     (base 16)           AzureWave Technology Inc.\r
+                               8F., No. 94, Baozhong Rd.\r
+                               New Taipei City  Taiwan  231\r
+                               TW\r
+\r
+F8-5B-6E   (hex)               Samsung Electronics Co.,Ltd\r
+F85B6E     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+28-2B-B9   (hex)               Shenzhen Xiongxin Technology Co.,Ltd\r
+282BB9     (base 16)           Shenzhen Xiongxin Technology Co.,Ltd\r
+                               Room 05, 15th Floor, Yihua Financial Technology Building, 3939 Baishi Road, Binhai Community, Yuehai Street, Nanshan District, Shenzhen China\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+F8-A4-75   (hex)               PT Indoreka Jaya Wutama\r
+F8A475     (base 16)           PT Indoreka Jaya Wutama\r
+                               Tokopedia Tower Ciputra World 2, Jl. Prof. Dr. Satrio No 3, Desa/Kelurahan Karet Semanggi, Kec. Setiabudi, Kota Adm. Jakarta Selatan, Provinsi DKI Jakarta\r
+                               Jakarta Selatan  DKI Jakarta  12950\r
+                               ID\r
+\r
+30-1A-BA   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+301ABA     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+14-49-D4   (hex)               Xiaomi Communications Co Ltd\r
+1449D4     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+64-7C-E8   (hex)               Palo Alto Networks\r
+647CE8     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+A0-FF-0C   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+A0FF0C     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+68-F5-43   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+68F543     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+A4-79-52   (hex)               Huawei Device Co., Ltd.\r
+A47952     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+B8-7C-D0   (hex)               Huawei Device Co., Ltd.\r
+B87CD0     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+D0-7E-01   (hex)               Huawei Device Co., Ltd.\r
+D07E01     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+F8-79-07   (hex)               Huawei Device Co., Ltd.\r
+F87907     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+C8-70-D4   (hex)               IBO Technology Co,Ltd\r
+C870D4     (base 16)           IBO Technology Co,Ltd\r
+                               4F,Block.C,Unis Inforport,Langshan Rd 13,Hi-Tech Industrial Park(North)Nanshan\r
+                               ShenZhen  GuangDong  518000\r
+                               CN\r
+\r
+68-87-1C   (hex)               Motorola Mobility LLC, a Lenovo Company\r
+68871C     (base 16)           Motorola Mobility LLC, a Lenovo Company\r
+                               222 West Merchandise Mart Plaza\r
+                               Chicago  IL  60654\r
+                               US\r
+\r
+7C-E8-7F   (hex)               Sagemcom Broadband SAS\r
+7CE87F     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+F8-7D-76   (hex)               Apple, Inc.\r
+F87D76     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+2C-76-00   (hex)               Apple, Inc.\r
+2C7600     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+80-82-F5   (hex)               STMicrolectronics International NV\r
+8082F5     (base 16)           STMicrolectronics International NV\r
+                               39, Chemin du Champ-des-Filles\r
+                                Geneva, Plan-les-Quates    1228\r
+                               CH\r
+\r
+84-FB-43   (hex)               Central Denshi Seigyo\r
+84FB43     (base 16)           Central Denshi Seigyo\r
+                               #913 9th Kanagawa Science Park R&D Business Park building B,  3-2-1 Sakado, Takatsu-ku,\r
+                               Kawasaki City  Kanagawa Prefecture  213-0012\r
+                               JP\r
+\r
+9C-2D-CD   (hex)               LCFC(Hefei) Electronics Technology Co., Ltd\r
+9C2DCD     (base 16)           LCFC(Hefei) Electronics Technology Co., Ltd\r
+                               No.3188-1,YunGu Road(Comprehensive Bonded Zone),Hefei Economic and Technological Development Area\r
+                               HEFEI  ANHUI  230601\r
+                               CN\r
+\r
+00-31-26   (hex)               Nokia\r
+003126     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+10-98-26   (hex)               Nokia\r
+109826     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+68-6C-E6   (hex)               Microsoft Corporation\r
+686CE6     (base 16)           Microsoft Corporation\r
+                               One Microsoft Way\r
+                               REDMOND  WA  98052\r
+                               US\r
+\r
+58-47-CA   (hex)               IEEE Registration Authority\r
+5847CA     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+68-D4-0C   (hex)               TELLESCOM INDUSTRIA E COMERCIO EM TELECOMUNICACAO \r
+68D40C     (base 16)           TELLESCOM INDUSTRIA E COMERCIO EM TELECOMUNICACAO \r
+                               Av. Buriti, 1900 – Setor B – Distrito Industrial\r
+                               Manaus  Amazonas  69075-000\r
+                               BR\r
+\r
+08-54-11   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+085411     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+80-A7-96   (hex)               Neuralink Corp.\r
+80A796     (base 16)           Neuralink Corp.\r
+                               3180 18th St, Ste 200\r
+                               San Francisco  CA  94110\r
+                               US\r
+\r
+DC-DC-C3   (hex)               Extreme Networks, Inc.\r
+DCDCC3     (base 16)           Extreme Networks, Inc.\r
+                               6480 Via Del Oro\r
+                               San Jose  CA  95119\r
+                               US\r
+\r
+F4-F1-9E   (hex)               Wistron InforComm (Zhongshan) Corporation\r
+F4F19E     (base 16)           Wistron InforComm (Zhongshan) Corporation\r
+                               No.38, East Keji Road, Zhongshan Torch Development Zone\r
+                               Zhongshan  Guangdong  528437\r
+                               CN\r
+\r
+24-E3-DE   (hex)               China Telecom Fufu Information Technology Co., Ltd.\r
+24E3DE     (base 16)           China Telecom Fufu Information Technology Co., Ltd.\r
+                               22 Shuitou Road, Doumen\r
+                               Fuzhou  Fujian  350013\r
+                               CN\r
+\r
+10-4C-43   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+104C43     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+98-34-8C   (hex)               Teleepoch Ltd\r
+98348C     (base 16)           Teleepoch Ltd\r
+                               No.13 Langshan Rd,HiTech Park,Nanshan District\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+18-16-E8   (hex)               Siliconware Precision Industries Co., Ltd.\r
+1816E8     (base 16)           Siliconware Precision Industries Co., Ltd.\r
+                               No. 123, Sec.3, Da Fong Rd, Tantzu, \r
+                               Taichung    427\r
+                               TW\r
+\r
+CC-79-D7   (hex)               Cisco Systems, Inc\r
+CC79D7     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+E4-38-7E   (hex)               Cisco Systems, Inc\r
+E4387E     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+5C-AC-3D   (hex)               Samsung Electronics Co.,Ltd\r
+5CAC3D     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+08-A7-C0   (hex)               Technicolor CH USA Inc.\r
+08A7C0     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+8C-6A-8D   (hex)               Technicolor CH USA Inc.\r
+8C6A8D     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+1C-9E-CC   (hex)               Technicolor CH USA Inc.\r
+1C9ECC     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+CC-E6-86   (hex)               Samsung Electronics Co.,Ltd\r
+CCE686     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+74-19-0A   (hex)               Samsung Electronics Co.,Ltd\r
+74190A     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+5C-7D-7D   (hex)               Technicolor CH USA Inc.\r
+5C7D7D     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+40-75-C3   (hex)               Technicolor CH USA Inc.\r
+4075C3     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville   GA  30044\r
+                               US\r
+\r
+F0-ED-B8   (hex)               SERVERCOM (INDIA) PRIVATE LIMITED\r
+F0EDB8     (base 16)           SERVERCOM (INDIA) PRIVATE LIMITED\r
+                               E-43/1 OKHLA INDUSTRIAL AREA PHASE-II NEW DELHI SOUTH DELHI\r
+                               NEW DELHI    NA\r
+                               IN\r
+\r
+F8-79-99   (hex)               Guangdong Jiuzhi Technology Co.,Ltd\r
+F87999     (base 16)           Guangdong Jiuzhi Technology Co.,Ltd\r
+                               Room 3A02, Yihe center, Shiqi District, Zhongshan City, Guangdong Province, China\r
+                               Zhongshan City  Guangdong Province  523000\r
+                               CN\r
+\r
+CC-2A-AC   (hex)               Yunjing lntelligent Technology(Dongguan).,Ltd\r
+CC2AAC     (base 16)           Yunjing lntelligent Technology(Dongguan).,Ltd\r
+                               Building 7, 4 Xingye Road, Songshan Lake Park, Dongguan city, Guangdong Province\r
+                               Dongguan    523000\r
+                               CN\r
+\r
+20-40-6A   (hex)               AMPAK Technology,Inc.\r
+20406A     (base 16)           AMPAK Technology,Inc.\r
+                               3F, No.15-1 Zhonghua Road, Hsinchu Industrail Park, Hukou,\r
+                               Hsinchu  Hsinchu,Taiwan R.O.C.  30352\r
+                               TW\r
+\r
+84-DB-A4   (hex)               Huawei Device Co., Ltd.\r
+84DBA4     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+24-5C-C5   (hex)               Huawei Device Co., Ltd.\r
+245CC5     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+E4-60-17   (hex)               Intel Corporate\r
+E46017     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+30-F6-EF   (hex)               Intel Corporate\r
+30F6EF     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+68-E1-DC   (hex)               BUFFALO.INC\r
+68E1DC     (base 16)           BUFFALO.INC\r
+                               AKAMONDORI Bld.,30-20,Ohsu 3-chome,Naka-ku\r
+                               Nagoya  Aichi Pref.  460-8315\r
+                               JP\r
+\r
+58-6D-67   (hex)               Intel Corporate\r
+586D67     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3  \r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+EC-74-27   (hex)               eero inc.\r
+EC7427     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+4C-5B-B3   (hex)               Silicon Laboratories\r
+4C5BB3     (base 16)           Silicon Laboratories\r
+                               7000 W. William Cannon Dr.\r
+                               Austin  TX  78735\r
+                               US\r
+\r
+78-D8-40   (hex)               Xiaomi Communications Co Ltd\r
+78D840     (base 16)           Xiaomi Communications Co Ltd\r
+                               #019, 9th Floor, Building 6, 33 Xi'erqi Middle Road\r
+                               Beijing  Haidian District  100085\r
+                               CN\r
+\r
+F4-63-FC   (hex)               vivo Mobile Communication Co., Ltd.\r
+F463FC     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               No.1, vivo Road, Chang'an\r
+                               Dongguan  Guangdong  523860\r
+                               CN\r
+\r
+38-BC-61   (hex)               Starkoff Co., Ltd.\r
+38BC61     (base 16)           Starkoff Co., Ltd.\r
+                               SeoulForest L-Tower #1405, Achasanro 17, Seongdonggu\r
+                               Seoul  Seoul  04789\r
+                               KR\r
+\r
+B8-3D-FB   (hex)               Bouffalo Lab (Nanjing) Co., Ltd.\r
+B83DFB     (base 16)           Bouffalo Lab (Nanjing) Co., Ltd.\r
+                               5F, Gongxiang Space, No.100 Tuanjie Road, Nanjing, China\r
+                               Nanjing  Jiangsu  211800\r
+                               CN\r
+\r
+54-64-DE   (hex)               u-blox AG\r
+5464DE     (base 16)           u-blox AG\r
+                               Zuercherstrasse 68\r
+                               Thalwil    8800\r
+                               CH\r
+\r
+10-A8-29   (hex)               Cisco Systems, Inc\r
+10A829     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+60-56-7D   (hex)               AM Telecom co., Ltd.\r
+60567D     (base 16)           AM Telecom co., Ltd.\r
+                               #608,YatapLeaders B/D, Jangmi-ro 42, Bundang-gu\r
+                               Seongnam-si  Gyeonggi-do  463-828\r
+                               KR\r
+\r
+04-86-80   (hex)               Quectel Wireless Solutions Co.,Ltd.\r
+048680     (base 16)           Quectel Wireless Solutions Co.,Ltd.\r
+                               7th Floor, Hongye Building, No.1801 Hongmei Road, Xuhui District\r
+                               Shanghai    200233\r
+                               CN\r
+\r
+B8-AB-62   (hex)               Hui Zhou Gaoshengda Technology Co.,LTD\r
+B8AB62     (base 16)           Hui Zhou Gaoshengda Technology Co.,LTD\r
+                               No.2,Jin-da Road,Huinan Industrial Park\r
+                               Hui Zhou  Guangdong  516025\r
+                               CN\r
+\r
+C8-96-5A   (hex)               SKY UK LIMITED\r
+C8965A     (base 16)           SKY UK LIMITED\r
+                               Grant Way\r
+                               Isleworth  Middlesex  TW7 5QD\r
+                               GB\r
+\r
+C8-DE-41   (hex)               SKY UK LIMITED\r
+C8DE41     (base 16)           SKY UK LIMITED\r
+                               Grant Way\r
+                               Isleworth  Middlesex  TW7 5QD\r
+                               GB\r
+\r
+20-5E-97   (hex)               Nokia\r
+205E97     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+38-CA-84   (hex)               HP Inc.\r
+38CA84     (base 16)           HP Inc.\r
+                               10300 Energy Drive\r
+                               Spring  TX  77389\r
+                               US\r
+\r
+D4-F0-C9   (hex)               KYOCERA Document Solutions Inc.\r
+D4F0C9     (base 16)           KYOCERA Document Solutions Inc.\r
+                               2-28 1-Chome, Tamatsukuri, Chuo-ku  \r
+                               osaka  Japan  540-8585\r
+                               JP\r
+\r
+84-E6-57   (hex)               Sony Interactive Entertainment Inc.\r
+84E657     (base 16)           Sony Interactive Entertainment Inc.\r
+                               1-7-1 Konan\r
+                               Minato-ku  Tokyo  108-0075\r
+                               JP\r
+\r
+24-B7-DA   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+24B7DA     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+08-46-C7   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+0846C7     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+FC-22-F4   (hex)               Zyxel Communications Corporation\r
+FC22F4     (base 16)           Zyxel Communications Corporation\r
+                               No. 6 Innovation Road II, Science Park\r
+                               Hsichu  Taiwan  300\r
+                               TW\r
+\r
+64-E8-33   (hex)               Espressif Inc.\r
+64E833     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+7C-9F-07   (hex)               CIG SHANGHAI CO LTD\r
+7C9F07     (base 16)           CIG SHANGHAI CO LTD\r
+                               5th Floor, Building 8 No 2388 Chenhang Road \r
+                               SHANGHAI    201114\r
+                               CN\r
+\r
+AC-CF-7B   (hex)               INGRAM MICRO SERVICES\r
+ACCF7B     (base 16)           INGRAM MICRO SERVICES\r
+                               100 CHEMIN DE BAILLOT\r
+                               MONTAUBAN    82000\r
+                               FR\r
+\r
+E8-6E-44   (hex)               zte corporation\r
+E86E44     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+00-E7-E3   (hex)               zte corporation\r
+00E7E3     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+04-20-84   (hex)               zte corporation\r
+042084     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+B4-5F-84   (hex)               zte corporation\r
+B45F84     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+B0-8B-92   (hex)               zte corporation\r
+B08B92     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+B8-16-5F   (hex)               LG Innotek\r
+B8165F     (base 16)           LG Innotek\r
+                               26, Hanamsandan 5beon-ro\r
+                               Gwangju  Gwangsan-gu  506-731\r
+                               KR\r
+\r
+1C-63-49   (hex)               Texas Instruments\r
+1C6349     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+E4-52-1E   (hex)               Texas Instruments\r
+E4521E     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+B8-F0-B9   (hex)               zte corporation\r
+B8F0B9     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+18-2C-65   (hex)               Texas Instruments\r
+182C65     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+C8-E3-06   (hex)               eero inc.\r
+C8E306     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+A4-E8-A3   (hex)               Fujian Newland Auto-ID Tech Co.,Ltd.\r
+A4E8A3     (base 16)           Fujian Newland Auto-ID Tech Co.,Ltd.\r
+                               Newland Science&Technology Park,No.1,Rujiang West Rd,Mawei,Fuzhou,P.R.China\r
+                               Fuzhou  Fujian  350015\r
+                               CN\r
+\r
+CC-B7-C4   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+CCB7C4     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+50-14-C1   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+5014C1     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+60-A2-C6   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+60A2C6     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+AC-3E-B1   (hex)               Google, Inc.\r
+AC3EB1     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
+F0-C7-45   (hex)               TECNO MOBILE LIMITED\r
+F0C745     (base 16)           TECNO MOBILE LIMITED\r
+                               ROOMS 05-15, 13A/F., SOUTH TOWER, WORLD FINANCE CENTRE, HARBOUR CITY, 17 CANTON ROAD, TSIM SHA TSUI, KOWLOON, HONG KONG\r
+                               Hong Kong  Hong Kong  999077\r
+                               HK\r
+\r
+B4-6D-C2   (hex)               SHENZHEN BILIAN ELECTRONIC CO.，LTD\r
+B46DC2     (base 16)           SHENZHEN BILIAN ELECTRONIC CO.，LTD\r
+                               NO.268? Fuqian Rd, Jutang community, Guanlan Town, Longhua New district\r
+                               shenzhen  guangdong  518000\r
+                               CN\r
+\r
+18-FA-B7   (hex)               Apple, Inc.\r
+18FAB7     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+70-22-FE   (hex)               Apple, Inc.\r
+7022FE     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+88-1E-5A   (hex)               Apple, Inc.\r
+881E5A     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+00-C5-85   (hex)               Apple, Inc.\r
+00C585     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+A8-7C-F8   (hex)               Apple, Inc.\r
+A87CF8     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+B8-D0-F0   (hex)               FCNT LMITED\r
+B8D0F0     (base 16)           FCNT LMITED\r
+                               Sanki Yamato Building, 7-10-1 Chuorinkan\r
+                               Yamato  Kanagawa  242-8588\r
+                               JP\r
+\r
+0C-AF-31   (hex)               Cisco Systems, Inc\r
+0CAF31     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+88-28-FB   (hex)               Juniper Networks\r
+8828FB     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+3C-58-5D   (hex)               Sagemcom Broadband SAS\r
+3C585D     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+38-95-92   (hex)               Tendyron Corporation\r
+389592     (base 16)           Tendyron Corporation\r
+                               1810,Tower B,Jin-ma,Building,17 East Qing Hua Road \r
+                               Beijing    100083\r
+                               CN\r
+\r
+4C-82-A9   (hex)               CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+4C82A9     (base 16)           CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.\r
+                               B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China\r
+                               Nanning  Guangxi  530007\r
+                               CN\r
+\r
+44-32-62   (hex)               zte corporation\r
+443262     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen   guangdong  518057\r
+                               CN\r
+\r
+F0-F6-9C   (hex)               NIO Co., Ltd.\r
+F0F69C     (base 16)           NIO Co., Ltd.\r
+                               Building 9, 889 Tianlin Road, Minhang District\r
+                               Shanghai  Shanghai  201804\r
+                               CN\r
+\r
+B0-6B-B3   (hex)               GRT\r
+B06BB3     (base 16)           GRT\r
+                               Unit 01, 10/F Carnival Comm BLDG 18 Java RD,North Point, Hong Kong\r
+                               Hong Kong    100036\r
+                               HK\r
+\r
+3C-FA-06   (hex)               Microsoft Corporation\r
+3CFA06     (base 16)           Microsoft Corporation\r
+                               One Microsoft Way\r
+                               REDMOND  WA  98052\r
+                               US\r
+\r
+58-E4-03   (hex)               Wistron Neweb Corporation\r
+58E403     (base 16)           Wistron Neweb Corporation\r
+                               No.20,Park Avenue II,Hsinchu Science Park\r
+                               Hsin-Chu  R.O.C.  308\r
+                               TW\r
+\r
+98-CC-D9   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
+98CCD9     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
+                               1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+64-D3-15   (hex)               HMD Global Oy\r
+64D315     (base 16)           HMD Global Oy\r
+                               Bertel Jungin aukio 9\r
+                               Espoo    02600\r
+                               FI\r
+\r
+E8-47-3A   (hex)               Hon Hai Precision Industry Co.,LTD\r
+E8473A     (base 16)           Hon Hai Precision Industry Co.,LTD\r
+                               66.Chung Shan RD, TU-CHENG Industrial , district new TAIPEI CITY,23678 , TAIWAN CHINA \r
+                               TAIPEI  66.Chung Shan RD, TU-CHENG Industrial , district new TAIPEI   33859\r
+                               CN\r
+\r
+D8-0E-29   (hex)               vivo Mobile Communication Co., Ltd.\r
+D80E29     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               No.1, vivo Road, Chang'an\r
+                               Dongguan  Guangdong  523860\r
+                               CN\r
+\r
+60-6D-9D   (hex)               Otto Bock Healthcare Products GmbH\r
+606D9D     (base 16)           Otto Bock Healthcare Products GmbH\r
+                               Brehmstraße 16\r
+                               Wien  Wien  1110\r
+                               AT\r
+\r
+FC-D5-D9   (hex)               Shenzhen SDMC Technology CO.,Ltd.\r
+FCD5D9     (base 16)           Shenzhen SDMC Technology CO.,Ltd.\r
+                               7/F,Block A,Huahan Bldg.,\r
+                               Shenzhen  GuangDong  518000\r
+                               CN\r
+\r
+58-58-CD   (hex)               Extreme Networks, Inc.\r
+5858CD     (base 16)           Extreme Networks, Inc.\r
+                               6480 Via Del Oro\r
+                               San Jose  CA  95119\r
+                               US\r
+\r
+10-BF-67   (hex)               Amazon Technologies Inc.\r
+10BF67     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102 \r
+                               Reno  NV  89507\r
+                               US\r
+\r
+D4-92-5E   (hex)               Technicolor Delivery Technologies Belgium NV\r
+D4925E     (base 16)           Technicolor Delivery Technologies Belgium NV\r
+                               Prins Boudewijnlaan 47\r
+                               Edegem - Belgium    B-2650\r
+                               BE\r
+\r
+00-09-41   (hex)               Allied Telesis K.K.\r
+000941     (base 16)           Allied Telesis K.K.\r
+                               Technical Center/No.2 TOC Bldg.\r
+                               Shinagawa-ku    141-0031\r
+                               US\r
+\r
+24-E1-24   (hex)               Xiamen Milesight IoT Co., Ltd.\r
+24E124     (base 16)           Xiamen Milesight IoT Co., Ltd.\r
+                               Building C09, Software Park Phase III\r
+                               Xiamen  Fujian  361024\r
+                               CN\r
+\r
+50-0B-26   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+500B26     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+50-41-72   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+504172     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+9C-B2-06   (hex)               HMS Industrial Networks\r
+9CB206     (base 16)           HMS Industrial Networks\r
+                               P O Box 4126 Halmstad Halland 300 04 SE\r
+                               Halland   Halmstad  300 04\r
+                               SE\r

diff --git a/hwdb.d/ma-medium.txt b/hwdb.d/ma-medium.txt
index 3c84424c58ceadd111849785f3da82e22126a792..74768655f4e1a064bee2abf62f6c62cf9497c7ca 100644 (file)
--- a/hwdb.d/ma-medium.txt
+++ b/hwdb.d/ma-medium.txt
@@ -3848,9 +3848,6 @@ F4-69-D5   (hex)          Rosco, Inc
                                Jamaica  NY  11435\r
                                US\r
 \r
-4C-93-A6   (hex)               Private\r
-500000-5FFFFF     (base 16)            Private\r
-\r
 4C-93-A6   (hex)               Diehl Controls Nanjing Co., Ltd.\r
 200000-2FFFFF     (base 16)            Diehl Controls Nanjing Co., Ltd.\r
                                Jiangjun Avenue 139\r
@@ -4979,12 +4976,6 @@ C4-A1-0E   (hex)         BARTEC PIXAVI AS
                                SANDNES  Rogaland  4313\r
                                NO\r
 \r
-C4-A1-0E   (hex)               HYOSUNG HEAVY INDUSTRIES\r
-000000-0FFFFF     (base 16)            HYOSUNG HEAVY INDUSTRIES\r
-                               119, Mapo-daero (Gongdeok-dong), Mapo-gu\r
-                               Seoul    04144\r
-                               KR\r
-\r
 C4-A1-0E   (hex)               Consolinno Energy GmbH\r
 300000-3FFFFF     (base 16)            Consolinno Energy GmbH\r
                                Franz-Mayer-Straße 1\r
@@ -5087,11 +5078,17 @@ B00000-BFFFFF     (base 16)             Labman Automation
                                Shanghai    China\r
                                CN\r
 \r
-88-5D-90   (hex)               IEEE Registration Authority\r
-F00000-FFFFFF     (base 16)            IEEE Registration Authority\r
-                               445 Hoes Lane\r
-                               PISCATAWAY  NJ  08854\r
-                               US\r
+2C-69-1D   (hex)               SPEEDTECH CORP.\r
+400000-4FFFFF     (base 16)            SPEEDTECH CORP.\r
+                               No. 568, Sec. 1, Minsheng N. Rd., Guishan Dist., Taoyuan City 338, Taiwan\r
+                               Taoyuan    338\r
+                               TW\r
+\r
+18-C3-F4   (hex)               Ningbo Yuda Communication Technology Co.,Ltd\r
+900000-9FFFFF     (base 16)            Ningbo Yuda Communication Technology Co.,Ltd\r
+                               No.2 Yuda Road,Fengshan Street,Yuyao\r
+                               Yuyao  Zhejiang  315400\r
+                               CN\r
 \r
 2C-69-1D   (hex)               IBM\r
 800000-8FFFFF     (base 16)            IBM\r
@@ -5099,10 +5096,196 @@ F00000-FFFFFF     (base 16)            IEEE Registration Authority
                                Tucson  AZ  85744\r
                                US\r
 \r
-2C-69-1D   (hex)               SPEEDTECH CORP.\r
-400000-4FFFFF     (base 16)            SPEEDTECH CORP.\r
-                               No. 568, Sec. 1, Minsheng N. Rd., Guishan Dist., Taoyuan City 338, Taiwan\r
-                               Taoyuan    338\r
+88-5D-90   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+                               445 Hoes Lane\r
+                               PISCATAWAY  NJ  08854\r
+                               US\r
+\r
+18-C3-F4   (hex)               HANGZHOU ZHONGKEJIGUANG TECHNOLOGY CO., LTD\r
+C00000-CFFFFF     (base 16)            HANGZHOU ZHONGKEJIGUANG TECHNOLOGY CO., LTD\r
+                               Room107, Building 2, No.600, 21 Street, ETDA,\r
+                               HANGZHOU  Zhejiang  310018\r
+                               CN\r
+\r
+88-3C-C5   (hex)               SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
+900000-9FFFFF     (base 16)            SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
+                               NO.8 Tangzhuang Road,Suzhou Industrial Park,Su ZhouCity,JiangSu Province,China\r
+                               Suzhou    215021\r
+                               CN\r
+\r
+88-3C-C5   (hex)               HDL da Amazônia Industria Eletrônica Ltda\r
+C00000-CFFFFF     (base 16)            HDL da Amazônia Industria Eletrônica Ltda\r
+                               Avenida Abiurana, 1150 - Distrito\r
+                               Manaus  MN  69075-010\r
+                               BR\r
+\r
+18-C3-F4   (hex)               VECTOR TECHNOLOGIES, LLC\r
+B00000-BFFFFF     (base 16)            VECTOR TECHNOLOGIES, LLC\r
+                               Razdolnaya str, 76bldg3\r
+                               Orel  Orel region  302038\r
+                               RU\r
+\r
+88-3C-C5   (hex)               Lenard Enterprises Inc\r
+D00000-DFFFFF     (base 16)            Lenard Enterprises Inc\r
+                               1211 Gorham St., Unit 3 Newmarket ON L3Y8Y3\r
+                                Newmarket  ON  L3Y8Y3\r
+                               CA\r
+\r
+58-47-CA   (hex)               Future Tech Development FZC LLC\r
+400000-4FFFFF     (base 16)            Future Tech Development FZC LLC\r
+                               A-64-00-01-01/2 - Flamingo Villas\r
+                               Ajman    00000\r
+                               AE\r
+\r
+58-47-CA   (hex)               LITUM BILGI TEKNOLOJILERI SAN. VE TIC. A.S.\r
+000000-0FFFFF     (base 16)            LITUM BILGI TEKNOLOJILERI SAN. VE TIC. A.S.\r
+                               ?evket Özçelik Sk. No:29 Kültür Mah. Litum Plaza\r
+                               IZMIR    35220\r
+                               TR\r
+\r
+58-47-CA   (hex)               Birger Engineering, Inc.\r
+800000-8FFFFF     (base 16)            Birger Engineering, Inc.\r
+                               42 Chauncy Street Suite 1A\r
+                               BOSTON  MA  02111\r
+                               US\r
+\r
+88-3C-C5   (hex)               myUpTech AB\r
+E00000-EFFFFF     (base 16)            myUpTech AB\r
+                               Box 14\r
+                               Markaryd    28532\r
+                               SE\r
+\r
+D4-20-00   (hex)               Zelus(HuangZhou) Technology Ltd.\r
+100000-1FFFFF     (base 16)            Zelus(HuangZhou) Technology Ltd.\r
+                               Room 601-602, Building 1, Liuhe Jinzuo, Xihu District, Hangzhou City, Zhejiang Province\r
+                               HuangZhou    310012\r
+                               CN\r
+\r
+D4-20-00   (hex)               Wattsense\r
+000000-0FFFFF     (base 16)            Wattsense\r
+                               Espace Ouest, 39 Chemin du Moulin Carron\r
+                               Dardilly    69570\r
+                               FR\r
+\r
+C4-A1-0E   (hex)               HYOSUNG Heavy Industries Corporation\r
+000000-0FFFFF     (base 16)            HYOSUNG Heavy Industries Corporation\r
+                               119, Mapo-daero (Gongdeok-dong), Mapo-gu\r
+                               Seoul    04144\r
+                               KR\r
+\r
+D4-20-00   (hex)               Annapurna labs\r
+700000-7FFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
+C4-83-72   (hex)               AI-RIDER CORPORATION\r
+200000-2FFFFF     (base 16)            AI-RIDER CORPORATION\r
+                               4F., NO.6, WENHU ST., NEIHU DIST.\r
+                               Taipei City    11445\r
+                               TW\r
+\r
+C4-83-72   (hex)               Annapurna labs\r
+D00000-DFFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
+C4-83-72   (hex)               ACCELECOM LTD.\r
+800000-8FFFFF     (base 16)            ACCELECOM LTD.\r
+                               10th Floor, Building 06, Tian 'an Digital City, 36 Yongfeng Avenue, Qinhuai District, Nanjing\r
+                               Nanjing  Jiangsu  210014\r
+                               CN\r
+\r
+C4-83-72   (hex)               care.ai\r
+B00000-BFFFFF     (base 16)            care.ai\r
+                               7300 Sandlake Road Suite 327\r
+                               Orlando  FL  32819\r
+                               US\r
+\r
+C4-98-94   (hex)               Neron Informatics Pvt Ltd\r
+A00000-AFFFFF     (base 16)            Neron Informatics Pvt Ltd\r
+                               PLOTE- 6, 2ND FLOOR, OPP. HDFC BANK ,SAGAR PLAZA KAUSHAMBI \r
+                               GHAZIABAD  Utter Pradesh  201010\r
+                               IN\r
+\r
+D0-96-86   (hex)               Annapurna labs\r
+500000-5FFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
+D0-96-86   (hex)               Changsha keruijie lnformation Technology Co.,Ltd\r
+B00000-BFFFFF     (base 16)            Changsha keruijie lnformation Technology Co.,Ltd\r
+                               Floor 3, building 5, North Yuemin lane, Xinmin Road, Juzizhou street, Yuelu District, Changsha\r
+                               Changsha    410000\r
+                               CN\r
+\r
+D0-96-86   (hex)               Energiekonzepte Deutschland GmbH\r
+800000-8FFFFF     (base 16)            Energiekonzepte Deutschland GmbH\r
+                               Straße des 17. Juni, 4a\r
+                               Taucha  Saxony  04425\r
+                               DE\r
+\r
+D0-96-86   (hex)               Houston Radar LLC\r
+400000-4FFFFF     (base 16)            Houston Radar LLC\r
+                               12818 Century Dr\r
+                               Stafford    77477\r
+                               US\r
+\r
+4C-74-A7   (hex)               ddcpersia\r
+D00000-DFFFFF     (base 16)            ddcpersia\r
+                               No:36 14St Vozara Ave Argantin Sq Tehran/Iran\r
+                               Tehran  Tehran  1511764311\r
+                               IR\r
+\r
+D4-61-37   (hex)               MUSASHI ENGINEERING,INC.\r
+C00000-CFFFFF     (base 16)            MUSASHI ENGINEERING,INC.\r
+                               8-7-4 SHIMORENJAKU\r
+                               MITAKA-SHI  TOKYO  181-0013\r
+                               JP\r
+\r
+F0-22-1D   (hex)               Schleissheimer Soft- und Hardwareentwicklung GmbH\r
+D00000-DFFFFF     (base 16)            Schleissheimer Soft- und Hardwareentwicklung GmbH\r
+                               Am Kalkofen 10\r
+                               Nieder-Woellstadt    61206\r
+                               DE\r
+\r
+F0-22-1D   (hex)               Estone Technology LTD\r
+C00000-CFFFFF     (base 16)            Estone Technology LTD\r
+                               2F,Building No.1, Jia'an Industrial Park,No.2 Long Chang Road, Bao'an\r
+                               Shenzhen   Guangdong  518101\r
+                               CN\r
+\r
+F0-22-1D   (hex)               THANHBINH COMPANY - E111 FACTORY\r
+000000-0FFFFF     (base 16)            THANHBINH COMPANY - E111 FACTORY\r
+                               Industrial Security, Lai Yen Ward\r
+                               Hanoi  Hoai Duc District  13200\r
+                               VN\r
+\r
+4C-93-A6   (hex)               Fastenal IP Company\r
+500000-5FFFFF     (base 16)            Fastenal IP Company\r
+                               2001 Theurer Blvd\r
+                               Winona  MN  55987\r
+                               US\r
+\r
+E0-38-2D   (hex)               Weishi Intelligent Information Technology (Guangzhou) Co., LTD\r
+500000-5FFFFF     (base 16)            Weishi Intelligent Information Technology (Guangzhou) Co., LTD\r
+                               Room 1402, No. 85, Xiangxue Avenue middle, Huangpu District\r
+                               Guangzhou  Guangdong  200233\r
+                               CN\r
+\r
+E0-38-2D   (hex)               Qingdao Unovo Technologies Co., Ltd\r
+400000-4FFFFF     (base 16)            Qingdao Unovo Technologies Co., Ltd\r
+                               8#-1 Household of Liandong U Valley Industrial Park\r
+                               Qingdao  Shandong  266100\r
+                               CN\r
+\r
+F0-22-1D   (hex)               oToBrite Electronics, Inc.\r
+E00000-EFFFFF     (base 16)            oToBrite Electronics, Inc.\r
+                               6F, No.18, Prosperity Rd. II, Science-Based Industrial Park\r
+                               Hsinchu    30078\r
                                TW\r
 \r
 4C-4B-F9   (hex)               Shenzhen dingsheng technology co., LTD\r
@@ -6119,12 +6302,6 @@ B00000-BFFFFF     (base 16)              Synaccess Networks
                                San Jose  CA  95131\r
                                US\r
 \r
-0C-73-EB   (hex)               Pi Innovo LLC\r
-A00000-AFFFFF     (base 16)            Pi Innovo LLC\r
-                               47023 Five Mile Rd\r
-                               Plymouth  MI  48170\r
-                               US\r
-\r
 3C-24-F0   (hex)               Inter Action Corporation\r
 600000-6FFFFF     (base 16)            Inter Action Corporation\r
                                14F,Yokohama-Kanazawa High-Tech Center,1-1,\r
@@ -9035,12 +9212,6 @@ A00000-AFFFFF     (base 16)              Nanjing BianYu Future Home Technology Co.Ltd
                                Bangalore  Karnataka  560102\r
                                IN\r
 \r
-E8-6C-C7   (hex)               Huaqin Technology Co.,Ltd\r
-700000-7FFFFF     (base 16)            Huaqin Technology Co.,Ltd\r
-                               No. 10 Keyuan Road, Songshan Lake\r
-                               Dongguan  Guangdong  523808\r
-                               CN\r
-\r
 04-11-19   (hex)               Acentury\r
 100000-1FFFFF     (base 16)            Acentury\r
                                120 West Beaver Creek Road, Unit 13\r
@@ -9959,12 +10130,6 @@ FC-61-79   (hex)                Kvaliteta Systems and Solutions Private Limited
                                Shenzhen  Guangdong  518100\r
                                CN\r
 \r
-2C-69-1D   (hex)               Panasonic Appliances Marketing Asia Pacific (A division of Panasonic Malaysia Sdn Bhd\r
-A00000-AFFFFF     (base 16)            Panasonic Appliances Marketing Asia Pacific (A division of Panasonic Malaysia Sdn Bhd\r
-                               Lot 10, Jalan 13/2 \r
-                               Petaling Jaya   Selangor  46200\r
-                               MY\r
-\r
 30-3D-51   (hex)               TalkGo, Inc.\r
 C00000-CFFFFF     (base 16)            TalkGo, Inc.\r
                                3518 Fremont Ave N#473\r
@@ -9977,6 +10142,180 @@ C00000-CFFFFF     (base 16)            TalkGo, Inc.
                                Munich    80333\r
                                DE\r
 \r
+2C-69-1D   (hex)               Panasonic Appliances Marketing Asia Pacific\r
+A00000-AFFFFF     (base 16)            Panasonic Appliances Marketing Asia Pacific\r
+                               Lot 10, Jalan 13/2 \r
+                               Petaling Jaya   Selangor  46200\r
+                               MY\r
+\r
+88-3C-C5   (hex)               Wuhan Guangying Intelligence Technology Co., Ltd\r
+800000-8FFFFF     (base 16)            Wuhan Guangying Intelligence Technology Co., Ltd\r
+                               Optics Valley High tech building, No. 2, Jiayuan Road, Hongshan District, Wuhan\r
+                               Wuhan  HuBei  430074\r
+                               CN\r
+\r
+18-C3-F4   (hex)               Changsha Kiloview Electronics Co., Ltd.\r
+200000-2FFFFF     (base 16)            Changsha Kiloview Electronics Co., Ltd.\r
+                               B4-106/109, Jiahua Intelligence Valley Industrial Park, 877 Huijin Road, Yuhua District\r
+                               Changsha  Hunan  410001\r
+                               CN\r
+\r
+18-C3-F4   (hex)               VeriFone Systems (China), Inc.\r
+600000-6FFFFF     (base 16)            VeriFone Systems (China), Inc.\r
+                               Ine.2nd  Floor,No 39,Region  C,Tongpan Road,Gulou District\r
+                               Fuzhou  Fujian  350000\r
+                               CN\r
+\r
+E8-6C-C7   (hex)               Huaqin Technology Co.,Ltd.\r
+700000-7FFFFF     (base 16)            Huaqin Technology Co.,Ltd.\r
+                               No. 10 Keyuan Road, Songshan Lake\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+88-3C-C5   (hex)               Hanwei Electronics Group Corporation\r
+100000-1FFFFF     (base 16)            Hanwei Electronics Group Corporation\r
+                               No.169,Xue Song Road National Hi-Tech Zone\r
+                               Zhengzhou  Henan  450001\r
+                               CN\r
+\r
+88-3C-C5   (hex)               mfJebsen Electronics Ltd.\r
+600000-6FFFFF     (base 16)            mfJebsen Electronics Ltd.\r
+                               RM2509, Island Place Tower510 King's Road, North Point\r
+                               Hong Kong    999077\r
+                               HK\r
+\r
+58-47-CA   (hex)               Hexagon Metrology Services Ltd.\r
+100000-1FFFFF     (base 16)            Hexagon Metrology Services Ltd.\r
+                               Metrology House, Halesfield 13\r
+                               Telford    TF7 4PL\r
+                               GB\r
+\r
+D4-20-00   (hex)               Dalian Baishengyuan Technology Co.,Ltd\r
+800000-8FFFFF     (base 16)            Dalian Baishengyuan Technology Co.,Ltd\r
+                               3 F, Block A, no.3 Kehai Street, Dalian High-tech Industrial Park, Liaoning Province\r
+                               Dalian    116023\r
+                               CN\r
+\r
+0C-73-EB   (hex)               Dana\r
+A00000-AFFFFF     (base 16)            Dana\r
+                               3939 Technology Drive\r
+                               Maumee  OH  43537\r
+                               US\r
+\r
+D4-20-00   (hex)               Shenzhen Volt IoT technology co.,ltd.\r
+B00000-BFFFFF     (base 16)            Shenzhen Volt IoT technology co.,ltd.\r
+                               Room 902, Building B, Industry-University-Research Building, Wuhan University, Yuehai Street, Nanshan District, Shenzhen\r
+                               Shenzhen  guangdong  518054\r
+                               CN\r
+\r
+C4-83-72   (hex)               NextSilicon\r
+300000-3FFFFF     (base 16)            NextSilicon\r
+                               Derekh Begin 33\r
+                               Gibatayim    5348303\r
+                               IL\r
+\r
+C4-83-72   (hex)               Suzhou LZY technology Co.,Ltd\r
+E00000-EFFFFF     (base 16)            Suzhou LZY technology Co.,Ltd\r
+                               No.88,Yandangshan Road,New district,Suzhou\r
+                               Suzhou  Jiangsu  215153\r
+                               CN\r
+\r
+C4-98-94   (hex)               BTL Industries JSC\r
+300000-3FFFFF     (base 16)            BTL Industries JSC\r
+                               str. Tsar Kaloyan 8\r
+                               Sofia  Sofia  1000\r
+                               BG\r
+\r
+C4-98-94   (hex)               Shenzhen  Hexin Automation Technology Co.,Ltd.\r
+900000-9FFFFF     (base 16)            Shenzhen  Hexin Automation Technology Co.,Ltd.\r
+                               Room 402, Building 7, Hanwei International Zone 2, No. 186, South Fourth Ring West Road, Fengtai District,\r
+                               beijing    100160\r
+                               CN\r
+\r
+C4-98-94   (hex)               Pliem (Shanghai) Intelligent Technology Co., Ltd\r
+800000-8FFFFF     (base 16)            Pliem (Shanghai) Intelligent Technology Co., Ltd\r
+                               Room 508, No. 9, Lane 205, Gaoji Road, Songjiang District\r
+                               Shanghai  Shanghai  201601\r
+                               CN\r
+\r
+C4-98-94   (hex)               Metasphere Ltd\r
+200000-2FFFFF     (base 16)            Metasphere Ltd\r
+                               Metasphere LtdMillfieldDorking Road\r
+                               Tadworth  Surrey  KT20 7TD\r
+                               GB\r
+\r
+C4-98-94   (hex)               Zhejiang Rexense loT Technology Co., Ltd\r
+C00000-CFFFFF     (base 16)            Zhejiang Rexense loT Technology Co., Ltd\r
+                               6th floor, building 4, No. 6, Longzhou Road, Yuhang District\r
+                               Hangzhou  Zhejiang  311121\r
+                               CN\r
+\r
+C4-98-94   (hex)               Hans Sasserath GmbH & Co. KG\r
+E00000-EFFFFF     (base 16)            Hans Sasserath GmbH & Co. KG\r
+                               Mühlenstraße 62\r
+                               Korschenbroich    41352\r
+                               DE\r
+\r
+D0-96-86   (hex)               Hero Health Inc.\r
+A00000-AFFFFF     (base 16)            Hero Health Inc.\r
+                               85 Broad St. 17th Floor\r
+                               New York  NY  10004\r
+                               US\r
+\r
+D0-96-86   (hex)               SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
+000000-0FFFFF     (base 16)            SERNET (SUZHOU) TECHNOLOGIES CORPORATION\r
+                               NO.8 Tangzhuang Road,Suzhou Industrial Park,Su ZhouCity,JiangSu Province,China\r
+                               Suzhou    215021\r
+                               CN\r
+\r
+4C-74-A7   (hex)               Annapurna labs\r
+800000-8FFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
+D4-61-37   (hex)               Wistron Corporation\r
+000000-0FFFFF     (base 16)            Wistron Corporation\r
+                                NO.5, HSIN AN ROAD, SCIENCE-BASED INDUSTRIAL PARK, HSINCHU, TAIWAN, R.O.C.\r
+                               Hsinchu County  Taiwan  303036\r
+                               TW\r
+\r
+D4-61-37   (hex)               Estelle AB\r
+500000-5FFFFF     (base 16)            Estelle AB\r
+                               Sveavägen 124\r
+                               Stockholm  -  113 50\r
+                               SE\r
+\r
+F0-22-1D   (hex)               Vcognition Technologies Inc.\r
+600000-6FFFFF     (base 16)            Vcognition Technologies Inc.\r
+                               12901 Nicholson RdSte 150\r
+                               Farmers Branch  TX  75234\r
+                               US\r
+\r
+F0-22-1D   (hex)               ShenZhen Shizao Electronic Technology\r
+300000-3FFFFF     (base 16)            ShenZhen Shizao Electronic Technology\r
+                               NO.8 RuiYuan Road, Bo Gang SongShan Industrial Zone, ShaJing, Bao'an District, ShenZhen, P.R.China\r
+                               ShenZhen  Guangdong  518100\r
+                               CN\r
+\r
+F0-22-1D   (hex)               Synergies Intelligent Systems Inc.\r
+400000-4FFFFF     (base 16)            Synergies Intelligent Systems Inc.\r
+                               11F, Number 277, Songren Rd, Xinyi District, Taipei City, Taiwan 110 \r
+                               Taipei  Taiwan  101\r
+                               TW\r
+\r
+E0-38-2D   (hex)               SERCOMM PHILIPPINES INC\r
+B00000-BFFFFF     (base 16)            SERCOMM PHILIPPINES INC\r
+                               Lot 1 & 5, Phase 1, Filinvest Technology Park 1, Brgy. Punta, Calamba City\r
+                               Calamba    Lot 1\r
+                               PH\r
+\r
+E0-38-2D   (hex)               Famar Fueguina S.A.\r
+700000-7FFFFF     (base 16)            Famar Fueguina S.A.\r
+                               Rodney 70\r
+                               Buenos Aires    1427\r
+                               AR\r
+\r
 20-85-93   (hex)               UNILUMIN GROUP CO.,LTD\r
 300000-3FFFFF     (base 16)            UNILUMIN GROUP CO.,LTD\r
                                No.112 Yongfu Rd.,BaoanDistrict,\r
@@ -10367,9 +10706,6 @@ E00000-EFFFFF     (base 16)             ShenZhen Arts Changhua Intelligent Technology Co.,
                                Shenzhen  Guangdong  518057\r
                                CN\r
 \r
-8C-C8-F4   (hex)               Private\r
-700000-7FFFFF     (base 16)            Private\r
-\r
 D8-86-0B   (hex)               Get SAT\r
 200000-2FFFFF     (base 16)            Get SAT\r
                                Hamada 12\r
@@ -10619,9 +10955,6 @@ D00000-DFFFFF     (base 16)             Sixth Energy Technologies Private Limited
                                Granada Hills  CA  91344-4502\r
                                US\r
 \r
-30-0A-60   (hex)               Private\r
-300000-3FFFFF     (base 16)            Private\r
-\r
 30-0A-60   (hex)               KAZUtechnica Co.,Ltd.\r
 000000-0FFFFF     (base 16)            KAZUtechnica Co.,Ltd.\r
                                1-9-18,Chuo,Chuo-ku\r
@@ -13172,9 +13505,6 @@ B00000-BFFFFF     (base 16)             Advice
                                Kfar Saba  Not applicable  4464321\r
                                IL\r
 \r
-10-DC-B6   (hex)               Private\r
-000000-0FFFFF     (base 16)            Private\r
-\r
 54-A4-93   (hex)               Wonders Technology Co., Ltd.\r
 A00000-AFFFFF     (base 16)            Wonders Technology Co., Ltd.\r
                                4/F,Tower A,3rd Building,Tian'an Cloud Park,Bantian Avenue,Longgang District\r
@@ -14684,9 +15014,6 @@ A00000-AFFFFF     (base 16)             ShenZhen Beide Technology Co.,LTD
                                ShenZhen  GuangDong  518000\r
                                CN\r
 \r
-94-C9-B7   (hex)               Private\r
-900000-9FFFFF     (base 16)            Private\r
-\r
 94-C9-B7   (hex)               shenzhen UDD Technologies,co.,Ltd\r
 E00000-EFFFFF     (base 16)            shenzhen UDD Technologies,co.,Ltd\r
                                Unit D, 6th Floor, Jialitai Bldg., No.45 Yanshan Road, Shekou, Nanshan District, Shenzhen, China\r
@@ -15137,64 +15464,334 @@ E00000-EFFFFF     (base 16)          Percent.com
                                Dhaka  Dhaka  1000\r
                                BD\r
 \r
-98-02-D8   (hex)               IEEE Registration Authority\r
-F00000-FFFFFF     (base 16)            IEEE Registration Authority\r
-                               445 Hoes Lane\r
-                               PISCATAWAY  NJ  08854\r
-                               US\r
-\r
-2C-69-1D   (hex)               Sunsa, Inc\r
-300000-3FFFFF     (base 16)            Sunsa, Inc\r
-                               3422 Fait Ave\r
-                               Baltimore  MD  21224\r
-                               US\r
-\r
 2C-69-1D   (hex)               SHENZHEN EX-LINK TECHNOLOGY CO.,LTD\r
 900000-9FFFFF     (base 16)            SHENZHEN EX-LINK TECHNOLOGY CO.,LTD\r
                                818 Building 2,Nanyou Fourth Industrial Zone,No 1124 ,Nanshan Avenue,Nanguang Community,Nanshan Street,Nanshan District,Shenzhen\r
                                SHENZHEN  GUANGDONG  518052\r
                                CN\r
 \r
-2C-69-1D   (hex)               Aparian, Inc.\r
-C00000-CFFFFF     (base 16)            Aparian, Inc.\r
-                               2709 S Orange AveUnit D\r
-                               Santa Ana  CA  92707\r
+10-DC-B6   (hex)               Apex Supply Chain Technologies\r
+000000-0FFFFF     (base 16)            Apex Supply Chain Technologies\r
+                               4393 Digital Way\r
+                               Mason  OH  45040\r
                                US\r
 \r
+2C-69-1D   (hex)               Chengdu Qianhong Communication Co., Ltd.\r
+E00000-EFFFFF     (base 16)            Chengdu Qianhong Communication Co., Ltd.\r
+                               NO.666, XINGYE ROAD, EAST INDUSTRIAL AREA, XINDU DISTRICT, CHENGDU CITY, CHINA\r
+                               Chengdu  SICHUAN  610599\r
+                               CN\r
+\r
+30-0A-60   (hex)               Intergard do Brasil Ind e Com de Eletr e Mec Ltda\r
+300000-3FFFFF     (base 16)            Intergard do Brasil Ind e Com de Eletr e Mec Ltda\r
+                               Avenida Capitao Casa 1485\r
+                               São Bernardo do Campo  Sao Paulo  09812000\r
+                               BR\r
+\r
 2C-69-1D   (hex)               Carnegie Robotics\r
 600000-6FFFFF     (base 16)            Carnegie Robotics\r
                                4501 Hatfield Street\r
                                Pittsburgh  PA  15201\r
                                US\r
 \r
-4C-4B-F9   (hex)               Shandong Linkotech Electronic Co., Ltd.\r
-600000-6FFFFF     (base 16)            Shandong Linkotech Electronic Co., Ltd.\r
-                               22nd Floor, Building 2, Aosheng Building, No.1166 Xinyi Street, High-tech Zone\r
-                               Jinan  Shandong  250101\r
-                               CN\r
+2C-69-1D   (hex)               Aparian, Inc.\r
+C00000-CFFFFF     (base 16)            Aparian, Inc.\r
+                               2709 S Orange AveUnit D\r
+                               Santa Ana  CA  92707\r
+                               US\r
 \r
-4C-4B-F9   (hex)               Power Active Co., Ltd\r
-300000-3FFFFF     (base 16)            Power Active Co., Ltd\r
-                               4F, No.23, Wugong 6th Rd., Wugu Dist.\r
-                               New Taipei City    248\r
-                               TW\r
+2C-69-1D   (hex)               Sunsa, Inc\r
+300000-3FFFFF     (base 16)            Sunsa, Inc\r
+                               3422 Fait Ave\r
+                               Baltimore  MD  21224\r
+                               US\r
 \r
-4C-4B-F9   (hex)               Multitek Elektronik Sanayi ve Ticaret A.S.\r
-000000-0FFFFF     (base 16)            Multitek Elektronik Sanayi ve Ticaret A.S.\r
-                               Meclis Mah. Ataturk Cad. No:47, sancaktepe\r
-                               istanbul    34785\r
-                               TR\r
+18-C3-F4   (hex)               Shenzhen Yunlianxin Technology Co., Ltd.\r
+A00000-AFFFFF     (base 16)            Shenzhen Yunlianxin Technology Co., Ltd.\r
+                               Room 601, Building 3, Xinzhongtai Industrial Park, Hengfeng Community, Yousong Community, Longhua Street, Longhua District, Shenzhen, Guangdong, China\r
+                               Shenzhen  guangdong  518000\r
+                               CN\r
 \r
-20-85-93   (hex)               Mid Continent Controls, Inc.\r
-200000-2FFFFF     (base 16)            Mid Continent Controls, Inc.\r
-                               901 North River Street\r
-                               Derby  KS  67037\r
+18-C3-F4   (hex)               Annapurna labs\r
+400000-4FFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
+8C-C8-F4   (hex)               TableSafe\r
+700000-7FFFFF     (base 16)            TableSafe\r
+                               12220 113th Ave NE, Suite 220\r
+                               Kirkland  WA  98034\r
                                US\r
 \r
-34-04-9E   (hex)               Connected IO\r
-100000-1FFFFF     (base 16)            Connected IO\r
-                               573 University Ave\r
-                               Los Gatos  CA  95032\r
+98-02-D8   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+                               445 Hoes Lane\r
+                               PISCATAWAY  NJ  08854\r
+                               US\r
+\r
+18-C3-F4   (hex)               Shenzhen C & D Electronics Co., Ltd.\r
+D00000-DFFFFF     (base 16)            Shenzhen C & D Electronics Co., Ltd.\r
+                               9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District\r
+                               ShenZhen  GuangDong  518000\r
+                               CN\r
+\r
+18-C3-F4   (hex)               Shenzhen Yecon-Tech Co.,Ltd.\r
+700000-7FFFFF     (base 16)            Shenzhen Yecon-Tech Co.,Ltd.\r
+                               Building 2,Cuigang Industrial Zone 6,Huaide Community,Fuyong Town,Baoan District, Shenzhen City, Guangdong province, China\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+88-3C-C5   (hex)               Shenzhen shijia chuangxin Technology Co., Ltd\r
+B00000-BFFFFF     (base 16)            Shenzhen shijia chuangxin Technology Co., Ltd\r
+                               Room 301, Building A, Comprehensive Building, Jinlaiwang Industrial Park, No. 7, Jiayi Industrial Park, Guixiang Community, Guanlan Street, Longhua District, Shenzhen\r
+                               SHENZHEN    51800\r
+                               CN\r
+\r
+88-3C-C5   (hex)               Swabian Instruments GmbH\r
+400000-4FFFFF     (base 16)            Swabian Instruments GmbH\r
+                               Stammheimer Str. 41\r
+                               Stuttgart  BW  70435\r
+                               DE\r
+\r
+58-47-CA   (hex)               Suzhou Laisai Intelligence Technology Co.,Ltd\r
+B00000-BFFFFF     (base 16)            Suzhou Laisai Intelligence Technology Co.,Ltd\r
+                               No.59 Jiangnan Avenue\r
+                               Changshu  Jiangsu  215500\r
+                               CN\r
+\r
+58-47-CA   (hex)               Powder Watts, LLC\r
+A00000-AFFFFF     (base 16)            Powder Watts, LLC\r
+                               2750 Rasmussen RoadSuite 107\r
+                               Park City  UT  84098\r
+                               US\r
+\r
+88-3C-C5   (hex)               Corigine,Inc.\r
+A00000-AFFFFF     (base 16)            Corigine,Inc.\r
+                               Room202 ,west side of 2nd floor,Building 1,1516 Hongfeng Road\r
+                               Huzhou  Zhejiang  313000 \r
+                               CN\r
+\r
+D4-20-00   (hex)               EVOC VIN Technology Co.,Ltd\r
+400000-4FFFFF     (base 16)            EVOC VIN Technology Co.,Ltd\r
+                               Room 101?Evoc Technology Building?No.31 Gaoxin Central Avenue 4th Road?Nanshan District\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+58-47-CA   (hex)               SMS ELECTRIC CO., LTD ZHENGZHOU\r
+C00000-CFFFFF     (base 16)            SMS ELECTRIC CO., LTD ZHENGZHOU\r
+                               SMS Industrial Park at NO. 85 Fifth Avenue, Economic and Technical Development\r
+                               ZhengZhou  HeNan  450000\r
+                               CN\r
+\r
+D4-20-00   (hex)               Gentec Systems  Co.\r
+C00000-CFFFFF     (base 16)            Gentec Systems  Co.\r
+                               5F., No.51-3, Fuxing Rd., Xindian Dist., \r
+                               New Taipei City     23150\r
+                               TW\r
+\r
+C4-83-72   (hex)               clk2.inc\r
+700000-7FFFFF     (base 16)            clk2.inc\r
+                               #B1, dobong-ro 121gil, dobong-guseoul, korea\r
+                               seoul  seoul  14440\r
+                               KR\r
+\r
+C4-83-72   (hex)               Acenew technology(shenzhen) limited company\r
+C00000-CFFFFF     (base 16)            Acenew technology(shenzhen) limited company\r
+                               Room 706,7th Floor,Building G2,TCL International City E,No.1001,Zhongshanyuan Road,Nanshan District,\r
+                               Shenzhen    518055\r
+                               CN\r
+\r
+D4-20-00   (hex)               RPUSI Communication Technology  Co.,Ltd.\r
+E00000-EFFFFF     (base 16)            RPUSI Communication Technology  Co.,Ltd.\r
+                               Room 610,Building 1,No.423,Wuning Road,Putuo Dist\r
+                               Shanghai    200036\r
+                               CN\r
+\r
+D4-20-00   (hex)               ZUUM\r
+D00000-DFFFFF     (base 16)            ZUUM\r
+                               4321 W Sam Houston Pkwy N Ste 120\r
+                               Houston  TX  77043\r
+                               US\r
+\r
+C4-83-72   (hex)               Netplus Co., Ltd.\r
+600000-6FFFFF     (base 16)            Netplus Co., Ltd.\r
+                               #504 3-1-1 Oguradai\r
+                               Inzai-shi  Chiba-ken  2701356\r
+                               JP\r
+\r
+D4-BA-BA   (hex)               Rusatom Automated Control Systems, Joint-Stock Company\r
+C00000-CFFFFF     (base 16)            Rusatom Automated Control Systems, Joint-Stock Company\r
+                               Kashirskoe shosse 3, korpus 2, stroenie 16\r
+                               Moscow    115230\r
+                               RU\r
+\r
+D4-BA-BA   (hex)               Annapurna labs\r
+100000-1FFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
+D4-BA-BA   (hex)               Shenzhen Chuangyou Acoustic Technology Co., Ltd.\r
+900000-9FFFFF     (base 16)            Shenzhen Chuangyou Acoustic Technology Co., Ltd.\r
+                               Room 1205, Office Building, No. 4, Chongwen Garden, No. 1, Tangling Road, Fuguang Community, Taoyuan Street, Nanshan District\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               Shenzhen Pu Ying Innovation Technology Corporation Limited\r
+300000-3FFFFF     (base 16)            Shenzhen Pu Ying Innovation Technology Corporation Limited\r
+                               Hong Tu Industrial Park, Block 3, 3/F, Hezhou, Bao An,\r
+                               Shenzhen  Guangdong  518102\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               Chengdu Ba SAN SI YI Information Technology Co., LTD\r
+800000-8FFFFF     (base 16)            Chengdu Ba SAN SI YI Information Technology Co., LTD\r
+                               (Xihanggang Science and Technology Enterprise Incubation Center),No. 2, Section 4, Xihanggang Avenue, Industrial Concentration Area, Southwest Airport Economic Development Zone, Shuangliu District, Chengdu City, China (Sichuan) Pilot Free Trade Zone\r
+                               Chengdu    250100\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               ReeR SpA\r
+500000-5FFFFF     (base 16)            ReeR SpA\r
+                               via carcano 32\r
+                               torino    10153\r
+                               IT\r
+\r
+D4-BA-BA   (hex)               AADONA Communication Pvt Ltd\r
+D00000-DFFFFF     (base 16)            AADONA Communication Pvt Ltd\r
+                               1st Floor, Phoenix Tech Tower, Plot No. 14/46, IDA - Uppal\r
+                               Hyderabad   Telangana  500039\r
+                               IN\r
+\r
+C4-98-94   (hex)               SEAVIEW TELECOM\r
+100000-1FFFFF     (base 16)            SEAVIEW TELECOM\r
+                               21st Floor, Block B-1, Building 9, Shenzhen Bay Science and Technology Ecological Park, Nanshan District\r
+                               shenzhen    518000\r
+                               CN\r
+\r
+D0-96-86   (hex)               Shenzhen Ntmer Technology Co., Ltd.\r
+600000-6FFFFF     (base 16)            Shenzhen Ntmer Technology Co., Ltd.\r
+                               2109, Haowei Science and Technology Building, No. 2, Keji South 8th Road, High-tech Zone, Yuehai Street, Nanshan District, Shenzhen, CN, 518000\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+D0-96-86   (hex)               EPHI B.V.\r
+300000-3FFFFF     (base 16)            EPHI B.V.\r
+                               Ondernemingenweg 26\r
+                               Eindhoven    5627 BV\r
+                               NL\r
+\r
+4C-74-A7   (hex)               Suzhou XiongLi Technology Inc.\r
+900000-9FFFFF     (base 16)            Suzhou XiongLi Technology Inc.\r
+                               Unit E502-1, International Science and Technology Park, No. 1355 Jinjihu Avenue, Suzhou Industrial Park\r
+                               Suzhou  Jiangsu  215000\r
+                               CN\r
+\r
+4C-74-A7   (hex)               Shenzhen Timekettle Technologies Co.,Ltd\r
+000000-0FFFFF     (base 16)            Shenzhen Timekettle Technologies Co.,Ltd\r
+                               Room 612, Building 4, Minqi Science Park, No. 65 Lishan Road, Pingshan Community, Taoyuan Street, Nanshan District, \r
+                               Shenzhen  Guangdong  518071\r
+                               CN\r
+\r
+4C-74-A7   (hex)               Wuxi Micro Innovation Integrated Circuit Design Co., Ltd\r
+400000-4FFFFF     (base 16)            Wuxi Micro Innovation Integrated Circuit Design Co., Ltd\r
+                               12th Floor A3 Building, No. 777, West Jianzhu Road, Binhu District, Wuxi City, Jiangsu Province\r
+                               Jiangsu    214028\r
+                               CN\r
+\r
+94-C9-B7   (hex)               Private\r
+900000-9FFFFF     (base 16)            Private\r
+                               35F, Shenzhen Bay VC&PE Bldg, No.25, Haitian 2nd Rd, Binhai  Comm, Yuehai St., Nanshan Dist, Shenzhen\r
+                               shenzhen  guangdong  518000\r
+                               CN\r
+\r
+D4-61-37   (hex)               Beijing Digital China Yunke Technology Limited\r
+800000-8FFFFF     (base 16)            Beijing Digital China Yunke Technology Limited\r
+                               R301, 3F, NO9, shangdi 9th street, haidian district, beijing\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
+4C-74-A7   (hex)               COREIP TECHNOLOGY PRIVATE LIMITED\r
+700000-7FFFFF     (base 16)            COREIP TECHNOLOGY PRIVATE LIMITED\r
+                               C-421, The iTHUM, Sector 62\r
+                               Noida    201309\r
+                               IN\r
+\r
+4C-74-A7   (hex)               RAONARK\r
+A00000-AFFFFF     (base 16)            RAONARK\r
+                               121, Digital-ro\r
+                               Geumcheon-gu  Seoul  08505\r
+                               KR\r
+\r
+D4-61-37   (hex)               Shenzhen Xunjie International Trade Co., LTD\r
+A00000-AFFFFF     (base 16)            Shenzhen Xunjie International Trade Co., LTD\r
+                               29e, Room 29E, Block B, NEO Greenview Plaza\r
+                               No. 6009 Shennan Avenue, Tianan Community, Shatou Street, Futian District  Shenzhen, Guangdong  518000\r
+                               CN\r
+\r
+D4-61-37   (hex)               IPTECHVIEW\r
+D00000-DFFFFF     (base 16)            IPTECHVIEW\r
+                               13988 Diplomat Dr.Suite 180\r
+                               Dallas  TX  75234\r
+                               US\r
+\r
+F0-22-1D   (hex)               Dr. Eberl MBE Komponenten GmbH\r
+100000-1FFFFF     (base 16)            Dr. Eberl MBE Komponenten GmbH\r
+                               Josef-Beyerle-Strasse 18/1\r
+                               Weil der Stadt  Baden-Württemberg  71263\r
+                               DE\r
+\r
+F0-22-1D   (hex)               LK Systems AB\r
+B00000-BFFFFF     (base 16)            LK Systems AB\r
+                               Lockarpsvägen 5\r
+                               Malmo    21376\r
+                               SE\r
+\r
+E0-38-2D   (hex)               4D Photonics GmbH\r
+A00000-AFFFFF     (base 16)            4D Photonics GmbH\r
+                               Im Torfstich 5\r
+                               Isernhagen    30916\r
+                               DE\r
+\r
+E0-38-2D   (hex)               KEPLER COMMUNICATIONS INC.\r
+D00000-DFFFFF     (base 16)            KEPLER COMMUNICATIONS INC.\r
+                               196 Spadina Avenue, Suite 400\r
+                               Toronto  ON  M5T 2C2\r
+                               CA\r
+\r
+E0-38-2D   (hex)               Velvac Incorporated\r
+900000-9FFFFF     (base 16)            Velvac Incorporated\r
+                               2405 S. Calhoun Road\r
+                               New Berlin  WI  53151-2709\r
+                               US\r
+\r
+4C-4B-F9   (hex)               Shandong Linkotech Electronic Co., Ltd.\r
+600000-6FFFFF     (base 16)            Shandong Linkotech Electronic Co., Ltd.\r
+                               22nd Floor, Building 2, Aosheng Building, No.1166 Xinyi Street, High-tech Zone\r
+                               Jinan  Shandong  250101\r
+                               CN\r
+\r
+4C-4B-F9   (hex)               Power Active Co., Ltd\r
+300000-3FFFFF     (base 16)            Power Active Co., Ltd\r
+                               4F, No.23, Wugong 6th Rd., Wugu Dist.\r
+                               New Taipei City    248\r
+                               TW\r
+\r
+4C-4B-F9   (hex)               Multitek Elektronik Sanayi ve Ticaret A.S.\r
+000000-0FFFFF     (base 16)            Multitek Elektronik Sanayi ve Ticaret A.S.\r
+                               Meclis Mah. Ataturk Cad. No:47, sancaktepe\r
+                               istanbul    34785\r
+                               TR\r
+\r
+20-85-93   (hex)               Mid Continent Controls, Inc.\r
+200000-2FFFFF     (base 16)            Mid Continent Controls, Inc.\r
+                               901 North River Street\r
+                               Derby  KS  67037\r
+                               US\r
+\r
+34-04-9E   (hex)               Connected IO\r
+100000-1FFFFF     (base 16)            Connected IO\r
+                               573 University Ave\r
+                               Los Gatos  CA  95032\r
                                US\r
 \r
 24-15-10   (hex)               Topgolf Sweden AB\r
@@ -15233,9 +15830,6 @@ A00000-AFFFFF     (base 16)             Angora Networks
 64-FB-81   (hex)               Private\r
 F00000-FFFFFF     (base 16)            Private\r
 \r
-78-C2-C0   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
 58-FC-DB   (hex)               Private\r
 F00000-FFFFFF     (base 16)            Private\r
 \r
@@ -15473,9 +16067,6 @@ D00000-DFFFFF     (base 16)             Rollock Oy
                                Kajaani    87700\r
                                FI\r
 \r
-BC-34-00   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
 1C-82-59   (hex)               Shandong Luneng Intelligence Technology CO., Ltd\r
 000000-0FFFFF     (base 16)            Shandong Luneng Intelligence Technology CO., Ltd\r
                                Shandong Jinan Hightech zone Yinhe building block B, 2008 Xinluo Street\r
@@ -15560,9 +16151,6 @@ C00000-CFFFFF     (base 16)             Haltian Products Oy
                                Oulu    90230\r
                                FI\r
 \r
-80-7B-85   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
 E4-1E-0A   (hex)               IDvaco Private Limited\r
 200000-2FFFFF     (base 16)            IDvaco Private Limited\r
                                Aljunied road, 627A,06-02\r
@@ -18671,9 +19259,6 @@ F4-90-CB   (hex)                Beijing Penslink Co., Ltd.
                                Beijing  Beijing  100102\r
                                CN\r
 \r
-F4-90-CB   (hex)               Private\r
-A00000-AFFFFF     (base 16)            Private\r
-\r
 C0-9B-F4   (hex)               The Professional Monitor Company Ltd\r
 D00000-DFFFFF     (base 16)            The Professional Monitor Company Ltd\r
                                Holme Court A1\r
@@ -20198,12 +20783,6 @@ E00000-EFFFFF     (base 16)            ACCO Brands USA LLC
                                Palo Alto  CA  94306\r
                                US\r
 \r
-14-1F-BA   (hex)               IEEE Registration Authority\r
-F00000-FFFFFF     (base 16)            IEEE Registration Authority\r
-                               445 Hoes Lane\r
-                               PISCATAWAY  NJ  08854\r
-                               US\r
-\r
 2C-69-1D   (hex)               Shenzhen Daren HI-Tech Electronics Co., Ltd.\r
 B00000-BFFFFF     (base 16)            Shenzhen Daren HI-Tech Electronics Co., Ltd.\r
                                Room 401, No. 5, Jiayi Industrial Park, Guihua Community, Guanlan Street, Longhua District, Shenzhen\r
@@ -20216,6 +20795,216 @@ D00000-DFFFFF     (base 16)           Ascentac Inc.
                                Kaohsiung City  Taiwan  807\r
                                TW\r
 \r
+14-1F-BA   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+                               445 Hoes Lane\r
+                               PISCATAWAY  NJ  08854\r
+                               US\r
+\r
+BC-34-00   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+                               445 Hoes Lane\r
+                               PISCATAWAY  NJ  08854\r
+                               US\r
+\r
+80-7B-85   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+                               445 Hoes Lane\r
+                               PISCATAWAY  NJ  08854\r
+                               US\r
+\r
+78-C2-C0   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+                               445 Hoes Lane\r
+                               PISCATAWAY  NJ  08854\r
+                               US\r
+\r
+F4-90-CB   (hex)               Fend Incorporated\r
+A00000-AFFFFF     (base 16)            Fend Incorporated\r
+                               4600 Fairfax Dr Ste 410\r
+                               Arlington  VA  22203-1553\r
+                               US\r
+\r
+18-C3-F4   (hex)               SHENZHEN MEGMEET ELECTRICAL CO., LTD\r
+E00000-EFFFFF     (base 16)            SHENZHEN MEGMEET ELECTRICAL CO., LTD\r
+                               5th Floor?Block B?Ziguang information Harbor?Langshan Rd., Science & Technology Park,Nahshan District,ShenZhen\r
+                               ShenZhen    518051\r
+                               CN\r
+\r
+18-C3-F4   (hex)               Scati Labs, S.A.\r
+000000-0FFFFF     (base 16)            Scati Labs, S.A.\r
+                               Ronda del Canal Imperial de Aragon 18-20\r
+                               ZARAGOZA  Aragon  50197\r
+                               ES\r
+\r
+88-3C-C5   (hex)               KMtronic ltd\r
+700000-7FFFFF     (base 16)            KMtronic ltd\r
+                               Dobri Czintulov 28A str.\r
+                                Gorna Oryahovica  VT  5100\r
+                               BG\r
+\r
+88-3C-C5   (hex)               Chengdu Data Sky Technology Co., Ltd.\r
+000000-0FFFFF     (base 16)            Chengdu Data Sky Technology Co., Ltd.\r
+                               No. 88, Tianchen Road, Hezuo Street, West District, High-tech Zone, Chengdu City, Sichuan Province\r
+                               Chengdu  Sichuan  610000\r
+                               CN\r
+\r
+58-47-CA   (hex)               Shenzhen Meigao Electronic Equipment Co.,Ltd\r
+700000-7FFFFF     (base 16)            Shenzhen Meigao Electronic Equipment Co.,Ltd\r
+                               B201 B221-B222, Pinghu Center Plant, Shenye Logistics  No. 6 Fukang Rd., Hehua Community, Pinghu Street   Longgang District, Shenzhen\r
+                               ShenZhen    518111\r
+                               CN\r
+\r
+58-47-CA   (hex)               PRACTEK Technology Co., Ltd.\r
+D00000-DFFFFF     (base 16)            PRACTEK Technology Co., Ltd.\r
+                               1/F, No.1 Building, No.168 Dieqiao Road, Pudong\r
+                               Shanghai    201315\r
+                               CN\r
+\r
+58-47-CA   (hex)               ONAWHIM (OAW) INC.\r
+200000-2FFFFF     (base 16)            ONAWHIM (OAW) INC.\r
+                               161 West 87th Street\r
+                               New York  NY  10024\r
+                               US\r
+\r
+D4-20-00   (hex)               Shenzhen AI Develop & Manufacture Co.,LTD.\r
+200000-2FFFFF     (base 16)            Shenzhen AI Develop & Manufacture Co.,LTD.\r
+                               Room 609, Building 1, Phase 2, Gaoxinqi Strategic Emerging Industrial Park, Liu Xian 1st Road,Baoan\r
+                               Shenzhen  Guangdong  518101\r
+                               CN\r
+\r
+C4-83-72   (hex)               Wuhan Da Ta Technologies Co.,Ltd.\r
+500000-5FFFFF     (base 16)            Wuhan Da Ta Technologies Co.,Ltd.\r
+                               Room801, Building C2, Future Science & Technology City, No. 999 Gaoxin Avenue, Donghu New Technology Development Zone,\r
+                               Wuhan  Hubei  430075\r
+                               CN\r
+\r
+C4-83-72   (hex)               Biwave Technologies, Inc.\r
+900000-9FFFFF     (base 16)            Biwave Technologies, Inc.\r
+                               12F-1  No-391  Sec-4  Xinyi-Rd\r
+                               Taipei  Taiwan  110601\r
+                               TW\r
+\r
+D4-BA-BA   (hex)               Beijing Yuanxin Junsheng Technology Co.,ltd\r
+400000-4FFFFF     (base 16)            Beijing Yuanxin Junsheng Technology Co.,ltd\r
+                               4th floor, building 3, No. 11, Hepingli East Street, Dongcheng District, Beijing\r
+                               beijing    100013\r
+                               CN\r
+\r
+C4-83-72   (hex)               Transact Technologies Inc\r
+400000-4FFFFF     (base 16)            Transact Technologies Inc\r
+                               20 Bomax Drive\r
+                               Ithaca    14850\r
+                               US\r
+\r
+C4-98-94   (hex)               Alpine Electronics Marketing, Inc.\r
+400000-4FFFFF     (base 16)            Alpine Electronics Marketing, Inc.\r
+                               1-7, Yukigaya-otsukamachi, Ota-ku\r
+                               Tokyo    145-8501\r
+                               JP\r
+\r
+C4-98-94   (hex)               Shanghai YVR Technology Co., Ltd.\r
+B00000-BFFFFF     (base 16)            Shanghai YVR Technology Co., Ltd.\r
+                               Building #3, No.1, Caosong Rd, Songjiang District \r
+                               Shanghai  Shanghai  201612\r
+                               CN\r
+\r
+C4-98-94   (hex)               Shenzhen Megmeet Drive Technology Co.,Ltd.\r
+000000-0FFFFF     (base 16)            Shenzhen Megmeet Drive Technology Co.,Ltd.\r
+                               Ziguang Information Port, Langshan Road, North District, Science and Technology Park, Nanshan District, Shenzhen\r
+                               SHENZHEN    518000\r
+                               CN\r
+\r
+D0-96-86   (hex)               PROVCOM LTD\r
+100000-1FFFFF     (base 16)            PROVCOM LTD\r
+                               1305 N Bascom Ave Ste H\r
+                               San Jose  CA  95128\r
+                               US\r
+\r
+C4-98-94   (hex)               Aetina Corporation \r
+600000-6FFFFF     (base 16)            Aetina Corporation \r
+                               2F-1, No.237. Sec.1 , Datong Rd., Xizhi Dist\r
+                               New Taipei City    221\r
+                               TW\r
+\r
+D0-96-86   (hex)               Camfil\r
+900000-9FFFFF     (base 16)            Camfil\r
+                               Avda. Juan Carlos I, Nº13 4ªPlanta\r
+                               Alcalá de Henares  Madrid  28806 \r
+                               ES\r
+\r
+4C-74-A7   (hex)               GoCodeIT Inc\r
+300000-3FFFFF     (base 16)            GoCodeIT Inc\r
+                               8171 Yonge StreetSuite 255\r
+                               Thornhill  Ontario  L3T2C6\r
+                               CA\r
+\r
+4C-74-A7   (hex)               N3com\r
+C00000-CFFFFF     (base 16)            N3com\r
+                               Proektiruemiy proezd 4062, 6b1, office 71\r
+                               Moscow    115432\r
+                               RU\r
+\r
+D4-61-37   (hex)               Shenzhen smart-core technology co.,ltd.\r
+100000-1FFFFF     (base 16)            Shenzhen smart-core technology co.,ltd.\r
+                               19/F., Finance & Technology Building, No.11 Keyuan Road, Nanshan Dist., Shenzhen, China\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+D4-61-37   (hex)               UAB Brolis sensor technology\r
+E00000-EFFFFF     (base 16)            UAB Brolis sensor technology\r
+                               Moletu pl. 73\r
+                               Vilnius    14259\r
+                               LT\r
+\r
+D4-61-37   (hex)               APPOTRONICS CO., LTD\r
+300000-3FFFFF     (base 16)            APPOTRONICS CO., LTD\r
+                               22F,High-tech Zone Union Tower 63 Xuefu Road Shenzhen China\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+D4-61-37   (hex)               Robert Bosch Elektronikai Kft.\r
+200000-2FFFFF     (base 16)            Robert Bosch Elektronikai Kft.\r
+                               Robert Bosch út 1.\r
+                               Hatvan  Heves  3000\r
+                               HU\r
+\r
+D4-61-37   (hex)               Securus CCTV India\r
+600000-6FFFFF     (base 16)            Securus CCTV India\r
+                               KM Electronic Cables Pvt Ltd, KM House, Near Maurya Complex, Ashram Road\r
+                               Ahmedabad    380014\r
+                               IN\r
+\r
+F0-22-1D   (hex)               Shenzhen Glazero Technology Co., Ltd.\r
+800000-8FFFFF     (base 16)            Shenzhen Glazero Technology Co., Ltd.\r
+                               201 Block A, #1 Qianwan 1st Road, Qianhai Shenzhen-Hong Kong Cooperation Zone\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+F0-22-1D   (hex)               Shenzhen SuyuVisonTechnology Co.,Ltd\r
+500000-5FFFFF     (base 16)            Shenzhen SuyuVisonTechnology Co.,Ltd\r
+                               16G, Bldg A Haiwang,Yuehai Sub-District,  Nanshan District, ShenZhen, China\r
+                               Shenzhen  Guangdong  518001\r
+                               CN\r
+\r
+F0-22-1D   (hex)               Bulat Co., Limited\r
+700000-7FFFFF     (base 16)            Bulat Co., Limited\r
+                               ROOM A1, 11/F WINNER BUILDING,36 MAN YUE STREET, HUNG HOM,KOWLOON,hongkong\r
+                               hongkong    999077\r
+                               HK\r
+\r
+F0-22-1D   (hex)               Shanghai Gfanxvision Intelligent Technology Co.Ltd\r
+900000-9FFFFF     (base 16)            Shanghai Gfanxvision Intelligent Technology Co.Ltd\r
+                               Room 506, No. 19, No. 498, GuoShouJing Road\r
+                               Shanghai  Pudong New Area  201203\r
+                               CN\r
+\r
+E0-38-2D   (hex)               SiLAND Chengdu Technology Co., Ltd\r
+C00000-CFFFFF     (base 16)            SiLAND Chengdu Technology Co., Ltd\r
+                               Tianren Road,Chengdu Hi-tech Zone\r
+                               ChengDu  Sichuan  610041\r
+                               CN\r
+\r
 20-85-93   (hex)               Great Lite International\r
 700000-7FFFFF     (base 16)            Great Lite International\r
                                11F., No.207-2, Sec. 3, Beixin Rd., Xindian Dist.,\r
@@ -21242,9 +22031,6 @@ D00000-DFFFFF     (base 16)             OLIMEX Ltd
                                Mantova    46100\r
                                IT\r
 \r
-30-1F-9A   (hex)               Private\r
-900000-9FFFFF     (base 16)            Private\r
-\r
 F0-41-C8   (hex)               Shenzhen  Nufilo Electronic Technology Co., Ltd.\r
 900000-9FFFFF     (base 16)            Shenzhen  Nufilo Electronic Technology Co., Ltd.\r
                                Tianliao Building West Unit F1315, (New Materials Industrial Park),  Xueyuan Road,  Nanshan District\r
@@ -23345,12 +24131,6 @@ D00000-DFFFFF     (base 16)            LeoLabs
                                Fuzhou  FuJian  350003\r
                                CN\r
 \r
-10-DC-B6   (hex)               ABB Switzerland Ltd.\r
-100000-1FFFFF     (base 16)            ABB Switzerland Ltd.\r
-                               Fabrikstrasse 3\r
-                               Lenzburg    5600\r
-                               CH\r
-\r
 10-DC-B6   (hex)               Milesight Taiwan\r
 500000-5FFFFF     (base 16)            Milesight Taiwan\r
                                10F., No. 87, Sec. 4, Chongxin Rd\r
@@ -24227,12 +25007,6 @@ B00000-BFFFFF     (base 16)            Viper Design, LLC
                                Madison  TN  37115\r
                                US\r
 \r
-A0-02-4A   (hex)               Donguan Amsamotion Automation Technology Co., Ltd\r
-500000-5FFFFF     (base 16)            Donguan Amsamotion Automation Technology Co., Ltd\r
-                               Block A, Zosun Intelligence Creation Zone, No.9 Yizhan Road, Yuanwubian Streeet Nancheng District,\r
-                               Dongguan  Gunagdong  523000\r
-                               CN\r
-\r
 A0-02-4A   (hex)               Guangdong Jinpeng Technology Co. LTD\r
 A00000-AFFFFF     (base 16)            Guangdong Jinpeng Technology Co. LTD\r
                                Room 504, 5 / F, Self-built A3 Building, No. 50 Science Avenue, Huangpu District\r
@@ -24575,18 +25349,12 @@ E8-78-29   (hex)              Ryu Tech. LTD
                                Taipei  Taiwan,R.O.C  235\r
                                TW\r
 \r
-E8-78-29   (hex)               Private\r
-B00000-BFFFFF     (base 16)            Private\r
-\r
 E8-78-29   (hex)               Galcon\r
 200000-2FFFFF     (base 16)            Galcon\r
                                Kfar Blum  israel\r
                                Kfar Blum  Israel   121500\r
                                IL\r
 \r
-18-74-E2   (hex)               Private\r
-400000-4FFFFF     (base 16)            Private\r
-\r
 E8-78-29   (hex)               SHEN ZHEN SKYSI WISDOM TECHNOLOGY CO.,LTD.\r
 500000-5FFFFF     (base 16)            SHEN ZHEN SKYSI WISDOM TECHNOLOGY CO.,LTD.\r
                                Room 1106,11th floor, National Technology Building, no. 109, Baoshen Road, Songpingshan community, Xili Street, Nanshan district, Shenzhen City\r
@@ -25313,8 +26081,278 @@ B00000-BFFFFF     (base 16)            Celliber Technologies Pvt Limited
                                Seoul    150-721\r
                                KR\r
 \r
-B8-D8-12   (hex)               IEEE Registration Authority\r
-F00000-FFFFFF     (base 16)            IEEE Registration Authority\r
+18-C3-F4   (hex)               Enertex Bayern GmbH\r
+100000-1FFFFF     (base 16)            Enertex Bayern GmbH\r
+                               Ebermannstädter Str. 8\r
+                               Forchheim  Bayern  91301\r
+                               DE\r
+\r
+18-C3-F4   (hex)               General Test Systems\r
+300000-3FFFFF     (base 16)            General Test Systems\r
+                               Building C–A7 Suite 805, 2190 Liuxian Avenue,Nanshan District\r
+                               Shenzhen  Guangdong  518055\r
+                               CN\r
+\r
+30-1F-9A   (hex)               Deep Sentinel \r
+900000-9FFFFF     (base 16)            Deep Sentinel \r
+                               600 Main Street Suite C\r
+                               PLEASANTON  CA  94566\r
+                               US\r
+\r
+B8-D8-12   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
                                445 Hoes Lane\r
                                PISCATAWAY  NJ  08854\r
                                US\r
+\r
+18-C3-F4   (hex)               Shenzhen Liandian Communication Technology Co.LTD\r
+800000-8FFFFF     (base 16)            Shenzhen Liandian Communication Technology Co.LTD\r
+                               1307, building A4, workshop 2, LiLang International Jewelry Industrial Park, 31 Bulan Road, xialilang community, Nanwan street, Longgang District\r
+                               Shenzhen  Guangdong  518112\r
+                               CN\r
+\r
+18-C3-F4   (hex)               Synaptics, Inc\r
+500000-5FFFFF     (base 16)            Synaptics, Inc\r
+                               1251 McKay Drive\r
+                               San Jose  CA   95131-1709\r
+                               US\r
+\r
+10-DC-B6   (hex)               Hitachi Energy Switzerland Ltd\r
+100000-1FFFFF     (base 16)            Hitachi Energy Switzerland Ltd\r
+                               Fabrikstrasse 3\r
+                               Lenzburg    5600\r
+                               CH\r
+\r
+88-3C-C5   (hex)               shenzhen Feng Jing Sheng Electronics Technology Co.,Ltd\r
+300000-3FFFFF     (base 16)            shenzhen Feng Jing Sheng Electronics Technology Co.,Ltd\r
+                               Fucheng Subdistrict\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+88-3C-C5   (hex)               Shanghai Ucan Automation Equipment Co., Ltd.\r
+500000-5FFFFF     (base 16)            Shanghai Ucan Automation Equipment Co., Ltd.\r
+                               4F, Building (5), No. 8, Hangyi Road, Fengxian District, Shanghai\r
+                               Shanghai    201499\r
+                               CN\r
+\r
+18-74-E2   (hex)               Aggressive Electronics Manufacturing Services Pvt Limited\r
+400000-4FFFFF     (base 16)            Aggressive Electronics Manufacturing Services Pvt Limited\r
+                               Plot  No 264, Sector 6, IMT Manesar\r
+                               MANESAR  Haryana  122050\r
+                               IN\r
+\r
+88-3C-C5   (hex)               NETGEN HITECH SOLUTIONS LLP\r
+200000-2FFFFF     (base 16)            NETGEN HITECH SOLUTIONS LLP\r
+                               B 301 KNOX PLAZA MALAD WEST\r
+                               MUMBAI  MAHARASHTRA  400064\r
+                               IN\r
+\r
+58-47-CA   (hex)               Shenzhen C & D Electronics Co., Ltd.\r
+600000-6FFFFF     (base 16)            Shenzhen C & D Electronics Co., Ltd.\r
+                               9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District\r
+                               ShenZhen  GuangDong  518000\r
+                               CN\r
+\r
+58-47-CA   (hex)               Kingnuo Intelligent Technology (Jiaxing) Co., Ltd.\r
+900000-9FFFFF     (base 16)            Kingnuo Intelligent Technology (Jiaxing) Co., Ltd.\r
+                               ROOM.1202,Yongyue Building, YOUCHEGANG TOWN?XIUZHOU DISTRICT\r
+                               Jiaxing  Zhejiang  314000\r
+                               CN\r
+\r
+E8-78-29   (hex)               Ampner Ltd\r
+B00000-BFFFFF     (base 16)            Ampner Ltd\r
+                               Lestikuja 2\r
+                               Vaasa    65380\r
+                               FI\r
+\r
+58-47-CA   (hex)               AZURE SUMMIT TECHNOLOGY\r
+E00000-EFFFFF     (base 16)            AZURE SUMMIT TECHNOLOGY\r
+                               1335 Gateway Drive, Suite 200\r
+                               Melbourne  FL  32901\r
+                               US\r
+\r
+D4-20-00   (hex)               Monolith Electric?Changzhou?Co.,Ltd.\r
+500000-5FFFFF     (base 16)            Monolith Electric?Changzhou?Co.,Ltd.\r
+                               No.8,Huashan Road,Xinbei District Changzhou,Jiangsu,China\r
+                               Changzhou  Jiangsu  213000\r
+                               CN\r
+\r
+D4-20-00   (hex)               HiAR Information Technology Co.,Ltd\r
+600000-6FFFFF     (base 16)            HiAR Information Technology Co.,Ltd\r
+                               Room 501, no.570, Shengxia Road, Pudong  New Area,\r
+                               Shanghai    200120\r
+                               CN\r
+\r
+D4-20-00   (hex)               Arbe Robotics Ltd.\r
+300000-3FFFFF     (base 16)            Arbe Robotics Ltd.\r
+                               107, Hashmonaim st.\r
+                               Tel Aviv    6713321\r
+                               IL\r
+\r
+C4-83-72   (hex)               VIE STYLE,INC,\r
+A00000-AFFFFF     (base 16)            VIE STYLE,INC,\r
+                               5-10-14 Zaimokuza\r
+                               Kamakura  KN  2480013\r
+                               JP\r
+\r
+C4-83-72   (hex)               Compumedics Germany GmbH\r
+000000-0FFFFF     (base 16)            Compumedics Germany GmbH\r
+                               Josef-Schüttler-Straße 2\r
+                               Singen    78224\r
+                               DE\r
+\r
+C4-83-72   (hex)               Shenzhen King Will Technology Co., LTD\r
+100000-1FFFFF     (base 16)            Shenzhen King Will Technology Co., LTD\r
+                               Room 202-207, Building A7, Tianliao Industrial Zone, Xueyuan Avenue, Taoyuan Street, Nanshan District\r
+                               Shenzhen  Guangdong  518071\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               Shenzhen Double Better Technology Co., Ltd\r
+700000-7FFFFF     (base 16)            Shenzhen Double Better Technology Co., Ltd\r
+                               12A5, Building T1, Fangda Plaza, Beihuan Avenue, Taoyuan Street, Nanshan District\r
+                               Shenzhen    518000\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               SHENZHEN ACTION TECHNOLOGIES CO., LTD.\r
+000000-0FFFFF     (base 16)            SHENZHEN ACTION TECHNOLOGIES CO., LTD.\r
+                               3/F,LIFENG BUILDING,42# OF LIUXIAN 1ST ROAD,BAO'AN 71ST DISTRICT,\r
+                               Shenzhen  GUANGDONG  518101\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               GuangZhou Ostec Electronic Technology Co.,Limited\r
+200000-2FFFFF     (base 16)            GuangZhou Ostec Electronic Technology Co.,Limited\r
+                               2of No.8, West Lane,Jiangcheng Road,Bangjiang East Village,Dalong Street,Panyu District,Guangzhou City,Guangdong,P.R.China\r
+                               Guangzhou    511400\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               Actiontec Electronics Inc.\r
+A00000-AFFFFF     (base 16)            Actiontec Electronics Inc.\r
+                               2445 Augustine Dr #501\r
+                               Santa Clara   CA  95054\r
+                               US\r
+\r
+D4-BA-BA   (hex)               Shenzhen Yueer Innovation Technology Co., Ltd\r
+600000-6FFFFF     (base 16)            Shenzhen Yueer Innovation Technology Co., Ltd\r
+                               ????????????????2?2??3?B08\r
+                               ??    518000\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               Qingdao Vzense Technology Co., Ltd.\r
+B00000-BFFFFF     (base 16)            Qingdao Vzense Technology Co., Ltd.\r
+                               3 Building, Qingdao Research Institute of Beihang University, No. 393 Songling Road, Laoshan District\r
+                               Qingdao  Shandong  266000\r
+                               CN\r
+\r
+C4-98-94   (hex)               Shenzhen C & D Electronics Co., Ltd.\r
+700000-7FFFFF     (base 16)            Shenzhen C & D Electronics Co., Ltd.\r
+                               9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District\r
+                               ShenZhen  GuangDong  518000\r
+                               CN\r
+\r
+C4-98-94   (hex)               shenzhen lanodo technology Co., Ltd\r
+500000-5FFFFF     (base 16)            shenzhen lanodo technology Co., Ltd\r
+                               Room 501 Building D, Qiaoan Industry park, No 308 Wuhe Road, Guanlan, Longhua District\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+C4-98-94   (hex)               Jiangsu AIDriving Co.,Ltd.\r
+D00000-DFFFFF     (base 16)            Jiangsu AIDriving Co.,Ltd.\r
+                               Room 1401,Beidou Building,6 Huida Road,Jiangbei NewDistrict\r
+                               Nanjing  Jiangsu  210032\r
+                               CN\r
+\r
+D4-BA-BA   (hex)               Camozzi Automation SpA\r
+E00000-EFFFFF     (base 16)            Camozzi Automation SpA\r
+                               Via Eritrea 20/I\r
+                               BRESCIA  ITALY  25080\r
+                               IT\r
+\r
+D0-96-86   (hex)                CertusNet Information Technology Co.,LTD\r
+D00000-DFFFFF     (base 16)             CertusNet Information Technology Co.,LTD\r
+                               6th floor,Shouxiang Technology Building,51 Xueyuan Road,Haidian District,Beijing\r
+                               Beijing  Beijing  100083\r
+                               CN\r
+\r
+D0-96-86   (hex)               TMLake Technology Ltd.,\r
+200000-2FFFFF     (base 16)            TMLake Technology Ltd.,\r
+                               RM2403, Building 1, Block B, KEGU 1st Street, BDA\r
+                               Beijing  Beijing  100176\r
+                               CN\r
+\r
+D0-96-86   (hex)               Private\r
+700000-7FFFFF     (base 16)            Private\r
+\r
+D0-96-86   (hex)               ECS s.r.l.\r
+C00000-CFFFFF     (base 16)            ECS s.r.l.\r
+                               Via dell'Artigianato n. 24\r
+                               Belluno  BL  32100\r
+                               IT\r
+\r
+4C-74-A7   (hex)               Shenzhen Hollyland Technology Co.,Ltd\r
+100000-1FFFFF     (base 16)            Shenzhen Hollyland Technology Co.,Ltd\r
+                               8F, 5D Building, Skyworth Innovation Valley, Tangtou, Shiyan, Baoan District Shenzhen, China.\r
+                               shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+4C-74-A7   (hex)               Cyanview\r
+200000-2FFFFF     (base 16)            Cyanview\r
+                               26, Rue de la Foire\r
+                               Papignies    7861\r
+                               BE\r
+\r
+4C-74-A7   (hex)               ABB LV Installation Materials Co., Ltd. Beijing\r
+600000-6FFFFF     (base 16)            ABB LV Installation Materials Co., Ltd. Beijing\r
+                               No.17 Kangding Street, Beijing Economic-Technological Development Area 100176, P.R. China\r
+                               Beijing    100176\r
+                               CN\r
+\r
+D0-96-86   (hex)               withnetworks\r
+E00000-EFFFFF     (base 16)            withnetworks\r
+                               13, Hangang-daero 11-gil, Yongsan-gu\r
+                               Seoul    04379\r
+                               KR\r
+\r
+4C-74-A7   (hex)               AGILITY ROBOTICS, INC.\r
+500000-5FFFFF     (base 16)            AGILITY ROBOTICS, INC.\r
+                               32114 MALLARD AVE BUILDING 52\r
+                               TANGENT  OR  97389\r
+                               US\r
+\r
+4C-74-A7   (hex)               traplinked Gmbh\r
+B00000-BFFFFF     (base 16)            traplinked Gmbh\r
+                               Zollhof 7\r
+                               Nürnberg  BY  90443\r
+                               DE\r
+\r
+D4-61-37   (hex)               Beijing TAIXINYUN Technology Co.,Ltd\r
+400000-4FFFFF     (base 16)            Beijing TAIXINYUN Technology Co.,Ltd\r
+                               Rm 2056 , Building 8, Xiaoyun li , ChaoYang District\r
+                               Beijing  China  100016\r
+                               CN\r
+\r
+D4-61-37   (hex)               Beijing Shudun Information Technology Co., Ltd\r
+700000-7FFFFF     (base 16)            Beijing Shudun Information Technology Co., Ltd\r
+                               6 / F, building 1, zone 3\r
+                               Beijing  Hanwei International Plaza, South Fourth Ring West Road, Fengtai District  100070\r
+                               CN\r
+\r
+D4-61-37   (hex)               Private\r
+900000-9FFFFF     (base 16)            Private\r
+\r
+F0-22-1D   (hex)               Hangzhou Gold Electronic Equipment Co., Ltd\r
+A00000-AFFFFF     (base 16)            Hangzhou Gold Electronic Equipment Co., Ltd\r
+                               Room 201, floor 2, building F, Haichuang Park, Zhongdian Haikang Group Co., Ltd., No. 198, aicheng street, Wuchang Street, Yuhang District\r
+                                Hangzhou  Zhejiang   310000\r
+                               CN\r
+\r
+F0-22-1D   (hex)               Chonel Industry?shanghai?Co., Ltd.\r
+200000-2FFFFF     (base 16)            Chonel Industry?shanghai?Co., Ltd.\r
+                               Room 501?Building 24?Lane 8633?Zhongchun Road?Minghang District\r
+                               Shanghai  Shanghai  201100\r
+                               CN\r
+\r
+A0-02-4A   (hex)               Dongguan Amsamotion Automation Technology Co., Ltd\r
+500000-5FFFFF     (base 16)            Dongguan Amsamotion Automation Technology Co., Ltd\r
+                               Block A, Zosun Intelligence Creation Zone         \r
+                               Dongguan  No.9 Yizhan Road, Yuanwubian Streeet Nancheng District, Gunagdong  523000\r
+                               CN\r

diff --git a/hwdb.d/ma-small.txt b/hwdb.d/ma-small.txt
index 7492357661cdab14b6488eda57736fc1981a3b6b..3edcc1a13a2a52d584390b9ee6a601d3ff215ed7 100644 (file)
--- a/hwdb.d/ma-small.txt
+++ b/hwdb.d/ma-small.txt
@@ -2645,12 +2645,6 @@ D9E000-D9EFFF     (base 16)              Grupo Epelsa S.L.
                                Novate Milanese  Milano  20026\r
                                IT\r
 \r
-70-B3-D5   (hex)               HYOSUNG Power & Industrial Systems\r
-41A000-41AFFF     (base 16)            HYOSUNG Power & Industrial Systems\r
-                               119, Mapo-daero, Mapo-gu\r
-                               Seoul    04144\r
-                               KR\r
-\r
 70-B3-D5   (hex)               Flintab AB\r
 D60000-D60FFF     (base 16)            Flintab AB\r
                                Kabelvägen 4\r
@@ -5954,12 +5948,234 @@ C35000-C35FFF     (base 16)            Peter Huber Kaeltemaschinenbau AG
                                Offenburg  Ba-Wue  77656\r
                                DE\r
 \r
+8C-1F-64   (hex)               Nexilis Electronics India Pvt Ltd (PICSYS)\r
+692000-692FFF     (base 16)            Nexilis Electronics India Pvt Ltd (PICSYS)\r
+                               Plot No.23,DITPL Industrial Area,Bashettihalli,Doddaballapura\r
+                               Bangalore  Karnataka  561203\r
+                               IN\r
+\r
 70-B3-D5   (hex)               Mahindra Electric Mobility Limited\r
 11A000-11AFFF     (base 16)            Mahindra Electric Mobility Limited\r
                                690, Gold Hill Square, Hosur Road, Bommanahalli\r
                                Bangalore  Karnataka  560068\r
                                IN\r
 \r
+8C-1F-64   (hex)               wtec GmbH\r
+F43000-F43FFF     (base 16)            wtec GmbH\r
+                               Dornbachstrasse 1a\r
+                               Bad Homburg    61352\r
+                               DE\r
+\r
+8C-1F-64   (hex)               VECTOR TECHNOLOGIES, LLC\r
+365000-365FFF     (base 16)            VECTOR TECHNOLOGIES, LLC\r
+                               Razdolnaya str, 76bldg3\r
+                               Orel  Orel region  302038\r
+                               RU\r
+\r
+8C-1F-64   (hex)               Agrowtek Inc.\r
+179000-179FFF     (base 16)            Agrowtek Inc.\r
+                               3365 Gateway Rd\r
+                               Brookfield  WI  53045\r
+                               US\r
+\r
+8C-1F-64   (hex)               BABTEL\r
+A51000-A51FFF     (base 16)            BABTEL\r
+                               139 E Chestnut St\r
+                               Coatesville    19320\r
+                               US\r
+\r
+8C-1F-64   (hex)               BusPas\r
+CF7000-CF7FFF     (base 16)            BusPas\r
+                               615 Rene Levesque WestSuite 500\r
+                               Montreal  Quebec  H3B 1P5\r
+                               CA\r
+\r
+8C-1F-64   (hex)               Profcon AB\r
+91A000-91AFFF     (base 16)            Profcon AB\r
+                               Victor Hasselblads gata 9\r
+                               Västra Frölunda    42131\r
+                               SE\r
+\r
+8C-1F-64   (hex)               Sichuan AnSphere Technology Co. Ltd.\r
+208000-208FFF     (base 16)            Sichuan AnSphere Technology Co. Ltd.\r
+                               Room 332, Building 2, Innovation Center, Science and Technology Innovation Park\r
+                               Mian Yang  Sichuan  621000\r
+                               CN\r
+\r
+8C-1F-64   (hex)               Kinetic Technologies\r
+324000-324FFF     (base 16)            Kinetic Technologies\r
+                               6399 San Ignacio Ave #250\r
+                               San Jose  CA  95119\r
+                               US\r
+\r
+70-B3-D5   (hex)               HYOSUNG Heavy Industries Corporation\r
+41A000-41AFFF     (base 16)            HYOSUNG Heavy Industries Corporation\r
+                               119, Mapo-daero, Mapo-gu\r
+                               Seoul    04144\r
+                               KR\r
+\r
+8C-1F-64   (hex)               HYOSUNG Heavy Industries Corporation\r
+C07000-C07FFF     (base 16)            HYOSUNG Heavy Industries Corporation\r
+                               119, Mapo-daero, Mapo-gu\r
+                               Seoul    04144\r
+                               KR\r
+\r
+8C-1F-64   (hex)               GS Elektromedizinsiche Geräte G. Stemple GmbH\r
+9B6000-9B6FFF     (base 16)            GS Elektromedizinsiche Geräte G. Stemple GmbH\r
+                               Hauswiesenstr. 26\r
+                               Kaufering  Bayern  86916\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Sicon srl\r
+83E000-83EFFF     (base 16)            Sicon srl\r
+                               Via Sila 1/3\r
+                               Isola Vicentina  Vicenza  36033\r
+                               IT\r
+\r
+8C-1F-64   (hex)               Noisewave Corporation\r
+7D9000-7D9FFF     (base 16)            Noisewave Corporation\r
+                               20 Troy Rd. Ste 3\r
+                               Whippany  NJ  07981\r
+                               US\r
+\r
+8C-1F-64   (hex)               Circuit Solutions\r
+4E7000-4E7FFF     (base 16)            Circuit Solutions\r
+                               2514 Bonnie Dell Drive\r
+                               South Park  PA  15129\r
+                               US\r
+\r
+8C-1F-64   (hex)               BAE Systems\r
+556000-556FFF     (base 16)            BAE Systems\r
+                               65 Spir Brook Rd.\r
+                               Nashua  NH  03060\r
+                               US\r
+\r
+8C-1F-64   (hex)               MI Inc.\r
+17E000-17EFFF     (base 16)            MI Inc.\r
+                               6F, Toto building, 5-1-4, Toranomon, Minato-ku\r
+                               Tokyo    1050001\r
+                               JP\r
+\r
+8C-1F-64   (hex)               GVA Lighting, Inc.\r
+44E000-44EFFF     (base 16)            GVA Lighting, Inc.\r
+                               2771 Bristol Circle\r
+                               Oakville  Ontario  L6H 6X5\r
+                               CA\r
+\r
+8C-1F-64   (hex)               Photonic Science and Engineering Ltd\r
+4F9000-4F9FFF     (base 16)            Photonic Science and Engineering Ltd\r
+                               22 Theaklen Drive\r
+                               St Leonards on Sea  EAST SUSSEX  TN38 9AZ\r
+                               GB\r
+\r
+8C-1F-64   (hex)               KSE GmbH\r
+97D000-97DFFF     (base 16)            KSE GmbH\r
+                               Kaethe Paulus Strasse 6\r
+                               Koesching    85092\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Power Electronics Espana, S.L.\r
+B9E000-B9EFFF     (base 16)            Power Electronics Espana, S.L.\r
+                               C/ Leonardo Da Vinci, 24-26\r
+                               Paterna  Valencia  46980\r
+                               ES\r
+\r
+8C-1F-64   (hex)               VERSITRON, Inc.\r
+2FE000-2FEFFF     (base 16)            VERSITRON, Inc.\r
+                               83C Albe Drive\r
+                               Newark  DE  19702\r
+                               US\r
+\r
+8C-1F-64   (hex)               Guan Show Technologe Co., Ltd.\r
+00C000-00CFFF     (base 16)            Guan Show Technologe Co., Ltd.\r
+                               No.127, Jianguo 1st Rd., Lingya Dist.\r
+                                Kaohsiung City     802\r
+                               TW\r
+\r
+8C-1F-64   (hex)               REO AG\r
+462000-462FFF     (base 16)            REO AG\r
+                               Brühlerstr. 100\r
+                               Solingen    42657\r
+                               DE\r
+\r
+8C-1F-64   (hex)               DIAS Infrared GmbH\r
+376000-376FFF     (base 16)            DIAS Infrared GmbH\r
+                               Pforzheimer Str. 21\r
+                               Dresden  Saxony  01189\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Panoramic Power\r
+50E000-50EFFF     (base 16)            Panoramic Power\r
+                               Atir Yeda 15\r
+                               Kfar Saba    4464312\r
+                               IL\r
+\r
+8C-1F-64   (hex)               LabLogic Systems\r
+9A4000-9A4FFF     (base 16)            LabLogic Systems\r
+                               Paradigm House, Melbourne Avenue,\r
+                               Sheffiled  South Yorkshire  S10 2QJ\r
+                               GB\r
+\r
+8C-1F-64   (hex)               RealD, Inc.\r
+0D5000-0D5FFF     (base 16)            RealD, Inc.\r
+                               9777 Wilshire Boulevard, Ste 430\r
+                                Beverly Hills  CA  90212\r
+                               US\r
+\r
+8C-1F-64   (hex)               Grossenbacher Systeme AG\r
+117000-117FFF     (base 16)            Grossenbacher Systeme AG\r
+                               Spinnereistrasse 10\r
+                               St. Gallen    9008\r
+                               CH\r
+\r
+8C-1F-64   (hex)               sdt.net AG\r
+676000-676FFF     (base 16)            sdt.net AG\r
+                               Ulmer Str. 130\r
+                               Aalen  Baden-Wuerttemberg  73431\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Pantherun Technologies Pvt Ltd\r
+2A1000-2A1FFF     (base 16)            Pantherun Technologies Pvt Ltd\r
+                               311 6th main road Hal 2nd stage\r
+                               Bangalore  Karnataka  560038\r
+                               IN\r
+\r
+8C-1F-64   (hex)               Sypris Electronics\r
+C44000-C44FFF     (base 16)            Sypris Electronics\r
+                               10901N McKinley Dr\r
+                               Tampa    33612\r
+                               US\r
+\r
+8C-1F-64   (hex)               Quantum Technologies Inc\r
+F2F000-F2FFFF     (base 16)            Quantum Technologies Inc\r
+                               991 DISCOVERY DR NW\r
+                               Huntsville  AL  35806\r
+                               US\r
+\r
+8C-1F-64   (hex)               Cronus Electronics\r
+B08000-B08FFF     (base 16)            Cronus Electronics\r
+                               7 Manor RoadManor Road\r
+                               WEYMOUTH  Dorset  DT3 5HR\r
+                               GB\r
+\r
+8C-1F-64   (hex)               FoxIoT OÜ\r
+BC3000-BC3FFF     (base 16)            FoxIoT OÜ\r
+                               Mäealuse tn 2/1\r
+                               Tallinn  Harjumaa  12618\r
+                               EE\r
+\r
+8C-1F-64   (hex)               Algodue Elettronica Srl\r
+90D000-90DFFF     (base 16)            Algodue Elettronica Srl\r
+                               Via P. Gobetti, 16F\r
+                               Maggiora  NO  28014\r
+                               IT\r
+\r
+8C-1F-64   (hex)               Emerson Rosemount Analytical\r
+9B2000-9B2FFF     (base 16)            Emerson Rosemount Analytical\r
+                               8200 Market Blvd.\r
+                               Chanhassen  MN  55317-9687\r
+                               US\r
+\r
 70-B3-D5   (hex)               EVCO SPA\r
 A80000-A80FFF     (base 16)            EVCO SPA\r
                                VIA FELTRE N. 81\r
@@ -6068,12 +6284,6 @@ D23000-D23FFF     (base 16)              COTT Electronics
                                Nigran  Spain  36350\r
                                ES\r
 \r
-70-B3-D5   (hex)               KSE GmbH\r
-0F6000-0F6FFF     (base 16)            KSE GmbH\r
-                               Frühlingstraße 31-33\r
-                               Ingolstadt    85055\r
-                               DE\r
-\r
 70-B3-D5   (hex)               Edgeware AB\r
 449000-449FFF     (base 16)            Edgeware AB\r
                                Master Samuelsgatan 42\r
@@ -6260,9 +6470,6 @@ FB9000-FB9FFF     (base 16)               EYEDEA
                                Seongnam-si  Gyeonggi-do  13449\r
                                KR\r
 \r
-70-B3-D5   (hex)               Private\r
-30E000-30EFFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               KJ3 Elektronik AB\r
 FB2000-FB2FFF     (base 16)            KJ3 Elektronik AB\r
                                Fornåsa 110\r
@@ -6281,9 +6488,6 @@ FB2000-FB2FFF     (base 16)               KJ3 Elektronik AB
                                Tel Aviv  IL  6971915\r
                                IL\r
 \r
-70-B3-D5   (hex)               Private\r
-1D7000-1D7FFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               Orlaco Products B.V.\r
 EAE000-EAEFFF     (base 16)            Orlaco Products B.V.\r
                                Albert Plesmanstraat 42\r
@@ -10649,9 +10853,6 @@ E44000-E44FFF     (base 16)             BrainboxAI Inc
                                Isola Vicentina  Vicenza  36033\r
                                IT\r
 \r
-70-B3-D5   (hex)               Private\r
-A31000-A31FFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               Clockwork Dog\r
 5D7000-5D7FFF     (base 16)            Clockwork Dog\r
                                43 Philpot Street\r
@@ -11792,24 +11993,249 @@ D5E000-D5EFFF     (base 16)          Integer.pl S.A.
                                Krakow    30-552\r
                                PL\r
 \r
-8C-1F-64   (hex)               Abbott Diagnostics Technologies AS\r
-300000-300FFF     (base 16)            Abbott Diagnostics Technologies AS\r
-                               P. O.  Box 6863 Rodeløkka\r
-                               Oslo    0504\r
-                               NO\r
-\r
 8C-1F-64   (hex)               Suzhou Leamore Optronics Co., Ltd.\r
 662000-662FFF     (base 16)            Suzhou Leamore Optronics Co., Ltd.\r
                                Block 12-301, NO 99 Jinji Lake Road, Suzhou Industrial Park, Suzhou\r
                                Suzhou  Jiangsu   215000\r
                                CN\r
 \r
+8C-1F-64   (hex)               Abbott Diagnostics Technologies AS\r
+300000-300FFF     (base 16)            Abbott Diagnostics Technologies AS\r
+                               P. O.  Box 6863 Rodeløkka\r
+                               Oslo    0504\r
+                               NO\r
+\r
 8C-1F-64   (hex)               Breas Medical AB\r
 98F000-98FFFF     (base 16)            Breas Medical AB\r
                                Företagsvägen 1\r
                                Mölnlycke    SE-435 33\r
                                SE\r
 \r
+8C-1F-64   (hex)               Loadrite (Auckland) Limited\r
+8F4000-8F4FFF     (base 16)            Loadrite (Auckland) Limited\r
+                               45 Patiki road, Avondale\r
+                               Auckland  Auckland  1026\r
+                               NZ\r
+\r
+8C-1F-64   (hex)               Private\r
+E2D000-E2DFFF     (base 16)            Private\r
+\r
+8C-1F-64   (hex)               Bit Trade One, Ltd.\r
+6EC000-6ECFFF     (base 16)            Bit Trade One, Ltd.\r
+                               5-1-23 Kamimizo, Chuo-ku\r
+                               Sagamihara City   Kanagawa Prefecture  2520243\r
+                               JP\r
+\r
+8C-1F-64   (hex)               AVA Monitoring AB\r
+28D000-28DFFF     (base 16)            AVA Monitoring AB\r
+                               Vädursgatan 6\r
+                               Göteborg  Västra götaland  412 50\r
+                               SE\r
+\r
+8C-1F-64   (hex)               MECT SRL\r
+309000-309FFF     (base 16)            MECT SRL\r
+                               VIA E. FERMI 57/59\r
+                               ALPIGNANO    10091\r
+                               IT\r
+\r
+70-B3-D5   (hex)               BAE Systems Apllied Intelligence\r
+1D7000-1D7FFF     (base 16)            BAE Systems Apllied Intelligence\r
+                               170 Waterside House\r
+                               Guildford  Surrey  GU2 7RQ\r
+                               GB\r
+\r
+8C-1F-64   (hex)               Elix Systems SA\r
+66F000-66FFFF     (base 16)            Elix Systems SA\r
+                               Route de Chavannes 9\r
+                               Lausanne    1007\r
+                               CH\r
+\r
+8C-1F-64   (hex)               Northwest Central Indiana Community Partnerships Inc dba Wabash Heartland Innovation Network (WHIN)\r
+EF8000-EF8FFF     (base 16)            Northwest Central Indiana Community Partnerships Inc dba Wabash Heartland Innovation Network (WHIN)\r
+                               1281 Win Hentschel BlvdSuite 2161\r
+                               West Lafayette  IN  47906\r
+                               US\r
+\r
+8C-1F-64   (hex)               Avionica \r
+6A0000-6A0FFF     (base 16)            Avionica \r
+                               9941 West Jessamine St\r
+                               Miami   FL  33157 \r
+                               US\r
+\r
+8C-1F-64   (hex)               Arcus-EDS GmbH\r
+698000-698FFF     (base 16)            Arcus-EDS GmbH\r
+                               Rigaer Str. 88\r
+                               Berlin  Berlin  10247\r
+                               DE\r
+\r
+8C-1F-64   (hex)               biosilver .co.,ltd\r
+34D000-34DFFF     (base 16)            biosilver .co.,ltd\r
+                               2-14-4, shinyokohama\r
+                               yokohama  kanagawa  2220033\r
+                               JP\r
+\r
+8C-1F-64   (hex)               EUREKA FOR SMART PROPERTIES CO. W.L.L\r
+CEB000-CEBFFF     (base 16)            EUREKA FOR SMART PROPERTIES CO. W.L.L\r
+                               Office 11, Building 288C, Avenue 16, Hidd Block 111\r
+                               Hidd     111\r
+                               BH\r
+\r
+8C-1F-64   (hex)               TEX COMPUTER SRL \r
+3B6000-3B6FFF     (base 16)            TEX COMPUTER SRL \r
+                               Via O. Respighi 13\r
+                               CATTOLICA   RIMINI   47841\r
+                               IT\r
+\r
+8C-1F-64   (hex)               Cedel BV\r
+314000-314FFF     (base 16)            Cedel BV\r
+                               Portugallaan 5\r
+                               Assen    9403DR\r
+                               NL\r
+\r
+8C-1F-64   (hex)               Vision Systems Safety Tech\r
+F70000-F70FFF     (base 16)            Vision Systems Safety Tech\r
+                               5 Chemin de Chiradie\r
+                               Brignais    69530\r
+                               FR\r
+\r
+8C-1F-64   (hex)               Dyncir Soluções Tecnológicas Ltda\r
+CB2000-CB2FFF     (base 16)            Dyncir Soluções Tecnológicas Ltda\r
+                               Av. BPS, 1303, Predio J3, Sala 6\r
+                               Itajubá  MG  37500-185\r
+                               BR\r
+\r
+70-B3-D5   (hex)               KSE GmbH\r
+0F6000-0F6FFF     (base 16)            KSE GmbH\r
+                               Kaethe Paulus Strasse 6\r
+                               Koesching    85092\r
+                               DE\r
+\r
+8C-1F-64   (hex)               FIDICA GmbH & Co. KG\r
+699000-699FFF     (base 16)            FIDICA GmbH & Co. KG\r
+                               Frohnradstr. 7-9\r
+                               Hösbach    63768\r
+                               DE\r
+\r
+8C-1F-64   (hex)               ehoosys Co.,LTD.\r
+731000-731FFF     (base 16)            ehoosys Co.,LTD.\r
+                               148, Gongdan-ro, Gunpo-si, Gyeonggi-do, Republic of Korea\r
+                               Gunpo-si  Gyeonggi-do  15845\r
+                               KR\r
+\r
+8C-1F-64   (hex)               A&T Corporation\r
+BCB000-BCBFFF     (base 16)            A&T Corporation\r
+                               2023-1\r
+                               Endo, Fujisawa, Kanagawa    252-0816\r
+                               JP\r
+\r
+8C-1F-64   (hex)               Soehnle Industrial Solutions GmbH\r
+C91000-C91FFF     (base 16)            Soehnle Industrial Solutions GmbH\r
+                               Gaildorfer Strasse 6\r
+                               Backnang    71522\r
+                               DE\r
+\r
+8C-1F-64   (hex)               SOLIDpower SpA\r
+02F000-02FFFF     (base 16)            SOLIDpower SpA\r
+                               viale Trento 115/117\r
+                               Mezzolombardo  Trento  38017\r
+                               IT\r
+\r
+70-B3-D5   (hex)               Ecolonum Inc.\r
+30E000-30EFFF     (base 16)            Ecolonum Inc.\r
+                               456 Morimae Itozawa\r
+                               Minamiaizu  Minamiaizu-gun Fukushima  9670014\r
+                               JP\r
+\r
+8C-1F-64   (hex)               HUERNER Schweisstechnik GmbH\r
+F2D000-F2DFFF     (base 16)            HUERNER Schweisstechnik GmbH\r
+                               Nieder-Ohmener Str. 26\r
+                               Muecke    35325\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Voyage Audio LLC\r
+F22000-F22FFF     (base 16)            Voyage Audio LLC\r
+                               3555 Rosecrans St, Suite #114-491\r
+                               San Diego  CA  92110\r
+                               US\r
+\r
+8C-1F-64   (hex)               enlighten\r
+91D000-91DFFF     (base 16)            enlighten\r
+                               396,Seocho-daero, seocho-gu, seoul, 06619\r
+                               KR    06619\r
+                               KR\r
+\r
+8C-1F-64   (hex)               Hirotech inc.\r
+7A4000-7A4FFF     (base 16)            Hirotech inc.\r
+                               Shinyokohama I/O Bldg, 1-3-10 Shinyokohama, Kohoku-ku\r
+                               Yokohama City  Kanagawa  2220033\r
+                               JP\r
+\r
+8C-1F-64   (hex)               Ingenious Technology LLC\r
+573000-573FFF     (base 16)            Ingenious Technology LLC\r
+                               111 Deerwood Road, Suite 200\r
+                               San Ramon  CA  94583\r
+                               US\r
+\r
+8C-1F-64   (hex)               Forever Engineering Systems Pvt. Ltd.\r
+867000-867FFF     (base 16)            Forever Engineering Systems Pvt. Ltd.\r
+                               B-817, 8th floor, Advant Navis Business Park, Sector-142\r
+                               NOIDA  Uttar Pradesh  201301\r
+                               IN\r
+\r
+8C-1F-64   (hex)               MESA TECHNOLOGIES LLC\r
+4FB000-4FBFFF     (base 16)            MESA TECHNOLOGIES LLC\r
+                               5801 DIERKER DR\r
+                               HOUSTON  TX  77041-6214\r
+                               US\r
+\r
+8C-1F-64   (hex)               Mark Roberts Motion Control\r
+2E2000-2E2FFF     (base 16)            Mark Roberts Motion Control\r
+                               UNIT 3 SOUTH EAST STUDIOS  EASTBOURNE ROAD\r
+                               LINGFIELD    RH7 6JP\r
+                               GB\r
+\r
+8C-1F-64   (hex)               GREDMANN TAIWAN LTD.\r
+FCC000-FCCFFF     (base 16)            GREDMANN TAIWAN LTD.\r
+                               9F., No. 170, Sec. 3, Minquan E. Rd., Songshan Dist.\r
+                               Taipei City    105603\r
+                               TW\r
+\r
+8C-1F-64   (hex)               Alphatek AS\r
+BF3000-BF3FFF     (base 16)            Alphatek AS\r
+                               Andreas Harestads vei 30\r
+                               Randaberg  Rogaland  4070 \r
+                               NO\r
+\r
+70-B3-D5   (hex)               Wise Ally Holdings Limited\r
+A31000-A31FFF     (base 16)            Wise Ally Holdings Limited\r
+                               Unit 3203-3207 , Tower 1 , Enterprise Square Five , 38 Wang Chiu Road\r
+                               Hong Kong  Kowloon Bay  852\r
+                               HK\r
+\r
+8C-1F-64   (hex)               Optimum Instruments Inc.\r
+A9E000-A9EFFF     (base 16)            Optimum Instruments Inc.\r
+                               #201, 3132 Parsons Road NW\r
+                               Edmonton  Alberta  T6N1L6\r
+                               CA\r
+\r
+8C-1F-64   (hex)               Beijing Ceresdate Technology Co.,LTD\r
+C61000-C61FFF     (base 16)            Beijing Ceresdate Technology Co.,LTD\r
+                               Tower B 2th FI., Bldg.12,(East Zone) No.10 Xibeiwangdong Road, Haidian District\r
+                               Beijing  Beijing  100193\r
+                               CN\r
+\r
+8C-1F-64   (hex)               Beijing Zhongzhi Huida Technology Co., Ltd\r
+610000-610FFF     (base 16)            Beijing Zhongzhi Huida Technology Co., Ltd\r
+                               302,floor 3,building 2,No.15 Guanghua Road,Chaoyang District\r
+                               Beijing  Beijing  100026\r
+                               CN\r
+\r
+8C-1F-64   (hex)               Spectrum FiftyNine BV\r
+145000-145FFF     (base 16)            Spectrum FiftyNine BV\r
+                               Middelweg 8a\r
+                               Molenhoek  Limb  6584ah\r
+                               NL\r
+\r
 70-B3-D5   (hex)               System West dba ICS Electronics\r
 E06000-E06FFF     (base 16)            System West dba ICS Electronics\r
                                7034 Commerce Circle Suite A\r
@@ -12329,9 +12755,6 @@ E0C000-E0CFFF     (base 16)             Communication Systems Solutions
                                Lincoln  NE  68516\r
                                US\r
 \r
-70-B3-D5   (hex)               Private\r
-591000-591FFF     (base 16)            Private\r
-\r
 00-1B-C5   (hex)               Corporate Systems Engineering \r
 015000-015FFF     (base 16)            Corporate Systems Engineering \r
                                1215 Brookville Way\r
@@ -13022,12 +13445,6 @@ FA3000-FA3FFF     (base 16)            ELVA-1 MICROWAVE HANDELSBOLAG
                                Songpa-gu  Seoul  05636\r
                                KR\r
 \r
-70-B3-D5   (hex)               KSE GmbH\r
-D41000-D41FFF     (base 16)            KSE GmbH\r
-                               Frühlingstraße 31-33\r
-                               Ingolstadt    85055\r
-                               DE\r
-\r
 70-B3-D5   (hex)               bobz GmbH\r
 81B000-81BFFF     (base 16)            bobz GmbH\r
                                Südring 3d\r
@@ -14816,9 +15233,6 @@ B47000-B47FFF     (base 16)             DSIT Solutions LTD
                                Angleur  Liege  4031\r
                                BE\r
 \r
-70-B3-D5   (hex)               Private\r
-119000-119FFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               SP Controls\r
 823000-823FFF     (base 16)            SP Controls\r
                                930 Linde Ave\r
@@ -15278,12 +15692,6 @@ C58000-C58FFF     (base 16)            RMI Laser LLC
                                Lafayette  Colorado  80026\r
                                US\r
 \r
-70-B3-D5   (hex)               HKC Limited\r
-CB7000-CB7FFF     (base 16)            HKC Limited\r
-                               Parkway Business Centre\r
-                               Ballymount  Dublin  Dublin 24\r
-                               IE\r
-\r
 70-B3-D5   (hex)               Molu Technology Inc., LTD.\r
 D8F000-D8FFFF     (base 16)            Molu Technology Inc., LTD.\r
                                NO. 25, Ln., 230, Zhonghe Rd.,\r
@@ -17351,12 +17759,6 @@ E61000-E61FFF     (base 16)            Stange Elektronik GmbH
                                Bad Oldesloe    D-23843\r
                                DE\r
 \r
-8C-1F-64   (hex)               Corigine, Inc\r
-306000-306FFF     (base 16)            Corigine, Inc\r
-                               4655 Old Ironsides Dr #270\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 8C-1F-64   (hex)               biosilver .co.,ltd\r
 641000-641FFF     (base 16)            biosilver .co.,ltd\r
                                2-14-4, shinyokohama\r
@@ -17603,6 +18005,252 @@ CD2000-CD2FFF     (base 16)           TRUMPF Huttinger GmbH + Co. KG,
                                Broomfield  CO  80021\r
                                US\r
 \r
+8C-1F-64   (hex)               HuiTong intelligence Company\r
+240000-240FFF     (base 16)            HuiTong intelligence Company\r
+                               8F., No. 51, Ln. 258, Rueiguang Rd., Neihu Dist., Taipei City 114, Taiwan (R.O.C.)\r
+                               Taipei    114\r
+                               TW\r
+\r
+8C-1F-64   (hex)               axelife\r
+AA8000-AA8FFF     (base 16)            axelife\r
+                               17 place Eugène Lafontaine\r
+                               Saint Nicolas de Redon    44460\r
+                               FR\r
+\r
+8C-1F-64   (hex)               Zynex Monitoring Solutions\r
+8B9000-8B9FFF     (base 16)            Zynex Monitoring Solutions\r
+                               9555 Maroon Circle\r
+                               Englewood    80112\r
+                               US\r
+\r
+8C-1F-64   (hex)               MClavis Co.,Ltd.\r
+AB7000-AB7FFF     (base 16)            MClavis Co.,Ltd.\r
+                               2nd Fl. 9, Dongsan-ro 14gil, Seocho-gu\r
+                               Seoul  Seoul  06784\r
+                               KR\r
+\r
+8C-1F-64   (hex)               TIAMA\r
+5EB000-5EBFFF     (base 16)            TIAMA\r
+                               215 Chemin du Grand Revoyet \r
+                               Saint-Genis Laval   Auvergne Rhône Alpes  69230\r
+                               FR\r
+\r
+8C-1F-64   (hex)               SANWA CORPORATION\r
+C04000-C04FFF     (base 16)            SANWA CORPORATION\r
+                               808, Shimbashi ekimae bldg. No.1, 2-20-15 Shimbashi, minato-ku\r
+                               minato-ku  Tokyo  1050004\r
+                               JP\r
+\r
+8C-1F-64   (hex)               Beijing Aoxing Technology Co.,Ltd\r
+45B000-45BFFF     (base 16)            Beijing Aoxing Technology Co.,Ltd\r
+                               No.204,2f,building 8,Zhongguancun Software Park,No.8,Dongbeiwang West Road,Haidian District\r
+                               BeiJing  BeiJing  100193\r
+                               CN\r
+\r
+8C-1F-64   (hex)               Axcend\r
+E62000-E62FFF     (base 16)            Axcend\r
+                               5252 N Edgewood Dr\r
+                               Provo  UT  84604\r
+                               US\r
+\r
+70-B3-D5   (hex)               DCS Corp\r
+900000-900FFF     (base 16)            DCS Corp\r
+                               295 Foster Street Suite 120\r
+                               Littleton  MA  01460\r
+                               US\r
+\r
+8C-1F-64   (hex)               Monnit Corporation\r
+739000-739FFF     (base 16)            Monnit Corporation\r
+                               450 South Simmons STE 670\r
+                               Kaysville  UT  84037\r
+                               US\r
+\r
+8C-1F-64   (hex)               MB connect line GmbH Fernwartungssysteme\r
+2FB000-2FBFFF     (base 16)            MB connect line GmbH Fernwartungssysteme\r
+                               Winnettener Straße 6\r
+                               Dinkelsbuehl  Bavaria  91550\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Orange Precision Measurement LLC\r
+7EE000-7EEFFF     (base 16)            Orange Precision Measurement LLC\r
+                               212 Technology Dr,Suite K\r
+                               Irvine    92618\r
+                               US\r
+\r
+8C-1F-64   (hex)               Druck Ltd.\r
+8E5000-8E5FFF     (base 16)            Druck Ltd.\r
+                               Firtree Lane, Groby, Leicester\r
+                               Le6 0FH  England  \r
+                               GB\r
+\r
+8C-1F-64   (hex)               Corigine,Inc.\r
+306000-306FFF     (base 16)            Corigine,Inc.\r
+                               Room202 ,west side of 2nd floor,Building 1,1516 Hongfeng Road\r
+                               Huzhou  Zhejiang  313000 \r
+                               CN\r
+\r
+8C-1F-64   (hex)               NAS Engineering PRO\r
+D20000-D20FFF     (base 16)            NAS Engineering PRO\r
+                               Liduma 17\r
+                               Jelgava  Jelgava  LV-3001\r
+                               LV\r
+\r
+70-B3-D5   (hex)               YPP Corporation\r
+119000-119FFF     (base 16)            YPP Corporation\r
+                               24\r
+                               Geumchon-gu  Seoul  153-802\r
+                               KR\r
+\r
+8C-1F-64   (hex)               Applied Materials\r
+D3A000-D3AFFF     (base 16)            Applied Materials\r
+                               2100 Brighton Henrietta Townline Rd\r
+                               Rochester  NY  14623\r
+                               US\r
+\r
+70-B3-D5   (hex)               HKC Security Ltd.\r
+CB7000-CB7FFF     (base 16)            HKC Security Ltd.\r
+                               Parkway Business Centre\r
+                               Ballymount  Dublin  Dublin 24\r
+                               IE\r
+\r
+8C-1F-64   (hex)               Invendis Technologies India Pvt Ltd\r
+FFC000-FFCFFF     (base 16)            Invendis Technologies India Pvt Ltd\r
+                               #230 BOOHBCS Layout BTM 2nd Stage 38th MAIN 1ST CROSS\r
+                               Bengaluru  Karnataka  560068\r
+                               IN\r
+\r
+8C-1F-64   (hex)               Mokila Networks Pvt Ltd\r
+23D000-23DFFF     (base 16)            Mokila Networks Pvt Ltd\r
+                               101, First Floor, Block 1, White HouseKundanbagh, Begumpet\r
+                               Hyderabad  Telangana  500016\r
+                               IN\r
+\r
+70-B3-D5   (hex)               KSE GmbH\r
+D41000-D41FFF     (base 16)            KSE GmbH\r
+                               Kaethe Paulus Strasse 6\r
+                               Koesching    85092\r
+                               DE\r
+\r
+8C-1F-64   (hex)               MB connect line GmbH Fernwartungssysteme\r
+366000-366FFF     (base 16)            MB connect line GmbH Fernwartungssysteme\r
+                               Winnettener Straße 6\r
+                               Dinkelsbuehl  Bavaria  91550\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Sound Health Systems\r
+BCC000-BCCFFF     (base 16)            Sound Health Systems\r
+                               650B Fremont Ave #65\r
+                               Los Altos  CA  94024\r
+                               US\r
+\r
+8C-1F-64   (hex)               Colombo Sales & Engineering, Inc.\r
+7E0000-7E0FFF     (base 16)            Colombo Sales & Engineering, Inc.\r
+                               17108 S. Hemlock Rd\r
+                               Oakley  MI  48649\r
+                               US\r
+\r
+8C-1F-64   (hex)               robert juliat\r
+7E7000-7E7FFF     (base 16)            robert juliat\r
+                               32 route de beaumont\r
+                               fresnoy en thelle  Oise  60530\r
+                               FR\r
+\r
+8C-1F-64   (hex)               Paul Tagliamonte\r
+354000-354FFF     (base 16)            Paul Tagliamonte\r
+                               PO Box 15335\r
+                               Washington  DC  20003\r
+                               US\r
+\r
+70-B3-D5   (hex)               Medicomp, Inc\r
+591000-591FFF     (base 16)            Medicomp, Inc\r
+                               600 Atlantis Rd\r
+                               Melbourne  FL  32904\r
+                               US\r
+\r
+8C-1F-64   (hex)               Koizumi Lighting Technology Corp.\r
+26E000-26EFFF     (base 16)            Koizumi Lighting Technology Corp.\r
+                               3-5-2-Chome\r
+                               Higashinakamoto,Higashinari-ku,Osaka    537-0021\r
+                               JP\r
+\r
+8C-1F-64   (hex)               Converging Systems Inc.\r
+009000-009FFF     (base 16)            Converging Systems Inc.\r
+                               32420 Nautilus Drive\r
+                               Rancho Palos Verdes  CA  90275\r
+                               US\r
+\r
+8C-1F-64   (hex)               TYT Electronics CO., LTD\r
+252000-252FFF     (base 16)            TYT Electronics CO., LTD\r
+                               Block 39-1, Optoelectronics-information industry base, Nan’an,\r
+                               Quanzhou  Fujian  362300\r
+                               CN\r
+\r
+8C-1F-64   (hex)               Local Security\r
+D5B000-D5BFFF     (base 16)            Local Security\r
+                               113-437 Martin StreetSuite 422\r
+                               Penticton  BC  V2A5L1\r
+                               CA\r
+\r
+8C-1F-64   (hex)               YUYAMA MFG Co.,Ltd\r
+2C6000-2C6FFF     (base 16)            YUYAMA MFG Co.,Ltd\r
+                               1-4-30\r
+                               MEISHINGUCHI,TOYONAKA  OSAKA  561-0841\r
+                               JP\r
+\r
+8C-1F-64   (hex)               MinebeaMitsumi Inc.\r
+AF0000-AF0FFF     (base 16)            MinebeaMitsumi Inc.\r
+                               3-9-6, Mita\r
+                               Minato-ku  Tokyo  1080073\r
+                               JP\r
+\r
+8C-1F-64   (hex)               OMNIVISION\r
+387000-387FFF     (base 16)            OMNIVISION\r
+                               4275 Burton Dr\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+8C-1F-64   (hex)               TRON FUTURE TECH INC.\r
+15C000-15CFFF     (base 16)            TRON FUTURE TECH INC.\r
+                               7F-A, No. 1, Sec. 3, Gongdao 5th Rd., Hsinchu 300, Taiwan (R.O.C.)\r
+                               Hsinchu    30069\r
+                               TW\r
+\r
+8C-1F-64   (hex)               qiio AG\r
+08E000-08EFFF     (base 16)            qiio AG\r
+                               Am Wasser 24\r
+                               Zurich  Zurich  8049\r
+                               CH\r
+\r
+8C-1F-64   (hex)               Elbit Systems of America, LLC\r
+2A9000-2A9FFF     (base 16)            Elbit Systems of America, LLC\r
+                               3401 Quorum Drive (Suite 380)\r
+                               Fortworth  TX  76137\r
+                               US\r
+\r
+8C-1F-64   (hex)               Pharsighted LLC\r
+46A000-46AFFF     (base 16)            Pharsighted LLC\r
+                               7 Pepperidge Road\r
+                               Boonton Township  NJ  07005\r
+                               US\r
+\r
+8C-1F-64   (hex)               GSP Sprachtechnologie GmbH\r
+F10000-F10FFF     (base 16)            GSP Sprachtechnologie GmbH\r
+                               Teltowkanalstraße 1\r
+                               Berlin    12247\r
+                               DE\r
+\r
+8C-1F-64   (hex)               EA Elektro-Automatik\r
+F57000-F57FFF     (base 16)            EA Elektro-Automatik\r
+                               Helmholtzstraße 31-37\r
+                               Viersen  Nordrhein-Westfalen  41747\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Flextronics International Kft\r
+3B0000-3B0FFF     (base 16)            Flextronics International Kft\r
+                               38. Zrinyi Str.\r
+                               Zalaegerszeg  Zala  8900\r
+                               HU\r
+\r
 70-B3-D5   (hex)               YUYAMA MFG Co.,Ltd\r
 BBB000-BBBFFF     (base 16)            YUYAMA MFG Co.,Ltd\r
                                3-3-1\r
@@ -17978,9 +18626,6 @@ DD9000-DD9FFF     (base 16)             MaNima Technologies BV
                                Ann Arbor  MI  48108\r
                                US\r
 \r
-70-B3-D5   (hex)               Private\r
-4F8000-4F8FFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               Becton Dickinson\r
 808000-808FFF     (base 16)            Becton Dickinson\r
                                7 Loveton Circle\r
@@ -19280,12 +19925,6 @@ C49000-C49FFF     (base 16)            BTG Instruments AB
                                SEOUL    04790\r
                                KR\r
 \r
-70-B3-D5   (hex)               HKC Limited\r
-F1F000-F1FFFF     (base 16)            HKC Limited\r
-                               Parkway Business Centre\r
-                               Ballymount  Dublin  Dublin 24\r
-                               IE\r
-\r
 70-B3-D5   (hex)               Gogo BA \r
 002000-002FFF     (base 16)            Gogo BA \r
                                105 Edgeview Drive\r
@@ -22496,12 +23135,6 @@ BDB000-BDBFFF     (base 16)            Power Electronics Espana, S.L.
                                lliria  Valencia  46160\r
                                ES\r
 \r
-70-B3-D5   (hex)               AADONA Communication Pvt Ltd\r
-ED9000-ED9FFF     (base 16)            AADONA Communication Pvt Ltd\r
-                               1st Floor, Phoenix Tech Tower, Plot No. 14/46, IDA - Uppal\r
-                               Hyderabad  Telangana  500039\r
-                               IN\r
-\r
 70-B3-D5   (hex)               Eon\r
 E62000-E62FFF     (base 16)            Eon\r
                                415, Heungan-daero, Dongan-gu, Anyang-si, Gyeonggi-do, Republic of Korea\r
@@ -23573,6 +24206,144 @@ CAF000-CAFFFF     (base 16)           BRS Sistemas Eletrônicos
                                Alava  SPAIN  01510\r
                                ES\r
 \r
+8C-1F-64   (hex)               CSIRO\r
+626000-626FFF     (base 16)            CSIRO\r
+                               Cnr Vimiera and Pembroke Roads\r
+                               Marsfield  NSW  2122\r
+                               AU\r
+\r
+8C-1F-64   (hex)               SkyCell AG\r
+C05000-C05FFF     (base 16)            SkyCell AG\r
+                               Hardturmstrasse 11\r
+                               Zürich  ZH  8005\r
+                               CH\r
+\r
+8C-1F-64   (hex)               STV Electronic GmbH\r
+3FC000-3FCFFF     (base 16)            STV Electronic GmbH\r
+                               Hellweg 203-205\r
+                               Schloss Holte  Nordrhein Westfalen  33758\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Foerster-Technik GmbH\r
+79B000-79BFFF     (base 16)            Foerster-Technik GmbH\r
+                               Gerwigstraße 25\r
+                               Engen  Baden-Württemberg  78234\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Sanchar Telesystems limited\r
+B55000-B55FFF     (base 16)            Sanchar Telesystems limited\r
+                               A-78, GROUND FLOOR, OKHLA INDUSTRIAL AREA, PHASE - II, NEW DELHI\r
+                               New Delhi  Delhi  110020\r
+                               IN\r
+\r
+70-B3-D5   (hex)               HKC Security Ltd.\r
+F1F000-F1FFFF     (base 16)            HKC Security Ltd.\r
+                               Parkway Business Centre\r
+                               Ballymount  Dublin  Dublin 24\r
+                               IE\r
+\r
+8C-1F-64   (hex)               Thales Nederland BV\r
+FB4000-FB4FFF     (base 16)            Thales Nederland BV\r
+                               PO Box 42\r
+                               Hengelo  OV  7554 PA\r
+                               NL\r
+\r
+70-B3-D5   (hex)               AADONA Communication Pvt Ltd\r
+ED9000-ED9FFF     (base 16)            AADONA Communication Pvt Ltd\r
+                               1st Floor, Phoenix Tech Tower, Plot No. 14/46, IDA - Uppal\r
+                               Hyderabad   Telangana  500039\r
+                               IN\r
+\r
+8C-1F-64   (hex)               aelettronica group srl\r
+1A7000-1A7FFF     (base 16)            aelettronica group srl\r
+                               via matteotti,22\r
+                               gaggiano  milano  20083\r
+                               IT\r
+\r
+8C-1F-64   (hex)               Zelp Ltd\r
+17C000-17CFFF     (base 16)            Zelp Ltd\r
+                               102 St Pancras Way\r
+                               London  Select  NW1 9ND\r
+                               GB\r
+\r
+8C-1F-64   (hex)               Gridnt\r
+D53000-D53FFF     (base 16)            Gridnt\r
+                               1166 XinLuo Street\r
+                               JiNan  ShanDong  250100\r
+                               CN\r
+\r
+8C-1F-64   (hex)               MTU Aero Engines AG\r
+825000-825FFF     (base 16)            MTU Aero Engines AG\r
+                               Dachauer Straße 665\r
+                               München  Bavaria  80995\r
+                               DE\r
+\r
+8C-1F-64   (hex)               KC5 International Sdn Bhd\r
+F56000-F56FFF     (base 16)            KC5 International Sdn Bhd\r
+                               253G-4-3, Premier Centre, Jalan Burma\r
+                               Penang    10350\r
+                               MY\r
+\r
+70-B3-D5   (hex)               SICPA SA - GSS\r
+4F8000-4F8FFF     (base 16)            SICPA SA - GSS\r
+                               Route des Flumeaux 50\r
+                               Prilly    1008\r
+                               CH\r
+\r
+8C-1F-64   (hex)               Shanghai Wise-Tech Intelligent Technology Co.,Ltd.\r
+A0A000-A0AFFF     (base 16)            Shanghai Wise-Tech Intelligent Technology Co.,Ltd.\r
+                               Room 408, building C, No. 154, Lane 953, Jianchuan Road, Minhang District\r
+                               Shanghai  Shanghai  201100\r
+                               CN\r
+\r
+8C-1F-64   (hex)               DEUTA Controls GmbH\r
+32F000-32FFFF     (base 16)            DEUTA Controls GmbH\r
+                               Paffrather Str. 140\r
+                               Bergisch Gladbach  NRW  51465\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Rich Source Precision IND., Co., LTD.\r
+0EE000-0EEFFF     (base 16)            Rich Source Precision IND., Co., LTD.\r
+                               8F., No. 219, Sec. 2, New Taipei Blvd.\r
+                               New Taipei City  Xinzhuang Dist  242\r
+                               TW\r
+\r
+8C-1F-64   (hex)               M2M craft Co., Ltd.\r
+B67000-B67FFF     (base 16)            M2M craft Co., Ltd.\r
+                               N23 bldg. 6F, Nishi 5-2-39, Kita 23-jo , Kita-ku\r
+                               Sapporo  Hokkaido  001-0023\r
+                               JP\r
+\r
+8C-1F-64   (hex)               ZIN TECHNOLOGIES\r
+E94000-E94FFF     (base 16)            ZIN TECHNOLOGIES\r
+                               6745 Engle Road\r
+                               Middleburg Heights  OH  44130\r
+                               US\r
+\r
+8C-1F-64   (hex)               Aaronn Electronic GmbH\r
+7E2000-7E2FFF     (base 16)            Aaronn Electronic GmbH\r
+                               Zeppelinstrasse 2\r
+                               Puchheim    82178\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Abbott Diagnostics Technologies AS\r
+39E000-39EFFF     (base 16)            Abbott Diagnostics Technologies AS\r
+                               P. O.  Box 6863 Rodeløkka\r
+                               Oslo    0504\r
+                               NO\r
+\r
+8C-1F-64   (hex)               IDEX India Pvt Ltd\r
+F23000-F23FFF     (base 16)            IDEX India Pvt Ltd\r
+                               Survey No 256 Nr Bombardier CircleGIDC Manjusar\r
+                               Vadodara  Gujarat  391775\r
+                               IN\r
+\r
+8C-1F-64   (hex)               TECHNOLOGIES BACMOVE INC.\r
+BE8000-BE8FFF     (base 16)            TECHNOLOGIES BACMOVE INC.\r
+                               2610 rue du Gardenia\r
+                               Quebec  Quebec  G1M 3P7\r
+                               CA\r
+\r
 70-B3-D5   (hex)               DISMUNTEL SAL\r
 92C000-92CFFF     (base 16)            DISMUNTEL SAL\r
                                Pol ind cotes\r
@@ -23912,9 +24683,6 @@ C5F000-C5FFFF     (base 16)             Clean-Lasersysteme GmbH
                                Herzogenrath  NRW  52134\r
                                DE\r
 \r
-70-B3-D5   (hex)               Private\r
-E2D000-E2DFFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               Altaneos\r
 69A000-69AFFF     (base 16)            Altaneos\r
                                Chaussée Verte, 93B\r
@@ -24401,9 +25169,6 @@ C35000-C35FFF     (base 16)             Vibrationmaster
                                BeiJing  BeiJing  100020\r
                                CN\r
 \r
-70-B3-D5   (hex)               Private\r
-66A000-66AFFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               Keepen\r
 69C000-69CFFF     (base 16)            Keepen\r
                                12, rue Anselme\r
@@ -27506,12 +28271,6 @@ A38000-A38FFF     (base 16)            Aditec GmbH
                                Offenau  Baden-Wuerttemberg  74254\r
                                DE\r
 \r
-70-B3-D5   (hex)               Elektro Adrian\r
-FF6000-FF6FFF     (base 16)            Elektro Adrian\r
-                               Via Garibaldi no.1\r
-                               Predazzo  Trento  38037\r
-                               IT\r
-\r
 70-B3-D5   (hex)               PEEK TRAFFIC\r
 691000-691FFF     (base 16)            PEEK TRAFFIC\r
                                5401 N SAM HOUSTON PKWY W\r
@@ -27560,12 +28319,6 @@ D27000-D27FFF     (base 16)            Light field Lab
                                Groebenzell  Bayern  82194\r
                                DE\r
 \r
-70-B3-D5   (hex)               KSE GmbH\r
-38A000-38AFFF     (base 16)            KSE GmbH\r
-                               Frühlingstraße 31-33\r
-                               Ingolstadt    85055\r
-                               DE\r
-\r
 70-B3-D5   (hex)               Maytronics Ltd.\r
 90E000-90EFFF     (base 16)            Maytronics Ltd.\r
                                \r
@@ -29309,8 +30062,254 @@ DFE000-DFEFFF     (base 16)           Nuvation Energy
                                Middletown  DE  19709\r
                                US\r
 \r
+8C-1F-64   (hex)               IAV ENGINEERING SARL\r
+968000-968FFF     (base 16)            IAV ENGINEERING SARL\r
+                               4a chemin des couleuvres\r
+                               Tannay  VD  1295\r
+                               CH\r
+\r
 8C-1F-64   (hex)               Belden India Private Limited\r
 54A000-54AFFF     (base 16)            Belden India Private Limited\r
                                Plot No. D-228, Chakan MIDC Phase 2, \r
                                Village Bhamboli, Taluka:Khed  Pune, Maharashtra  410 507\r
                                IN\r
+\r
+8C-1F-64   (hex)               I/O Controls\r
+FC2000-FC2FFF     (base 16)            I/O Controls\r
+                               1357 W Foothill Blvd\r
+                               Azusa  CA  91702\r
+                               US\r
+\r
+8C-1F-64   (hex)               SemaConnect, Inc\r
+F5B000-F5BFFF     (base 16)            SemaConnect, Inc\r
+                               4961 Tesla Drive \r
+                               Bowie  MD  20715\r
+                               US\r
+\r
+70-B3-D5   (hex)               Nomadic\r
+66A000-66AFFF     (base 16)            Nomadic\r
+                               101 Glacier Point, Suite E\r
+                               San Rafael  CA  94901\r
+                               US\r
+\r
+70-B3-D5   (hex)               BAE Systems Apllied Intelligence\r
+E2D000-E2DFFF     (base 16)            BAE Systems Apllied Intelligence\r
+                               170 Waterside House\r
+                               Guildford  Surrey  GU2 7RQ\r
+                               GB\r
+\r
+8C-1F-64   (hex)               GlobalInvacom\r
+5DB000-5DBFFF     (base 16)            GlobalInvacom\r
+                               Global Invacom LTD,Network house ,station road\r
+                               Maldon  Essex  CM9 4LQ\r
+                               GB\r
+\r
+8C-1F-64   (hex)               Control Aut Tecnologia em Automação LTDA\r
+511000-511FFF     (base 16)            Control Aut Tecnologia em Automação LTDA\r
+                               Rua Pedregulhos, 48\r
+                               Campinas   São Paulo  13090716\r
+                               BR\r
+\r
+8C-1F-64   (hex)               Anteus Kft.\r
+D2A000-D2AFFF     (base 16)            Anteus Kft.\r
+                               Veres Péter út 48\r
+                               Budapest    1163\r
+                               HU\r
+\r
+8C-1F-64   (hex)               Guan Show Technologe Co., Ltd.\r
+7B5000-7B5FFF     (base 16)            Guan Show Technologe Co., Ltd.\r
+                               No.127, Jianguo 1st Rd., Lingya Dist.\r
+                                Kaohsiung City     802\r
+                               TW\r
+\r
+8C-1F-64   (hex)               KEYLINE S.P.A.\r
+7B6000-7B6FFF     (base 16)            KEYLINE S.P.A.\r
+                               VIA CAMILLO BIANCHI, 2\r
+                               CONEGLIANO  TV  31015\r
+                               IT\r
+\r
+8C-1F-64   (hex)               Potter Electric Signal Company\r
+14B000-14BFFF     (base 16)            Potter Electric Signal Company\r
+                               1609 Park 370 Place\r
+                               Hazelwood, MO    63042\r
+                               US\r
+\r
+8C-1F-64   (hex)               Xicato\r
+1B5000-1B5FFF     (base 16)            Xicato\r
+                               102 Cooper Court\r
+                               LOS GATOS  CA  95032\r
+                               US\r
+\r
+8C-1F-64   (hex)               Sejong security system Cor.\r
+3CD000-3CDFFF     (base 16)            Sejong security system Cor.\r
+                               chungnam cheonansi dongnamgu tongjung 1ro 18(sinbangdong)\r
+                               cheonan     31208\r
+                               KR\r
+\r
+8C-1F-64   (hex)               Norvento Tecnología, S.L.\r
+740000-740FFF     (base 16)            Norvento Tecnología, S.L.\r
+                               Calle Ramón María Aller Ulloa, 23.\r
+                               Lugo  Lugo  27003\r
+                               ES\r
+\r
+8C-1F-64   (hex)               Xiamen Rgblink Science & Technology Co., Ltd.\r
+16D000-16DFFF     (base 16)            Xiamen Rgblink Science & Technology Co., Ltd.\r
+                               Room 601A, No. 37-3 Banshang community, Building 3, Xinke Plaza, Torch Hi-Tech Industrial Development Zone, \r
+                               Xiamen,  Fujian  361115\r
+                               CN\r
+\r
+8C-1F-64   (hex)               CAITRON GmbH\r
+F12000-F12FFF     (base 16)            CAITRON GmbH\r
+                               Gewerbepark Edelweiss 4\r
+                               Weissensberg    88138\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Ensto Protrol AB\r
+67C000-67CFFF     (base 16)            Ensto Protrol AB\r
+                               Alfagatan 3\r
+                               Mölndal    SE-43149\r
+                               SE\r
+\r
+8C-1F-64   (hex)               Vtron Pty Ltd\r
+133000-133FFF     (base 16)            Vtron Pty Ltd\r
+                               Unit 2, 62 Township Drive West\r
+                               West Burleigh  Queensland  4219\r
+                               AU\r
+\r
+8C-1F-64   (hex)               ??????????\r
+F3B000-F3BFFF     (base 16)            ??????????\r
+                               ???????????????1?1?2?219?\r
+                               Beijing    102300\r
+                               CN\r
+\r
+8C-1F-64   (hex)               HKC Security Ltd.\r
+B0F000-B0FFFF     (base 16)            HKC Security Ltd.\r
+                               Parkway Business Centre\r
+                               Ballymount  Dublin  D24 WY49\r
+                               IE\r
+\r
+8C-1F-64   (hex)               Byte Lab Grupa d.o.o.\r
+F3D000-F3DFFF     (base 16)            Byte Lab Grupa d.o.o.\r
+                               Medarska 69/1\r
+                               Zagreb    10090\r
+                               HR\r
+\r
+70-B3-D5   (hex)               Elektro Adrian\r
+FF6000-FF6FFF     (base 16)            Elektro Adrian\r
+                               Via Garibaldi no.1\r
+                               Predazzo   Trento  38037\r
+                               IT\r
+\r
+8C-1F-64   (hex)               Zhuhai Lonl electric Co.,Ltd\r
+DAF000-DAFFFF     (base 16)            Zhuhai Lonl electric Co.,Ltd\r
+                               2nd Floor,building B3,nanfang software park, xiangzhou district\r
+                               Zhuhai  Guangdong  519000\r
+                               CN\r
+\r
+70-B3-D5   (hex)               KSE GmbH\r
+38A000-38AFFF     (base 16)            KSE GmbH\r
+                               Kaethe Paulus Strasse 6\r
+                               Koesching    85092\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Weinan Wins Future Technology Co.,Ltd\r
+F39000-F39FFF     (base 16)            Weinan Wins Future Technology Co.,Ltd\r
+                               The northwest corner of the intersection of Chaoyang Avenue and Gaoxin West Road,No.87 Chaoyang Avenue,High-tech Industrial Development Zone\r
+                               Weinan  Shanxi  714000\r
+                               CN\r
+\r
+8C-1F-64   (hex)               Rax-Tech International\r
+1B7000-1B7FFF     (base 16)            Rax-Tech International\r
+                               5th floor, 5/391 Kaleeswari towerTambaram-Velachery Main road, Medavakkam\r
+                               Chennai  Tamil Nadu  600100\r
+                               IN\r
+\r
+8C-1F-64   (hex)               ENIGMA SOI Sp. z o.o.\r
+553000-553FFF     (base 16)            ENIGMA SOI Sp. z o.o.\r
+                               Jutrzenki 116\r
+                               Warsaw    02-230\r
+                               PL\r
+\r
+8C-1F-64   (hex)               Golding Audio Ltd\r
+39A000-39AFFF     (base 16)            Golding Audio Ltd\r
+                               8 Peartree Business Centre, Stanway\r
+                               Colchester  Essex  CO30JN\r
+                               GB\r
+\r
+8C-1F-64   (hex)               Action Streamer LLC\r
+65D000-65DFFF     (base 16)            Action Streamer LLC\r
+                               1776 Mentor AveSuite 179\r
+                               Cincinnati  OH  45212\r
+                               US\r
+\r
+8C-1F-64   (hex)               RealD, Inc.\r
+44F000-44FFFF     (base 16)            RealD, Inc.\r
+                               9777 Wilshire Boulevard, Ste 430\r
+                                Beverly Hills  CA  90212\r
+                               US\r
+\r
+8C-1F-64   (hex)               Nautel LTD\r
+E46000-E46FFF     (base 16)            Nautel LTD\r
+                               10089 Peggy's Cove Road\r
+                               Hackett's Cove  NS  B3Z 3J4\r
+                               CA\r
+\r
+8C-1F-64   (hex)               INVENTIA Sp. z o.o.\r
+1C0000-1C0FFF     (base 16)            INVENTIA Sp. z o.o.\r
+                               Poleczki 23\r
+                               Warszawa  Mazowieckie  02-822\r
+                               PL\r
+\r
+8C-1F-64   (hex)               BTG Instruments AB\r
+5EA000-5EAFFF     (base 16)            BTG Instruments AB\r
+                               Industrigatan 1-3\r
+                               Saffle  Varmland  66132\r
+                               SE\r
+\r
+8C-1F-64   (hex)               Active Optical Systems, LLC\r
+A60000-A60FFF     (base 16)            Active Optical Systems, LLC\r
+                               9019 Washington Street NortheastSuite B-2\r
+                               Albuquerque  NM  87113\r
+                               US\r
+\r
+8C-1F-64   (hex)               BITECHNIK GmbH\r
+A00000-A00FFF     (base 16)            BITECHNIK GmbH\r
+                               Dresdner Str. 49/5/Top 2\r
+                               Vienna    1200\r
+                               AT\r
+\r
+8C-1F-64   (hex)               Böckelt GmbH\r
+9B3000-9B3FFF     (base 16)            Böckelt GmbH\r
+                               Ludwig-Erhard-Straße6\r
+                               Wenden  NRW  57482\r
+                               DE\r
+\r
+8C-1F-64   (hex)               VITREA Smart Home Technologies Ltd.\r
+CC1000-CC1FFF     (base 16)            VITREA Smart Home Technologies Ltd.\r
+                               3 Abraham Buma Shavit, 4A\r
+                               Rishon Lezion    7559907\r
+                               IL\r
+\r
+8C-1F-64   (hex)               Wagner Group GmbH\r
+518000-518FFF     (base 16)            Wagner Group GmbH\r
+                               Schleswigstrasse 1-5\r
+                               Langenhagen    30853\r
+                               DE\r
+\r
+8C-1F-64   (hex)               Novanta IMS\r
+58E000-58EFFF     (base 16)            Novanta IMS\r
+                               370 North Main St\r
+                               Marlborough   CT  06447\r
+                               US\r
+\r
+8C-1F-64   (hex)               QUANTAFLOW\r
+700000-700FFF     (base 16)            QUANTAFLOW\r
+                               AVENUE DU CANADA\r
+                               HONFLEUR    14600\r
+                               FR\r
+\r
+8C-1F-64   (hex)               ELTEK SpA\r
+56C000-56CFFF     (base 16)            ELTEK SpA\r
+                               Strada Valenza 5/A\r
+                               Casale Monferrato  Alessandria  15033\r
+                               IT\r

diff --git a/hwdb.d/pci.ids b/hwdb.d/pci.ids
index ba1be0bbc1fc4b1d31910cc30498dc198224ac92..29b30b62fde592f29efa51e8afe0654c798435f5 100644 (file)
--- a/hwdb.d/pci.ids
+++ b/hwdb.d/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2022.05.18
-#      Date:    2022-05-18 03:15:02
+#      Version: 2022.09.09
+#      Date:    2022-09-09 03:15:02
 #
 #      Maintained by Albert Pool, Martin Mares, and other volunteers from
 #      the PCI ID Project at https://pci-ids.ucw.cz/.
@@ -72,6 +72,7 @@
 01de  Oxide Computer Company
        0000  Propolis NVMe Controller
        0001  Propolis xHCI Controller
+       0002  Propolis PCI-PCI Bridge
 # probably misprogrammed Intel Atom C2338 on Dell 0K8Y0N board
 0200  Dell (wrong ID)
 # 021b is not Compaq but there is a board misprogrammed
@@ -489,6 +490,7 @@
                1028 1f4f  PERC H730P Slim
                1028 1f54  PERC FD33xD
                1028 1fd1  PERC H730P MX
+               1734 11f6  PRAID EP400i
                17aa 1052  ThinkServer RAID 720i
                17aa 1053  ThinkServer RAID 720ix
                1bd4 0014  12G SAS3108 2G
@@ -735,6 +737,8 @@
                1000 46a0  MegaRAID 9660-24i Tri-Mode Storage Adapter
                1000 46c0  eHBA 9680W-16e Tri-Mode Storage Adapter
                1000 46d0  eHBA 9600-8i8e Tri-Mode Storage Adapter
+# eHBA 9602W-16e Tri-Mode Storage Adapter
+               1000 46e0  eHBA 9602W-16e Tri-Mode Storage Adapter
                1028 2114  PERC H965i Adapter
                1028 2115  PERC H965i Front
                1028 2117  PERC H965i MX
@@ -749,6 +753,7 @@
                1028 2142  HBA465e Adapter
                1028 2209  HBA465i Adapter
                1028 220a  HBA465i Front
+               1d49 020a  ThinkSystem 450W-16e SAS/SATA PCIe Gen4 24Gb HBA
        00ab  SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
 # 8 Internal and 8 External port channel 9400 HBA
                1000 3040  HBA 9400-8i8e
@@ -846,6 +851,7 @@
                1028 2170  HBA350i MM
                1028 2175  HBA350i Adapter
                1028 2197  HBA350i MM LP
+               1028 2212  HBA355e-s Adapter
                1d49 0205  ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA
                1d49 0206  ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA
                1d49 0207  ThinkSystem 440-8i SAS/SATA PCIe Gen4 12Gb HBA
@@ -867,6 +873,8 @@
                1d49 0002  ThinkSystem 810-4P NVMe Switch Adapter
        02b1  Virtual Endpoint on PCIe Switch (9749)
                1d49 0004  ThinkSystem 1610-8P NVMe Switch Adapter
+# Virtual endpoint used in Broadcom synthetic PCIe switches for resource reservation
+       02b2  Virtual PCIe Placeholder Endpoint
        0407  MegaRAID
                1000 0530  MegaRAID 530 SCSI 320-0X RAID Controller
                1000 0531  MegaRAID 531 SCSI 320-4X RAID Controller
@@ -987,6 +995,7 @@
        10e4  MegaRAID 12GSAS/PCIe Unsupported SAS38xx
        10e5  MegaRAID 12GSAS/PCIe SAS38xx
        10e6  MegaRAID 12GSAS/PCIe Secure SAS38xx
+               1000 40e0  MegaRAID 9540-2M2
                1028 2172  PERC H355 Adapter
                1028 2173  PERC H355 Front
                1028 2174  PERC H350 Mini
@@ -1010,10 +1019,29 @@
                8086 0523  MegaRAID RAID Controller SRCS16
        3050  SAS2008 PCI-Express Fusion-MPT SAS-2
        6001  DX1 Multiformat Broadcast HD/SD Encoder/Decoder
-       c010  PEX88048 50 lane, 50 port, PCI Express Gen 4.0 ExpressFabric Platform
+       c010  PEX880xx PCIe Gen 4 Switch
+               1000 100b  PEX88000 PCIe Gen 4 Virtual Upstream/Downstream Port
+               1000 2004  PEX88000 Virtual PCIe TWC/NT2 Endpoint
+               1000 2005  PEX88000 Virtual PCIe gDMA Endpoint
+               1000 a024  PEX88024 24 lane/port PCIe Gen 4.0 Switch
+               1000 a032  PEX88032 32 lane/port PCIe Gen 4 Switch
+               1000 a048  PEX88048 50 lane/port PCIe Gen 4.0 Switch
+               1000 a064  PEX88064 64 lane/port PCIe Gen 4 Switch
+               1000 a080  PEX88080 80 lane/port PCIe Gen 4 Switch
+               1000 a096  PEX88096 98 lane/port PCIe Gen 4.0 Switch
        c012  PEX880xx PCIe Gen 4 Switch
                1d49 0003  ThinkSystem 1611-8P PCIe Gen4 NVMe Switch Adapter
        c030  PEX890xx PCIe Gen 5 Switch
+               1000 0024  PEX89024 PCIe Gen 5 24 port/lane Switch Upstream/Downstream Port
+               1000 0032  PEX89032 PCIe Gen 5 32 port/lane Switch Upstream/Downstream Port
+               1000 0048  PEX89048 PCIe Gen 5 48 port/lane Switch Upstream/Downstream Port
+               1000 0072  PEX89072 PCIe Gen 5 36 port/72 lane Switch Upstream/Downstream Port
+               1000 0088  PEX89088 PCIe Gen 5 44 port/88 lane Switch Upstream/Downstream Port
+               1000 0104  PEX89104 PCIe Gen 5 52 port/104 lane Switch Upstream/Downstream Port
+               1000 0144  PEX89144 PCIe Gen 5 72 port/144 lane Switch Upstream/Downstream Port
+               1000 100b  PEX89000 PCIe Gen 5 Virtual Upstream/Downstream Port
+               1000 2004  PEX89000 Virtual PCIe TWC/NT 2.0 Endpoint
+               1000 2005  PEX89000 Virtual PCIe gDMA Endpoint
 1001  Kolter Electronic
        0010  PCI 1616 Measurement card with 32 digital I/O lines
        0011  OPTO-PCI Opto-Isolated digital I/O board
@@ -1053,7 +1081,8 @@
        131b  Kaveri [Radeon R4 Graphics]
        131c  Kaveri [Radeon R7 Graphics]
        131d  Kaveri [Radeon R6 Graphics]
-       13e9  Ariel
+       13e9  Ariel/Navi10Lite
+       13f9  Oberon/Navi12Lite
        13fe  Cyan Skillfish [BC-250]
        1478  Navi 10 XL Upstream Port of PCI Express Switch
        1479  Navi 10 XL Downstream Port of PCI Express Switch
@@ -1094,6 +1123,7 @@
        1640  Rembrandt Radeon High Definition Audio Controller
        164c  Lucienne
        164d  Rembrandt
+       164e  Raphael
        164f  Phoenix
        1681  Rembrandt [Radeon 680M]
        1714  BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series]
@@ -1611,6 +1641,7 @@
                1028 00bb  Latitude CPx
                1179 ff00  Satellite 1715XCDS laptop
                13bd 1019  PC-AR10
+       4c4e  Rage Mobility L AGP 2x
        4c50  Rage 3 LT [3D Rage LT PRO PCI]
                1002 4c50  Rage LT Pro
        4c52  M1 [Rage Mobility-M1 PCI]
@@ -2069,6 +2100,7 @@
                148c 7340  Radeon R7 340
                1682 7240  R7 240 2048 MB
                1dcf 3000  Oland PRO [Radeon R7 240/340 / Radeon 520]
+       6617  Oland LE [Radeon R7 240]
        6631  Oland
        6640  Saturn XT [FirePro M6100]
                106b 014b  Tropo XT [Radeon R9 M380 Mac Edition]
@@ -2668,7 +2700,7 @@
 # FX-797A-TNBC
                1682 3213  HD 7970 Black Edition
                1682 3214  Double D HD 7970
-               1787 201c  HD 7970 IceQ X²
+               1787 201c  HD 7970 IceQ X²
 # Radeon HD 7970 X2
                1787 2317  Radeon HD 7990
                1787 3000  Tahiti XT2 [Radeon HD 7970 GHz Edition]
@@ -2731,7 +2763,7 @@
                174b e282  Vapor-X R9 290X Tri-X OC
                174b e285  R9 290X Tri-X OC
                174b e324  Grenada XT2 [Radeon R9 390X]
-               1787 2020  R9 290X IceQ X² Turbo
+               1787 2020  R9 290X IceQ X² Turbo
                1787 2357  Grenada XT [Radeon R9 390X]
        67b1  Hawaii PRO [Radeon R9 290/390]
                1043 04dd  STRIX R9 390
@@ -3081,7 +3113,7 @@
        688c  Cypress XT GL [FireStream 9370]
        688d  Cypress PRO GL [FireStream 9350]
        6898  Cypress XT [Radeon HD 5870]
-               1002 0b00  Radeon HD 5870 Eyefinityâ\81¶ Edition
+               1002 0b00  Radeon HD 5870 EyefinityâÂ\81¶ Edition
                106b 00d0  Radeon HD 5870 Mac Edition
 # R5870-PM2D1G
                1462 8032  Radeon HD 5870 1 GB GDDR5
@@ -3622,7 +3654,7 @@
                1002 0322  All-in-Wonder X1800XL
                1002 0d02  Radeon X1800 CrossFire Edition
        710a  R520 [Radeon X1800 GTO]
-               1002 0b12  Radeon X1800 GTO²
+               1002 0b12  Radeon X1800 GTO²
        710b  R520 [Radeon X1800 GTO]
        710e  R520 GL [FireGL V7300]
                13cc 3d0c  MXRT-5150
@@ -3787,7 +3819,8 @@
                1002 0e3a  Radeon RX 6900 XT
                148c 2408  Red Devil AMD Radeon RX 6900 XT
                1da2 440f  TOXIC RX 6900 XT
-               1eae 6701  XFX Speedster MERC 319 AMD Radeon RX 6800 XT Black
+               1eae 6701  Speedster MERC 319 AMD Radeon RX 6800 XT Black
+               1eae 6901  Speedster MERC 319 AMD Radeon RX 6900 XT Black
        73c3  Navi 22
        73c4  Navi 22 USB
        73ce  Navi22-XL SRIOV MxGPU
@@ -3797,8 +3830,12 @@
        73e3  Navi 23 WKS-XL [Radeon PRO W6600]
        73e4  Navi 23 USB
        73ef  Navi 23 [Radeon RX 6650 XT]
+               1002 73ef  Navi 23 [Radeon RX 6700S / 6650 XT]
        73ff  Navi 23 [Radeon RX 6600/6600 XT/6600M]
+               1462 5022  RX 6600 MECH 2X
                148c 2412  PowerColor Red Devil RX 6600 XT
+# This is the non-XT version
+               1849 5218  Radeon RX 6600 Challenger ITX 8GB
        7408  Aldebaran
        740c  Aldebaran
        740f  Aldebaran
@@ -3806,7 +3843,7 @@
        7422  Navi 24 [Radeon PRO W6400]
        7423  Navi 24 [Radeon PRO W6300/W6300M]
        7424  Navi 24 [Radeon RX 6300]
-       743f  Navi 24 [Radeon RX 6400 / 6500 XT]
+       743f  Navi 24 [Radeon RX 6400/6500 XT/6500M]
                1da2 e457  PULSE AMD Radeon RX 6500 XT
        7833  RS350 Host Bridge
        7834  RS350 [Radeon 9100 PRO/XT IGP]
@@ -5070,6 +5107,7 @@
        1629  Arden PCIe GPP Bridge
        162a  Arden Internal PCIe GPP Bridge 0 to bus X
        162b  Arden PCIe Non-Transparent Bridge
+       162c  VanGogh USB2
        1630  Renoir/Cezanne Root Complex
        1631  Renoir/Cezanne IOMMU
        1632  Renoir PCIe Dummy Host Bridge
@@ -5087,7 +5125,10 @@
        1642  Renoir WLAN
        1643  Renoir BT
        1644  Renoir I2S
-       1648  VanGogh Root Complex
+       1645  VanGogh Root Complex
+       1646  VanGogh IOMMU
+       1647  VanGogh PCIe GPP Bridge
+       1648  VanGogh Internal PCIe GPP Bridge to Bus
        1649  VanGogh PSP/CCP
        164f  Milan IOMMU
        1650  Milan Data Fabric; Function 0
@@ -5098,6 +5139,14 @@
        1655  Milan Data Fabric; Function 5
        1656  Milan Data Fabric; Function 6
        1657  Milan Data Fabric; Function 7
+       1660  VanGogh Data Fabric; Function 0
+       1661  VanGogh Data Fabric; Function 1
+       1662  VanGogh Data Fabric; Function 2
+       1663  VanGogh Data Fabric; Function 3
+       1664  VanGogh Data Fabric; Function 4
+       1665  VanGogh Data Fabric; Function 5
+       1666  VanGogh Data Fabric; Function 6
+       1667  VanGogh Data Fabric; Function 7
        166a  Cezanne Data Fabric; Function 0
        166b  Cezanne Data Fabric; Function 1
        166c  Cezanne Data Fabric; Function 2
@@ -7342,7 +7391,7 @@
                1077 02f2  QLogic 1x32Gb QLE2770 FC HBA
                1077 02f3  QLogic 2x32Gb QLE2772 FC HBA
                1590 02d3  SN1610Q - 1P Enhanced 32GFC Single Port Fibre Channel Host Bus Adapter
-               1590 02d4  SN1610Q – 2P Enhanced 32GFC Dual Port Fibre Channel Host Bus Adapter
+               1590 02d4  SN1610Q – 2P Enhanced 32GFC Dual Port Fibre Channel Host Bus Adapter
        2289  ISP2852-based 64/32G Fibre Channel to PCIe Controller with StorCryption
                1077 02e9  QLE2882 Dual Port 64GFC PCIe Gen4 x8 Adapter with StorCryption
                1077 02eb  QLE2782 Dual Port 32GFC PCIe Gen4 x8 Adapter with StorCryption
@@ -7590,7 +7639,7 @@
        0022  ATM Adapter
 108e  Oracle/SUN
        0001  EBUS
-       1000  EBUS
+       1000  STP2003QFP [PCIO] EBUS
        1001  Happy Meal 10/100 Ethernet [hme]
        1100  RIO EBUS
                108e 1100  RIO EBUS on Blade 100 motherboard
@@ -8945,10 +8994,10 @@
                10b5 3334  Cambridge Pixel HPx Radar Input Card
                10b5 3352  Alpermann+Velte PCL PCIe HD: Timecode Reader Board
                10b5 3353  Alpermann+Velte PCL PCIe D: Timecode Reader Board
-               10b5 3354  Alpermann+Velte PCL PCIe LV: Timecode Reader Board
-               10b5 3355  Alpermann+Velte PCL PCIe L: Timecode Reader Board
-               10b5 3415  Alpermann+Velte PCIe TS: Time Synchronisation Board
-               10b5 3493  Alpermann+Velte PCL PCIe 3G: Timecode Reader Board
+               10b5 3354  Plura PCL PCIe LV: Timecode Reader Board
+               10b5 3355  Plura PCL PCIe L: Timecode Reader Board
+               10b5 3415  Plura PCIe TS: Time Synchronisation Board
+               10b5 3493  Plura PCL PCIe 3G: Timecode Reader Board
                10b5 3565  Cambridge Pixel HPx Radar Output Card
                1369 c001  LX6464ES
                1369 c201  LX1616ES
@@ -12331,6 +12380,7 @@
                10de 131d  Tesla V100-SXM3-32GB-H
        1dba  GV100GL [Quadro GV100]
                10de 12eb  TITAN V CEO Edition
+       1dbe  GV100 Engineering Sample
        1df0  GV100GL [Tesla PG500-216]
        1df2  GV100GL [Tesla PG503-216]
        1df5  GV100GL [Tesla V100 SXM2 16GB]
@@ -12366,7 +12416,7 @@
        1e91  TU104M [GeForce RTX 2070 SUPER Mobile / Max-Q]
        1e93  TU104M [GeForce RTX 2080 SUPER Mobile / Max-Q]
        1eab  TU104M
-       1eae  TU104M
+       1eae  TU104M [GeForce GTX 2080 Engineering Sample]
        1eb0  TU104GL [Quadro RTX 5000]
        1eb1  TU104GL [Quadro RTX 4000]
        1eb4  TU104GL [T4G]
@@ -12407,6 +12457,7 @@
        1f76  TU106GLM [Quadro RTX 3000 Mobile Refresh]
        1f81  TU117
        1f82  TU117 [GeForce GTX 1650]
+       1f83  TU117 [GeForce GTX 1630]
        1f91  TU117M [GeForce GTX 1650 Mobile / Max-Q]
        1f92  TU117M [GeForce GTX 1650 Mobile]
        1f94  TU117M [GeForce GTX 1650 Mobile]
@@ -12493,9 +12544,11 @@
        2238  GA102GL [A10M]
        223f  GA102GL
        228b  GA104 High Definition Audio Controller
+       228e  GA106 High Definition Audio Controller
        2296  Tegra PCIe Endpoint Virtual Network
        2302  GH100
        2321  GH100
+       2331  GH100 [H100 80GB 8GPC Engineering Sample]
        2336  GH100 [H100 96GB]
        2414  GA103 [GeForce RTX 3060 Ti]
        2420  GA103M [GeForce RTX 3080 Ti Mobile]
@@ -12554,6 +12607,8 @@
        25a7  GA107M [GeForce MX570]
        25a9  GA107M [GeForce RTX 2050]
        25aa  GA107M [GeForce MX570 A]
+# GN20-P0 Refresh
+       25ac  GN20-P0-R-K2
        25af  GA107 [GeForce RTX 3050 Engineering Sample]
        25b5  GA107GLM [RTX A4 Mobile]
 # A16 - 25B6 10DE 14A9 / A2 - 25B6 10DE 157E
@@ -12565,8 +12620,22 @@
        25e0  GA107BM [GeForce RTX 3050 Ti Mobile]
        25e2  GA107BM [GeForce RTX 3050 Mobile]
        25e5  GA107BM [GeForce RTX 3050 Mobile]
+# GN20-P0 Refresh
+       25ec  GN20-P0-R-K2
        25f9  GA107 [RTX A1000 Embedded GPU ]
        25fa  GA107 [RTX A2000 Embedded GPU]
+       2684  AD102 [GeForce RTX 4090]
+       2717  GN21-X11
+       2757  GN21-X11
+       2785  AD104
+       27a0  GN21-X9
+       27e0  GN21-X9
+       2820  GN21-X6
+       2860  GN21-X6
+       28a0  GN21-X4
+       28a1  GN21-X2
+       28e0  GN21-X4
+       28e1  GN21-X2
 10df  Emulex Corporation
        0720  OneConnect NIC (Skyhawk)
                103c 1934  FlexFabric 20Gb 2-port 650M Adapter
@@ -12904,6 +12973,7 @@
                103c 2a6f  Asus IPIBL-LB Motherboard
                103c 825b  OMEN-17-w001nv
                103c 8615  Pavilion Laptop 15-cw1xxx
+               103c 86d4  Pavilion Laptop 15-ec0xxx
 # Rev 29, uses r8169 Driver on Linux
                103c 8882  HP ProDesk 405 G8 Desktop Mini PC
                1043 11f5  Notebook motherboard (one of many models)
@@ -12994,7 +13064,7 @@
                10ec 8739  Dell Wireless 1801
                17aa b736  Z50-75
        b822  RTL8822BE 802.11a/b/g/n/ac WiFi adapter
-               103c 831b  Realtek RTL8822BE 802.11ac 2 Ã\97 2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported)
+               103c 831b  Realtek RTL8822BE 802.11ac 2 Ã\83â\80\94 2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported)
                17aa 5124  ThinkPad E595
                17aa b023  ThinkPad E595
        c821  RTL8821CE 802.11ac PCIe Wireless Network Adapter
@@ -13032,12 +13102,18 @@
        5020  Alveo U50 XMDA Platform
 # Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/appendix_a.html
        505c  Alveo U55C
+       6987  SmartSSD
+       6988  SmartSSD
+       7011  7-Series FPGA Hard PCIe block (AXI/debug)
        7038  FPGA Card XC7VX690T
                17aa 402f  FPGA XC7VX690T-3FFG1157E
        8019  Memory controller
                1eec 0201  VSEC10232X Dual-port 100Gb/s Etherent PCIe
        8380  Ellips ProfiXpress Profibus Master
        8381  Ellips Santos Frame Grabber
+       9134  SmartSSD
+       9234  SmartSSD
+       9434  SmartSSD
 # Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/appendix_a.html
        d000  Alveo U200 Golden Image
 # Reference: https://xilinx.github.io/Alveo-Cards/master/management-specification/appendix_a.html
@@ -17251,7 +17327,17 @@
        5191  9200 PRO NVMe SSD
        5192  9200 MAX NVMe SSD
        51a2  7300 PRO NVMe SSD
+               1344 2000  960GB U.2
+               1344 3000  1920GB U.2
+               1344 4000  3480GB U.2
+               1344 5000  7680GB U.2
        51a3  7300 MAX NVMe SSD
+               1344 1100  400GB M.2
+               1344 2000  800GB U.2
+               1344 2100  800GB M.2
+               1344 3000  1600GB U.2
+               1344 4000  3200GB U.2
+               1344 5000  6400GB U.2
        51b1  9300 PRO NVMe SSD
                1344 4000  3.84TB U.2
                1344 5000  7.68TB U.2
@@ -18031,6 +18117,7 @@
        0002  MN-130 (ADMtek Centaur-P based)
 # Virtual Video Card Device for Windows Remote Desktop (RDP)
        008c  Basic Render Driver
+       008e  Basic Render Driver
        5353  Hyper-V virtual VGA
        5801  XMA Decoder (Xenon)
        5802  SATA Controller - CdRom (Xenon)
@@ -19780,6 +19867,7 @@
        16d4  BCM57402 NetXtreme-E Ethernet Partition
        16d5  BCM57407 NetXtreme-E 10GBase-T Ethernet Controller
        16d6  BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller
+               117c 00cd  FastFrame N4S2 Dual-port 10Gb Ethernet Adapter
                14e4 1202  BCM957412M4122C OCP 1x25G Type1 wRoCE
                14e4 4120  NetXtreme E-Series Advanced Dual-port 10Gb SFP+ Ethernet Network Daughter Card
                14e4 4126  NetXtreme-E Dual-port 10G SFP+ Ethernet OCP 3.0 Adapter (BCM957412N4120C)
@@ -19788,6 +19876,7 @@
 # NIC-ETH531F-LP-2P BCM57412 2 x 10G SFP+ Ethernet PCIe Card
                193d 1024  NIC-ETH531F-LP-2P
        16d7  BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
+               117c 00cc  FastFrame N422 Dual-port 25Gb Ethernet Adapter
                14e4 1402  BCM957414A4142CC 10Gb/25Gb Ethernet PCIe
                14e4 1404  BCM957414M4142C OCP 2x25G Type1 wRoCE
                14e4 4140  NetXtreme E-Series Advanced Dual-port 25Gb SFP28 Network Daughter Card
@@ -19796,9 +19885,11 @@
                14e4 4146  NetXtreme-E Dual-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957414N4140C)
                1590 020e  Ethernet 25Gb 2-port 631SFP28 Adapter
                1590 0211  Ethernet 25Gb 2-port 631FLR-SFP28 Adapter
-               1eec 0101  VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe
+# VSE-225-31S Dual-port 10Gb/25Gb Ethernet PCIe
+               1eec 0101  VSE-225-31S Dual-port 10Gb/25Gb Ethernet PCIe
        16d8  BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
                1028 1feb  NetXtreme-E 10Gb SFP+ Adapter
+               117c 00ce  FastFrame N4T2 Dual-port 10GBASE-T Ethernet Adapter
                14e4 4163  NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 2.0 Adapter (BCM957416M4163C)
                14e4 4166  NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 3.0 Adapter (BCM957416N4160C)
                1590 020c  Ethernet 10Gb 2-port 535T Adapter
@@ -19850,6 +19941,7 @@
                103c 30c0  Compaq 6710b
                17aa 3a23  IdeaPad S10e
        1750  BCM57508 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
+               117c 00cf  FastFrame N412 Dual-port 100Gb Ethernet Adapter
                14e4 2100  NetXtreme-E Dual-port 100G QSFP56 Ethernet PCIe4.0 x16 Adapter (BCM957508-P2100G)
                14e4 5208  NetXtreme-E Dual-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957508-N2100G)
                14e4 d124  NetXtreme-E P2100D BCM57508 2x100G QSFP PCIE
@@ -20135,6 +20227,12 @@
        5850  BCM5850 Crypto Accelerator
        5e87  Valkyrie offload engine
        5e88  Viper Offload Engine
+# bluetooth PCI function of the BRCM4378 Wireless Network Adapter
+       5f69  BRCM4378 Bluetooth Controller
+# Bluetooth PCI function of the BRCM4387 Wireless Network Adapter
+       5f71  BRCM4387 Bluetooth Controller
+# Bluetooth PCI function of the BRCM4377 Wireless Network Adapter
+       5fa0  BRCM4377 Bluetooth Controller
        8602  BCM7400/BCM7405 Serial ATA Controller
        9026  CN99xx [ThunderX2] Integrated USB 3.0 xHCI Host Controller
        9027  CN99xx [ThunderX2] Integrated AHCI/SATA 3 Host Controller
@@ -20837,6 +20935,7 @@
 15b0  Zoltrix International Ltd
 15b1  Source Technology Inc
 15b2  Mosaid Technologies Inc
+# now NVIDIA
 15b3  Mellanox Technologies
        0191  MT25408 [ConnectX IB Flash Recovery]
        01f6  MT27500 Family [ConnectX-3 Flash Recovery]
@@ -20878,6 +20977,8 @@
        0259  Abir Chiplet
        025b  Quantum-3 in Flash Recovery Mode
        025c  Quantum-3 RMA
+       025d  Quantum-3CPO in Flash Recovery Mode
+       025e  Quantum-3CPO RMA
        0262  MT27710 [ConnectX-4 Lx Programmable] EN
        0263  MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN
        0264  Innova-2 Flex Burn image
@@ -20887,6 +20988,8 @@
        0275  Spectrum-4C RMA
        0277  Spectrum-4TOR RMA
        0281  NPS-600 Flash Recovery
+       0282  ArcusE Flash recovery
+       0283  ArcusE RMA
        1002  MT25400 Family [ConnectX-2 Virtual Function]
        1003  MT27500 Family [ConnectX-3]
                1014 04b5  PCIe3 40GbE RoCE Converged Host Bus Adapter for Power
@@ -20965,10 +21068,10 @@
                193d 1084  NIC-ETH540F-3S-2P
        1016  MT27710 Family [ConnectX-4 Lx Virtual Function]
        1017  MT27800 Family [ConnectX-5]
-               15b3 0006  ConnectX®-5 EN network interface card, 100GbE single-port QSFP28, PCIe3.0 x16, tall bracket; MCX515A-CCAT
-               15b3 0007  Mellanox ConnectX®-5 MCX516A-CCAT
-               15b3 0020  ConnectX®-5 EN network interface card, 10/25GbE dual-port SFP28, PCIe3.0 x8, tall bracket ; MCX512A-ACAT
-               15b3 0068  ConnectX®-5 EN network interface card for OCP2.0, Type 1, with host management, 25GbE dual-port SFP28, PCIe3.0 x8, no bracket Halogen free ; MCX542B-ACAN
+               15b3 0006  ConnectX®-5 EN network interface card, 100GbE single-port QSFP28, PCIe3.0 x16, tall bracket; MCX515A-CCAT
+               15b3 0007  Mellanox ConnectX®-5 MCX516A-CCAT
+               15b3 0020  ConnectX®-5 EN network interface card, 10/25GbE dual-port SFP28, PCIe3.0 x8, tall bracket ; MCX512A-ACAT
+               15b3 0068  ConnectX®-5 EN network interface card for OCP2.0, Type 1, with host management, 25GbE dual-port SFP28, PCIe3.0 x8, no bracket Halogen free ; MCX542B-ACAN
                193d 1051  NIC-IB1040i-Mb-2P
        1018  MT27800 Family [ConnectX-5 Virtual Function]
        1019  MT28800 Family [ConnectX-5 Ex]
@@ -21060,6 +21163,7 @@
        a2dd  BF4 Family Crypto enabled [BlueField-4 SoC Crypto enabled]
        a2de  BF4 Family Crypto disabled [BlueField-4 SoC Crypto disabled]
        a2df  BF4 Family integrated network controller [BlueField-4 integrated network controller]
+       b200  ArcusE
        c2d2  MT416842 BlueField SoC management interfac
        c2d3  MT42822 BlueField-2 SoC Management Interface
        c2d4  MT43162 BlueField-3 Lx SoC Management Interface
@@ -21082,6 +21186,7 @@
        d2f0  Quantum HDR (200Gbps) switch
        d2f2  Quantum-2 NDR (400Gbps) switch
        d2f4  Quantum-3
+       d2f6  Quantum-3CPO
 15b4  CCI/TRIAD
 15b5  Cimetrics Inc
 15b6  Texas Memory Systems Inc
@@ -21162,7 +21267,7 @@
 15cd  Dreamtech Co Ltd
 15ce  Genrad Inc
 # https://www.hilscher.com/imprint/
-15cf  Hilscher Gesellschaft für Systemautomation mbH
+15cf  Hilscher Gesellschaft fÃ\83¼r Systemautomation mbH
        0000  CIFX PCI/PCIe
 15d1  Infineon Technologies AG
 15d2  FIC (First International Computer Inc)
@@ -21632,14 +21737,14 @@
        002e  AR9287 Wireless Network Adapter (PCI-Express)
                105b e034  T77H167.00
        0030  AR93xx Wireless Network Adapter
-               103c 1627  AR9380/HB112 802.11abgn 3Ã\973 Wi-Fi Adapter
+               103c 1627  AR9380/HB112 802.11abgn 3Ã\83â\80\943 Wi-Fi Adapter
                106b 009a  AirPort Extreme
                1186 3a7e  DWA-566 Wireless N 300 Dual Band PCIe Desktop Adapter
                1a56 2000  Killer Wireless-N 1102 Half-size Mini PCIe Card [AR9382]
                1a56 2001  Killer Wireless-N 1103 Half-size Mini PCIe Card [AR9380]
        0032  AR9485 Wireless Network Adapter
                1028 0208  Wireless 1506 WLAN Half Mini-Card
-               103c 1838  AR9485/HB125 802.11bgn 1Ã\971 Wi-Fi Adapter
+               103c 1838  AR9485/HB125 802.11bgn 1Ã\83â\80\941 Wi-Fi Adapter
                105b e044  Unex DHXA-225
                144d 410e  AR9485WB-EG 802.11b/g/n mini-PCIe card on a series 3 laptop
                1a3b 1186  AW-NE186H
@@ -23199,6 +23304,10 @@
        0212  Hi1822 Family (2*8G FC)
                19e5 d303  Hi1822 SP522 (2*8G FC)
                19e5 d306  Hi1822 SP523 (2*8G FC)
+       0222  Hi1822 Family
+               19e5 0051  Hi1822 SP681 (2*25/10GE)
+               19e5 0052  Hi1822 SP680 (4*25/10GE)
+               19e5 00a1  Hi1822 SP670 (2*100GE)
        1710  iBMA Virtual Network Adapter
        1711  Hi171x Series [iBMC Intelligent Management system chip w/VGA support]
        1822  Hi1822 Family (4*25GE)
@@ -23220,7 +23329,9 @@
                19e5 6214  NVMe SSD ES3500P V6 7680GB 2.5" U.2
                19e5 6215  NVMe SSD ES3500P V6 15360GB 2.5" U.2
        375e  Hi1822 Family Virtual Function
+       375f  Hi1822 Family Virtual Function
        379e  Hi1822 Family Virtual Function
+       379f  Hi1822 Family Virtual Function
        a120  HiSilicon PCIe Root Port with Gen4
        a121  HiSilicon PCI-PCI Bridge
        a122  HiSilicon Embedded DMA Engine
@@ -23543,6 +23654,7 @@
                1af4 1100  QEMU Virtual Machine
 1af5  Netezza Corp.
 1afa  J & W Electronics Co., Ltd.
+1b00  Montage Technology Co., Ltd.
 1b03  Magnum Semiconductor, Inc,
        6100  DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
        7000  D7 Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
@@ -23556,6 +23668,7 @@
        0611  ASM1061 SATA IDE Controller
        0612  ASM1062 Serial ATA Controller
                1849 0612  Motherboard
+       0625  106x SATA/RAID Controller
        1040  ASM1040 XHCI Controller
        1042  ASM1042 SuperSpeed USB Host Controller
                1043 1059  K53SM motherboard
@@ -23573,7 +23686,7 @@
        1242  ASM1142 USB 3.1 Host Controller
        1343  ASM1143 USB 3.1 Host Controller
        1812  ASM1812 6-Port PCIe x4 Gen2 Packet Switch
-       2142  ASM2142 USB 3.1 Host Controller
+       2142  ASM2142/ASM3142 USB 3.1 Host Controller
                1462 7a72  H270 PC MATE
        2824  ASM2824 PCIe Gen3 Packet Switch
        3242  ASM3242 USB 3.2 Host Controller
@@ -23980,7 +24093,8 @@
        1339  BC511
        1504  SC300 512GB M.2 2280 SATA Solid State Drive
        1527  PC401 NVMe Solid State Drive 256GB
-       174a  Gold P31 SSD
+       174a  PC711 NVMe Solid State Drive
+       2204  960GB TLC PCIe Gen3 x4 NVMe M.2 22110
        243b  PE6110 NVMe Solid State Drive
                1c5c 0100  PE6110 NVMe Solid State Drive
        2839  PE8000 Series NVMe Solid State Drive
@@ -24004,12 +24118,16 @@
                1c5f 0b31  NVMe SSD PBlaze6 6530 3840G 2.5" U.2
                1c5f 0b40  NVMe SSD PBlaze6 6530 7680G AIC
                1c5f 0b41  NVMe SSD PBlaze6 6530 7680G 2.5" U.2
-               1c5f 4b20  NVMe SSD PBlaze6 6530 1600G AIC
-               1c5f 4b21  NVMe SSD PBlaze6 6530 1600G 2.5" U.2
-               1c5f 4b30  NVMe SSD PBlaze6 6530 3200G AIC
-               1c5f 4b31  NVMe SSD PBlaze6 6530 3200G 2.5" U.2
-               1c5f 4b40  NVMe SSD PBlaze6 6530 6400G AIC
-               1c5f 4b41  NVMe SSD PBlaze6 6530 6400G 2.5" U.2
+               1c5f 1331  NVMe SSD PBlaze6 6531 3840G 2.5" U.2
+               1c5f 1341  NVMe SSD PBlaze6 6531 7680G 2.5" U.2
+               1c5f 4b20  NVMe SSD PBlaze6 6536 1600G AIC
+               1c5f 4b21  NVMe SSD PBlaze6 6536 1600G 2.5" U.2
+               1c5f 4b30  NVMe SSD PBlaze6 6536 3200G AIC
+               1c5f 4b31  NVMe SSD PBlaze6 6536 3200G 2.5" U.2
+               1c5f 4b40  NVMe SSD PBlaze6 6536 6400G AIC
+               1c5f 4b41  NVMe SSD PBlaze6 6536 6400G 2.5" U.2
+               1c5f 5331  NVMe SSD PBlaze6 6537 3200G 2.5" U.2
+               1c5f 5341  NVMe SSD PBlaze6 6537 6400G 2.5" U.2
        003d  PBlaze5 920/926
        003e  PBlaze6 6920
                1c5f 0a31  NVMe SSD PBlaze6 6920 3840GB 2.5" U.2
@@ -24061,7 +24179,7 @@
 # 256GB NVMe SSD
        5766  ADATA XPG GAMMIXS1 1L Media
        8201  XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive
-1cc4  Union Memory (Shenzhen)
+1cc4  Shenzhen Unionmemory Information System Ltd.
        1203  NVMe SSD Controller UHXXXa series
                1cc4 a121  NVMe SSD UHXXXa series U.2 960GB
                1cc4 a122  NVMe SSD UHXXXa series U.2 1920GB
@@ -24075,7 +24193,8 @@
        17ab  NVMe 256G SSD device
        6303  AM630 PCIe 4.0 x4 NVMe SSD Controller
 1cc5  Embedded Intelligence, Inc.
-       0100  CAN-PCIe-02
+       0100  PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1.
+       0101  PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1.
 1cc7  Radian Memory Systems Inc.
        0200  RMS-200
        0250  RMS-250
@@ -24119,6 +24238,9 @@
 1d00  Pure Storage
 1d05  Tongfang Hongkong Limited
 1d0f  Amazon.com, Inc.
+       7064  NeuronDevice (Inferentia)
+       7164  NeuronDevice
+               1d0f 0000  Trainium
        8061  NVMe EBS Controller
        cd01  NVMe SSD Controller
        ec20  Elastic Network Adapter (ENA)
@@ -24276,6 +24398,8 @@
        101d  AR-ARK-NIC [Arkville ArkNIC Kernel Path Device]
        101e  AR-ARKA-FX1 [Arkville 64B DPDK Data Mover for Agilex R-Tile]
        101f  AR-TK242 [2x100GbE Packet Capture Device]
+       1020  AR-GP-PF [General-Purpose Physical Function]
+       1021  AR-MGMT-PF [Board-Generic Management Physical Function]
        4200  A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
 1d72  Xiaomi
 1d78  DERA Storage
@@ -24292,6 +24416,50 @@
                1d78 3103  D5457 U.2 1.6TB NVMe SSD
                1d78 3105  D5457 U.2 3.2TB NVMe SSD
                1d78 3107  D5457 U.2 6.4TB NVMe SSD
+               1d78 5003  D5447 HHHL 1.6TB NVMe SSD
+               1d78 5004  D5427 HHHL 1.92TB NVMe SSD
+               1d78 5005  D5447 HHHL 3.2TB NVMe SSD
+               1d78 5006  D5427 HHHL 3.84TB NVMe SSD
+               1d78 5007  D5447 HHHL 6.4TB NVMe SSD
+               1d78 5008  D5427 HHHL 7.68TB NVMe SSD
+               1d78 5103  D5447 U.2 1.6TB NVMe SSD
+               1d78 5105  D5447 U.2 3.2TB NVMe SSD
+               1d78 5106  AF3UP34DTCUN3T8B SSD
+               1d78 5107  D5447 U.2 6.4TB NVMe SSD
+               1d78 5114  D5427 U.2 1.92TB NVMe SSD
+               1d78 5116  D5427 U.2 3.84TB NVMe SSD
+               1d78 5118  D5427 U.2 7.68TB NVMe SSD
+       1513  DERA MENG NVMe Controller
+               1d78 6015  D6456 HHHL 3.2TB NVMe SSD
+               1d78 6016  D6436 HHHL 3.84TB NVMe SSD
+               1d78 6017  D6456 HHHL 6.4TB NVMe SSD
+               1d78 6018  D6436 HHHL 7.68TB NVMe SSD
+               1d78 6105  D6457 U.2 3.2TB NVMe SSD
+               1d78 6106  D6437 U.2 3.84TB NVMe SSD
+               1d78 6107  D6457 U.2 6.4TB NVMe SSD
+               1d78 6108  D6437 U.2 7.68TB NVMe SSD
+               1d78 6115  D6456 U.2 3.2TB NVMe SSD
+               1d78 6116  D6436 U.2 3.84TB NVMe SSD
+               1d78 6117  D6456 U.2 6.4TB NVMe SSD
+               1d78 6118  D6436 U.2 7.68TB NVMe SSD
+       1515  DERA EMEI NVMe Controller
+               1d78 7002  D7436 HHHL 1.92TB NVMe SSD
+               1d78 7003  D7456 HHHL 1.6TB NVMe SSD
+               1d78 7004  D7436 HHHL 3.84TB NVMe SSD
+               1d78 7005  D7456 HHHL 3.2TB NVMe SSD
+               1d78 7007  D7456 HHHL 6.4TB NVMe SSD
+               1d78 7008  D7436 HHHL 7.68TB NVMe SSD
+               1d78 7009  D7456 HHHL 12.8TB NVMe SSD
+               1d78 700a  D7436 HHHL 15.36TB NVMe SSD
+               1d78 7102  D7436 U.2 15mm 1.92TB NVMe SSD
+               1d78 7103  D7456 U.2 15mm 1.6TB NVMe SSD
+               1d78 7104  D7436 U.2 15mm 3.84TB NVMe SSD
+               1d78 7105  D7456 U.2 15mm 3.2TB NVMe SSD
+               1d78 7107  D7456 U.2 15mm 6.4TB NVMe SSD
+               1d78 7108  D7436 U.2 15mm 7.68TB NVMe SSD
+               1d78 7109  D7456 U.2 15mm 12.8TB NVMe SSD
+               1d78 710a  D7436 U.2 15mm 15.36TB NVMe SSD
+1d79  Transcend Information, Inc.
 1d7c  Aerotech, Inc.
 # Fiber-optic HyperWire motion control bus from Aerotech.
        0001  HyperWire Adapter
@@ -24352,10 +24520,14 @@
        e26a  Radeon R7 250
 1da3  Habana Labs Ltd.
        0001  HL-1000 AI Inference Accelerator [Goya]
+# PCIe accelerator card for Deep Learning inference tasks
+       0030  Greco AI Inference Accelerator
 # PCIe accelerator card for Deep Learning training tasks
        1000  HL-2000 AI Training Accelerator [Gaudi]
 # PCIe accelerator card for Deep Learning training tasks with secured firmware
        1010  HL-2000 AI Training Accelerator [Gaudi secured]
+# PCIe accelerator card for Deep Learning training tasks
+       1020  Gaudi2 AI Training Accelerator
 1da8  Corigine, Inc.
 1dad  Fungible
 1db2  ATP ELECTRONICS INC
@@ -24578,6 +24750,7 @@
 1dfc  JSC NT-COM
        1181  TDM 8 Port E1/T1/J1 Adapter
 1e0f  KIOXIA Corporation
+       0001  NVMe SSD Controller BG4
        0007  NVMe SSD Controller Cx6
                1028 2078  DC NVMe CD6 RI 960GB
                1028 2079  DC NVMe CD6 RI 1.92TB
@@ -24703,6 +24876,7 @@
                1e3b 008b  Enterprise NVMe SSD HHHL 1.6TB (H3900)
                1e3b 0091  Enterprise NVMe SSD HHHL 0.75TB (H3900)
 1e3d  Burlywood, Inc
+1e44  Valve Software
 1e49  Yangtze Memory Technologies Co.,Ltd
        0041  ZHITAI TiPro7000
 # YMTC PCIe/NVMe SSD
@@ -24718,6 +24892,7 @@
 # Associative Processing Unit (APU)
        0010  APU [Leda]
                1e4c 0120  SE120
+1e50  IP3 Tech (HK) Limited
 1e57  Beijing Panyi Technology Co., Ltd
        0100  The device has already been deleted.
                0000 0100  PY8800 64GB Accelerator
@@ -24728,6 +24903,8 @@
        7010  AI controller A7010
 1e60  Hailo Technologies Ltd.
        2864  Hailo-8 AI Processor
+1e67  Untether AI
+       0002  runAI200 AI Inference Accelerator
 1e68  Jiangsu Xinsheng Intelligent Technology Co., Ltd
 1e6b  Axiado Corp.
 1e7b  Dataland
@@ -24737,17 +24914,18 @@
        1203  NVMe SSD Controller UHXXXa series
                1e81 a121  NVMe SSD UHXXXa series U.2 960GB
                1e81 a122  NVMe SSD UHXXXa series U.2 1920GB
-               1e81 a123  NVMe SSD UHXXXa series U.2 3840GB 
-               1e81 a124  NVMe SSD UHXXXa series U.2 7680GB 
+               1e81 a123  NVMe SSD UHXXXa series U.2 3840GBÂ 
+               1e81 a124  NVMe SSD UHXXXa series U.2 7680GBÂ 
                1e81 a125  NVMe SSD UHXXXa series U.2 15360GB
-               1e81 a211  NVMe SSD UHXXXa series U.2 800GBÂ 
-               1e81 a212  NVMe SSD UHXXXa series U.2 1600GB 
-               1e81 a213  NVMe SSD UHXXXa series U.2 3200GB 
-               1e81 a214  NVMe SSD UHXXXa series U.2 6400GB 
+               1e81 a211  NVMe SSD UHXXXa series U.2 800GBÃ\83â\80\9aÃ\82Â 
+               1e81 a212  NVMe SSD UHXXXa series U.2 1600GBÂ 
+               1e81 a213  NVMe SSD UHXXXa series U.2 3200GBÂ 
+               1e81 a214  NVMe SSD UHXXXa series U.2 6400GBÂ 
 1e85  Heitec AG
 1e89  ID Quantique SA
        0002  Quantis-PCIe-40M
        0003  Quantis-PCIe-240M
+1e93  Beijing Bytedance Network Technology Co., Ltd.
 # aka SED Systems
 1e94  Calian SED
 1e95  Solid State Storage Technology Corporation
@@ -24773,6 +24951,7 @@
        3401  SSD Contoller
 1ebd  EMERGETECH Company Ltd.
        0101  Seirios 2063 Video Codec
+1ec9  Wingtech Group(HongKong)Limited
 1ed2  FuriosaAI, Inc.
        0000  Warboy
 1ed3  Yeston
@@ -24786,32 +24965,31 @@
        0121  MTT S1000M
        0122  MTT S1000
        0123  MTT S2000
+       01ff  MTT HDMI/DP Audio
+       0201  G2D30
+       0202  G2D20
+       0203  G2D10
+       0211  G2D40
+       0221  G2S80
+       0222  G2S85
+       0223  G2S4
+       0251  G2N10
+       02ff  MTT HDMI/DP Audio
 1ed8  Digiteq Automotive
        0101  FG4 PCIe Frame Grabber
 1ed9  Myrtle.ai
+1ee4  PETAiO, Inc
 1ee9  SUSE LLC
 1eec  Viscore Technologies Ltd
        0102  VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe
        1eec  VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe
 1eed  XDX Computing Technology Ltd.
-       1100  XDX110 Graphic/VGA Controller
-       1101  XDX110 Audio Controller
-       1200  XDX120 Graphic/VGA Controller
-       1201  XDX120 Audio Controller
-       1300  XDX130 Graphic/VGA Controller
-       1301  XDX130 Audio Controller
-       1400  XDX140 Graphic/VGA Controller
-       1401  XDX140 Audio Controller
-       1500  XDX150 Graphic/VGA Controller
-       1501  XDX150 Audio Controller
-       1600  XDX160 Graphic/VGA Controller
-       1601  XDX160 Audio Controller
-       1700  XDX170 Graphic/VGA Controller
-       1701  XDX170 Audio Controller
-       1800  XDX180 Graphic/VGA Controller
-       1801  XDX180 Audio Controller
-       1900  XDX190 Graphic/VGA Controller
-       1901  XDX190 Audio Controller
+       10a0  XDX110 Graphic/VGA Controller
+       10a1  XDX110 Audio Controller
+       1140  XDX120 Graphic/VGA Controller
+       1141  XDX120 Audio Controller
+1ef6  GrAI Matter Labs
+1ef7  Shenzhen Gunnir Technology Development Co., Ltd
 1efb  Flexxon Pte Ltd
 1f02  Beijing Dayu Technology
 1f03  Shenzhen Shichuangyi Electronics Co., Ltd
@@ -24868,7 +25046,12 @@
        9032  SDI5.1
                1f3f 00a1  Dual Port 100GE SDI5.1
 1f40  Netac Technology Co.,Ltd
+1f44  VVDN Technologies Private Limited
+1f4b  Axera Semiconductor Co., Ltd
+1f52  MangoBoost Inc.
 1faa  Hexaflake (Shanghai) Information Technology Co., Ltd.
+       0c10  Compass C10 PF
+       0c11  Compass C10 VF
 1fab  Unifabrix Ltd.
        0000  Nexus Alpha IVPU
 # nee Tumsan Oy
@@ -25932,6 +26115,7 @@
 # uninitialized SRCU32 RAID Controller
        061f  80303 I/O Processor
        0684  H470 Chipset LPC/eSPI Controller
+       0685  Z490 Chipset LPC/eSPI Controller
        0687  Q470 Chipset LPC/eSPI Controller
        068d  Comet Lake LPC Controller
        06a3  Comet Lake PCH SMBus Controller
@@ -25942,6 +26126,8 @@
        06ab  Comet Lake PCH Serial IO SPI Controller #1
        06ac  Comet Lake PCI Express Root Port #21
        06b0  Comet Lake PCI Express Root Port #9
+       06ba  Comet Lake PCI Express Root Port #1
+       06bb  Comet Lake PCI Express Root Port #4
        06bd  Comet Lake PCIe Port #6
        06c0  Comet Lake PCI Express Root Port #17
        06c8  Comet Lake PCH cAVS
@@ -26361,6 +26547,13 @@
        0960  80960RP (i960RP) Microprocessor/Bridge
        0962  80960RM (i960RM) Bridge
        0964  80960RP (i960RP) Microprocessor/Bridge
+       0998  Ice Lake IEH
+       09a2  Ice Lake Memory Map/VT-d
+       09a3  Ice Lake RAS
+       09a4  Ice Lake Mesh 2 PCIe
+       09a6  Ice Lake MSM
+       09a7  Ice Lake PMON MSM
+       09ab  RST VMD Managed Controller
        0a03  Haswell-ULT Thermal Subsystem
        0a04  Haswell-ULT DRAM Controller
                17aa 2214  ThinkPad X240
@@ -26434,6 +26627,7 @@
                1028 1fe7  Express Flash NVMe 3.2TB 2.5" U.2 (P4600)
                1028 1fe8  Express Flash NVMe 2.0TB HHHL AIC (P4600)
                1028 1fe9  Express Flash NVMe 4.0TB HHHL AIC (P4600)
+       0b00  Ice Lake CBDMA [QuickData Technology]
        0b26  Thunderbolt 4 Bridge [Goshen Ridge 2020]
        0b27  Thunderbolt 4 USB Controller [Goshen Ridge 2020]
        0b60  NVMe DC SSD [3DNAND, Sentinel Rock Controller]
@@ -26573,6 +26767,7 @@
        0dd5  Ethernet Adaptive Virtual Function
        0dda  Ethernet Connection X722 for 10GbE SFP+
                1bd4 0076  Ethernet Connection F102IX722 for 10GbE SFP
+               1bd4 0082  Ethernet Connection F102IX722 for 10GbE SFP
        0e00  Xeon E7 v2/Xeon E5 v2/Core i7 DMI2
                1028 04f7  Xeon E5 v2 on PowerEdge R320 server
                15d9 066b  X9SRL-F
@@ -27604,6 +27799,7 @@
                1bd4 001d  1G base-T QP EP014Ti1 Adapter
                1bd4 0035  1G base-T QP EP014Ti1 Adapter
                1bd4 0066  F014I350
+               1bd4 008a  F012I350
                8086 0001  Ethernet Server Adapter I350-T4
                8086 0002  Ethernet Server Adapter I350-T2
                8086 0003  Ethernet Network Adapter I350-T4 for OCP NIC 3.0
@@ -27678,6 +27874,8 @@
                10a9 802c  UV300 BaseIO single-port GbE
                10a9 802d  UV3000 BaseIO GbE Network
                17aa 1100  ThinkServer Ethernet Server Adapter
+               17aa 1509  I210 Gigabit Network Connection
+               17aa 404d  I210 PCIe 1Gb 1-Port RJ45 LOM
                8086 0001  Ethernet Server Adapter I210-T1
                8086 0002  Ethernet Server Adapter I210-T1
        1536  I210 Gigabit Fiber Network Connection
@@ -27784,6 +27982,7 @@
                1bd4 0056  Ethernet Network Adapter X710-BM2 for OCP NIC 3.0
                1bd4 0065  F102IX710
                1bd4 0074  Ethernet Network Adapter X710-BM2 for lldp
+               1bd4 008b  F102IX710
                8086 0000  Ethernet Converged Network Adapter X710
                8086 0001  Ethernet Converged Network Adapter X710-4
                8086 0002  Ethernet Converged Network Adapter X710-4
@@ -27909,8 +28108,10 @@
                8086 0008  Ethernet Network Adapter OCP XXV710-1
                8086 0009  Ethernet 25G 2P XXV710 Adapter
                8086 000a  Ethernet 25G 2P XXV710 OCP
+               8086 000d  Ethernet 25G 2P XXV710 OCP
                8086 4001  Ethernet Network Adapter XXV710-2
        1591  Ethernet Controller E810-C for backplane
+               8086 bcce  Ethernet Controller E810-C for Intel(R) Open FPGA Stack
        1592  Ethernet Controller E810-C for QSFP
                1137 02bf  E810CQDA2 2x100 GbE QSFP28 PCIe NIC
                193d 1050  NIC-ETH1060F-LP-2P 2x100GbE Ethernet PCIe Card
@@ -27955,7 +28156,8 @@
                1bd4 0057  Ethernet Network Adapter E810-XXVAM2
                1bd4 0058  Ethernet Network Adapter E810-XXVAM2 for OCP 3.0
                1bd4 006e  Ethernet Network Adapter E810-XXVAM2 for BD
-               1eec 0102  VSE250241E Dual-port 10Gb/25Gb Ethernet PCIe
+               1bd4 0083  Ethernet Network Adapter E810-XXVAM2 for lldp
+               1eec 0102  VSE-225-41E Dual-port 10Gb/25Gb Etherent PCIe
                8086 0001  Ethernet 25G 2P E810-XXV OCP
                8086 0002  Ethernet 25G 2P E810-XXV Adapter
                8086 0003  Ethernet Network Adapter E810-XXV-2
@@ -28124,6 +28326,7 @@
        188a  Ethernet Connection E823-C for backplane
        188b  Ethernet Connection E823-C for QSFP
        188c  Ethernet Connection E823-C for SFP
+               1028 0abd  Ethernet Connection 25G 4P E823-C LOM
        188d  Ethernet Connection E823-C/X557-AT 10GBASE-T
        188e  Ethernet Connection E823-C 1GbE
        1890  Ethernet Connection E822-C for backplane
@@ -28161,6 +28364,7 @@
                17aa 382a  B51-80 Laptop
        1908  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
        1909  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x4)
+       190b  HD Graphics 510
        190c  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
                1028 06d6  Latitude 7275 tablet
                1028 06e6  Latitude 11 5175 2-in-1
@@ -28194,6 +28398,7 @@
                1028 06e6  Latitude 11 5175 2-in-1
        191f  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
        1921  HD Graphics 520
+       1923  HD Graphics 535
        1926  Iris Graphics 540
        1927  Iris Graphics 550
        192b  Iris Graphics 555
@@ -30069,7 +30274,7 @@
                8086 3904  NVMe Datacenter SSD [Optane] x4 AIC (P4800X)
                8086 3905  NVMe Datacenter SSD [Optane] 15mm 2.5" U.2 (P4800X)
        2723  Wi-Fi 6 AX200
-               1a56 1654  Killerâ\84¢ Wi-Fi 6 AX1650x (AX200NGW)
+               1a56 1654  Killerââ\80\9e¢ Wi-Fi 6 AX1650x (AX200NGW)
                8086 0084  Wi-Fi 6 AX200NGW
        2725  Wi-Fi 6 AX210/AX211/AX411 160MHz
                8086 0020  Wi-Fi 6 AX210 160MHz
@@ -31670,6 +31875,9 @@
        3432  5520/5500/X58 Chipset QuickData Technology Device
        3433  5520/5500/X58 Chipset QuickData Technology Device
        3438  7500/5520/5500/X58 I/O Hub Throttle Registers
+       3440  Ice Lake UPI Misc
+       3441  Ice Lake UPI Link/Phy0
+       3456  Ice Lake NorthPeak
        347e  Ice Lake Xeon Non-Transparent Bridge
        3482  Ice Lake-LP LPC Controller
        34a3  Ice Lake-LP SMBus Controller
@@ -32322,12 +32530,19 @@
        3e92  CoffeeLake-S GT2 [UHD Graphics 630]
                1028 0869  Vostro 3470
        3e93  CoffeeLake-S GT1 [UHD Graphics 610]
+       3e94  Coffee Lake-S GT2 [UHD Graphics P630]
        3e96  CoffeeLake-S GT2 [UHD Graphics P630]
        3e98  CoffeeLake-S GT2 [UHD Graphics 630]
+       3e9a  Coffee Lake-S GT2 [UHD Graphics P630]
        3e9b  CoffeeLake-H GT2 [UHD Graphics 630]
+       3e9c  Coffee Lake-S GT1 [UHD Graphics 610]
        3ea0  WhiskeyLake-U GT2 [UHD Graphics 620]
                1028 089e  Inspiron 5482
+       3ea1  Whiskey Lake-U GT1 [UHD Graphics 610]
        3ea5  CoffeeLake-U GT3e [Iris Plus Graphics 655]
+       3ea6  Coffee Lake-U GT3 [Iris Plus Graphics 645]
+       3ea8  Coffee Lake-U GT3 [Iris Plus Graphics 655]
+       3ea9  Coffee Lake-U GT2 [UHD Graphics 620]
        3ec2  8th Gen Core Processor Host Bridge/DRAM Registers
                1028 0869  Vostro 3470
                1043 8694  PRIME H310M-D
@@ -32473,6 +32688,7 @@
        43c8  Tiger Lake-H HD Audio Controller
        43e0  Tiger Lake-H Management Engine Interface
        43e8  Tiger Lake-H Serial IO I2C Controller #0
+       43e9  Tiger Lake-H Serial IO I2C Controller #1
        43ed  Tiger Lake-H USB 3.2 Gen 2x1 xHCI Host Controller
        43ef  Tiger Lake-H Shared SRAM
        43f0  Tiger Lake PCH CNVi WiFi
@@ -32480,12 +32696,16 @@
                8086 0074  Wi-Fi 6 AX201 160MHz
                8086 0264  Wireless-AC 9461
                8086 02a4  Wireless-AC 9462
+       43fc  Tiger Lake-H Integrated Sensor Hub
        444e  Turbo Memory Controller
+       4555  Elkhart Lake [UHD Graphics Gen11 16EU]
+       4571  Elkhart Lake [UHD Graphics Gen11 32EU]
        460d  12th Gen Core Processor PCI Express x16 Controller #1
        461d  Alder Lake Innovation Platform Framework Processor Participant
        461e  Alder Lake-P Thunderbolt 4 USB Controller
        461f  Alder Lake-P Thunderbolt 4 PCI Express Root Port #3
        4626  Alder Lake-P Integrated Graphics Controller
+       4628  Alder Lake-UP3 GT2 [UHD Graphics]
        4629  12th Gen Core Processor Host Bridge/DRAM Registers
        462f  Alder Lake-P Thunderbolt 4 PCI Express Root Port #2
        463d  12th Gen Core Processor PCI Express x4 Controller #2
@@ -32495,21 +32715,34 @@
        464d  12th Gen Core Processor PCI Express x4 Controller #0
        464f  12th Gen Core Processor Gaussian & Neural Accelerator
        4660  12th Gen Core Processor Host Bridge/DRAM Registers
+       4668  12th Gen Core Processor Host Bridge/DRAM Registers
        466d  Alder Lake-P Thunderbolt 4 NHI #1
        466e  Alder Lake-P Thunderbolt 4 PCI Express Root Port #0
        467d  Platform Monitoring Technology
        467f  Volume Management Device NVMe RAID Controller
        4680  AlderLake-S GT1
+       4682  Alder Lake-S GT1 [UHD Graphics 730]
+       4688  Alder Lake-HX GT1 [UHD Graphics 770]
+       468a  Alder Lake-S [UHD Graphics]
+       468b  Alder Lake-S [UHD Graphics]
+       4690  Alder Lake-S GT1 [UHD Graphics 770]
+       4692  Alder Lake-S GT1 [UHD Graphics 730]
+       4693  Alder Lake-S GT1 [UHD Graphics 710]
        46a0  AlderLake-P GT2
        46a1  UHD Graphics
        46a3  Alder Lake-P GT1 [UHD Graphics]
        46a6  Alder Lake-P Integrated Graphics Controller
+       46a8  Alder Lake-UP3 GT2 [Iris Xe Graphics]
+       46aa  Alder Lake-UP4 GT2 [Iris Xe Graphics]
+       46b3  Alder Lake-UP3 GT1 [UHD Graphics]
        46c0  AlderLake-M GT1
+       46c3  Alder Lake-UP4 GT1 [UHD Graphics]
        4905  DG1 [Iris Xe MAX Graphics]
        4906  DG1 [Iris Xe Pod]
        4907  SG1 [Server GPU SG-18M]
                193d 4000  UN-GPU-XG310-32GB-FHFL
        4908  DG1 [Iris Xe Graphics]
+       4909  DG1 [UHD Discrete Graphics]
        4c3d  Volume Management Device NVMe RAID Controller
        4c8a  RocketLake-S GT1 [UHD Graphics 750]
        4c8b  RocketLake-S GT1 [UHD Graphics 730]
@@ -32607,6 +32840,20 @@
                8086 0001  EtherExpress PRO/100 Server Ethernet Adapter
        530d  80310 (IOP) IO Processor
        5502  Ethernet Controller (2) I225-LMvP
+               1ab6 0225  TS4 On-Board 2.5GbE Ethernet Adaptor
+       5690  DG2 [Arc A770M]
+       5691  DG2 [Arc A730M]
+       5692  DG2 [Arc A550M]
+       5693  DG2 [Arc A370M]
+       5694  DG2 [Arc A350M]
+       5695  DG2 [Iris Xe MAX A200M]
+       56a0  DG2 [Arc A770]
+       56a1  DG2 [Arc A750]
+       56a2  DG2 [Arc A580]
+       56a5  DG2 [Arc A380]
+       56a6  DG2 [Arc A310]
+       56c0  Data Center GPU Flex 170
+       56c1  Data Center GPU Flex 140
        5845  QEMU NVM Express Controller
                1af4 1100  QEMU Virtual Machine
        5900  Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
@@ -32617,7 +32864,9 @@
                17aa 2247  ThinkPad T570
                17aa 224f  ThinkPad X1 Carbon 5th Gen
        5905  Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x8)
+       5906  HD Graphics 610
        5909  Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x4)
+       590b  HD Graphics 610
        590c  Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
        590f  Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
                1462 7a68  B250 KRAIT GAMING (MS-7A68)
@@ -32640,10 +32889,11 @@
        591d  HD Graphics P630
        591e  HD Graphics 615
        591f  Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
+       5921  HD Graphics 620
        5923  HD Graphics 635
        5926  Iris Plus Graphics 640
        5927  Iris Plus Graphics 650
-       5a84  Celeron N3350/Pentium N4200/Atom E3900 Series Integrated Graphics Controller
+       5a84  Apollo Lake [HD Graphics 505]
        5a85  HD Graphics 500
        5a88  Celeron N3350/Pentium N4200/Atom E3900 Series Imaging Unit
        5a98  Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster
@@ -32972,18 +33222,56 @@
        7aa3  Alder Lake-S PCH SMBus Controller
        7aa4  Alder Lake-S PCH SPI Controller
        7aa7  Alder Lake-S PCH Shared SRAM
+       7aa8  Alder Lake-S PCH Serial IO UART #0
+       7aab  Alder Lake-S PCH Serial IO SPI Controller #1
+       7ab0  Alder Lake-S PCH PCI Express Root Port #9
        7ab4  Alder Lake-S PCH PCI Express Root Port #13
        7ab8  Alder Lake-S PCH PCI Express Root Port #1
        7ab9  Alder Lake-S PCH PCI Express Root Port #2
        7abc  Alder Lake-S PCH PCI Express Root Port #5
        7abd  Alder Lake-S PCH PCI Express Root Port #6
-       7acc  Alder Lake-S PCH I2C Controller #0
+       7abf  Alder Lake-S PCH PCI Express Root Port #8
+       7acc  Alder Lake-S PCH Serial IO I2C Controller #0
+       7acd  Alder Lake-S PCH Serial IO I2C Controller #1
+       7ace  Alder Lake-S PCH Serial IO I2C Controller #2
+       7acf  Alder Lake-S PCH Serial IO I2C Controller #3
        7ad0  Alder Lake-S HD Audio Controller
        7ae0  Alder Lake-S PCH USB 3.2 Gen 2x2 XHCI Controller
        7ae2  Alder Lake-S PCH SATA Controller [AHCI Mode]
        7ae8  Alder Lake-S PCH HECI Controller #1
        7af0  Alder Lake-S PCH CNVi WiFi
+               8086 0034  Wireless-AC 9560
+               8086 0070  Wi-Fi 6 AX201 160MHz
                8086 0094  Wi-Fi 6 AX201 160MHz
+       7afc  Alder Lake-S PCH Serial IO I2C Controller #4
+       7afd  Alder Lake-S PCH Serial IO I2C Controller #5
+       7d0b  Volume Management Device NVMe RAID Controller Intel Corporation
+       7e01  Meteor Lake-P LPC/eSPI Controller
+       7e22  Meteor Lake-P SMBus Controller
+       7e23  Meteor Lake-P SPI Controller
+       7e24  Meteor Lake-P Trace Hub
+       7e25  Meteor Lake-P Serial IO UART Controller #0
+       7e26  Meteor Lake-P Serial IO UART Controller #1
+       7e27  Meteor Lake-P Serial IO SPI Controller #0
+       7e28  Meteor Lake-P HD Audio Controller
+       7e30  Meteor Lake-P Serial IO SPI Controller #1
+       7e46  Meteor Lake-P Serial IO SPI Controller #2
+       7e50  Meteor Lake-P Serial IO I2C Controller #4
+       7e51  Meteor Lake-P Serial IO I2C Controller #5
+       7e52  Meteor Lake-P Serial IO UART Controller #2
+       7e78  Meteor Lake-P Serial IO I2C Controller #0
+       7e79  Meteor Lake-P Serial IO I2C Controller #1
+       7e7a  Meteor Lake-P Serial IO I2C Controller #2
+       7e7b  Meteor Lake-P Serial IO I2C Controller #3
+       7e7d  Meteor Lake-P USB 3.2 Gen 2x1 xHCI Host Controller
+       7e7e  Meteor Lake-P USB Device Controller
+       7ec0  Meteor Lake-P Thunderbolt 4 USB Controller
+       7ec2  Meteor Lake-P Thunderbolt 4 NHI #0
+       7ec3  Meteor Lake-P Thunderbolt 4 NHI #1
+       7ec4  Meteor Lake-P Thunderbolt 4 PCI Express Root Port #0
+       7ec5  Meteor Lake-P Thunderbolt 4 PCI Express Root Port #1
+       7ec6  Meteor Lake-P Thunderbolt 4 PCI Express Root Port #2
+       7ec7  Meteor Lake-P Thunderbolt 4 PCI Express Root Port #3
        8002  Trusted Execution Technology Registers
        8003  Trusted Execution Technology Registers
        8100  US15W/US15X SCH [Poulsbo] Host Bridge
@@ -33027,6 +33315,7 @@
                1993 0def  mGuard-PCI AV#0
        8603  Ice Lake-LP Dynamic Tuning Processor Participant
        87c0  UHD Graphics 617
+       87ca  UHD Graphics 617
        8800  Platform Controller Hub EG20T PCI Express Port
        8801  Platform Controller Hub EG20T Packet Hub
        8802  Platform Controller Hub EG20T Gigabit Ethernet Controller
@@ -33068,6 +33357,7 @@
        8a52  Iris Plus Graphics G7
        8a53  Iris Plus Graphics G7
        8a56  Iris Plus Graphics G1 (Ice Lake)
+       8a58  Ice Lake-Y GT1 [UHD Graphics G1]
        8a5a  Iris Plus Graphics G4 (Ice Lake)
        8a5c  Iris Plus Graphics G4 (Ice Lake)
        8c00  8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode]
@@ -33316,6 +33606,8 @@
        9622  Integrated RAID
        9641  Integrated RAID
        96a1  Integrated RAID
+       9840  Lakefield GT2 [UHD Graphics]
+       9841  Lakefield GT1.5 [UHD Graphics]
        9a01  11th Gen Core Processor PCIe Controller #1
        9a03  TigerLake-LP Dynamic Tuning Processor Participant
        9a09  11th Gen Core Processor PCIe Controller
@@ -33341,13 +33633,18 @@
        9a31  Tiger Lake-H Thunderbolt 4 PCI Express Root Port #3
        9a33  Tiger Lake Trace Hub
        9a36  11th Gen Core Processor Host Bridge/DRAM Registers
+       9a40  Tiger Lake-UP4 GT2 [Iris Xe Graphics]
        9a49  TigerLake-LP GT2 [Iris Xe Graphics]
        9a60  TigerLake-H GT1 [UHD Graphics]
        9a68  TigerLake-H GT1 [UHD Graphics]
+       9a70  Tiger Lake-H GT1 [UHD Graphics]
+       9a78  Tiger Lake-LP GT2 [UHD Graphics G4]
+       9b21  Comet Lake-U GT2 [UHD Graphics 620]
        9b33  Comet Lake-S 6c Host Bridge/DRAM Controller
        9b41  CometLake-U GT2 [UHD Graphics]
                1028 09bd  Latitude 7310
                1028 09be  Latitude 7410
+       9b43  10th Gen Core Processor Host Bridge/DRAM Registers
        9b44  10th Gen Core Processor Host Bridge/DRAM Registers
        9b53  Comet Lake-S 6c Host Bridge/DRAM Controller
        9b54  10th Gen Core Processor Host Bridge/DRAM Registers
@@ -33355,11 +33652,18 @@
                1028 09be  Latitude 7410
        9b63  10th Gen Core Processor Host Bridge/DRAM Registers
        9b64  10th Gen Core Processor Host Bridge/DRAM Registers
+       9ba4  Comet Lake-H GT1 [UHD Graphics 610]
        9ba8  CometLake-S GT1 [UHD Graphics 610]
+       9baa  Comet Lake UHD Graphics
+       9bac  Comet Lake UHD Graphics
        9bc4  CometLake-H GT2 [UHD Graphics]
        9bc5  CometLake-S GT2 [UHD Graphics 630]
+       9bc6  Comet Lake-S GT2 [UHD Graphics P630]
        9bc8  CometLake-S GT2 [UHD Graphics 630]
        9bca  Comet Lake UHD Graphics
+       9bcc  Comet Lake UHD Graphics
+       9be6  Comet Lake-S GT2 [UHD Graphics P630]
+       9bf6  Coffee Lake-S GT2 [UHD Graphics P630]
        9c00  8 Series SATA Controller 1 [IDE mode]
        9c01  8 Series SATA Controller 1 [IDE mode]
        9c02  8 Series SATA Controller 1 [AHCI mode]
@@ -33672,6 +33976,8 @@
        a0c5  Tiger Lake-LP Serial IO I2C Controller #4
        a0c6  Tiger Lake-LP Serial IO I2C Controller #5
        a0c8  Tiger Lake-LP Smart Sound Technology Audio Controller
+# SATA controller on Intel Tiger Lake based mobile platforms in AHCI mode. Could be found on Panasonic Let's Note CF-SV2.
+       a0d3  Tiger Lake-LP SATA Controller
        a0e0  Tiger Lake-LP Management Engine Interface
        a0e3  Tiger Lake-LP Active Management Technology - SOL
        a0e8  Tiger Lake-LP Serial IO I2C Controller #0
@@ -33996,7 +34302,17 @@
        a3eb  Comet Lake PCI Express Root Port #21
        a3f0  Comet Lake PCH-V cAVS
        a620  6400/6402 Advanced Memory Buffer (AMB)
+       a77f  Volume Management Device NVMe RAID Controller Intel Corporation
+       a780  Raptor Lake-S UHD Graphics
+       a781  Raptor Lake-S UHD Graphics
+       a782  Raptor Lake-S UHD Graphics
+       a783  Raptor Lake-S UHD Graphics
+       a788  Raptor Lake-S UHD Graphics
+       a789  Raptor Lake-S UHD Graphics
+       a78a  Raptor Lake-S UHD Graphics
+       a78b  Raptor Lake-S UHD Graphics
        abc0  Omni-Path Fabric Switch Silicon 100 Series
+       ad0b  Volume Management Device NVMe RAID Controller Intel Corporation
        b152  21152 PCI-to-PCI Bridge
                8086 b152  21152 PCI-to-PCI Bridge
 # observed, and documented in Intel revision note; new mask of 1011:0026
@@ -34087,6 +34403,8 @@
        011b  WX1860AL1 Gigabit Ethernet Controller Virtual Function
        1000  Ethernet Controller RP1000 Virtual Function for 10GbE SFP+
        1001  Ethernet Controller RP1000 for 10GbE SFP+
+               1bd4 0084  Ethernet Controller RP1000 for 10GbE SFP+(lldp)
+               1bd4 0085  Ethernet Controller SP1000A for 10GBASE-T
                8088 0000  Ethernet Network Adaptor RP1000 for 10GbE SFP+
        2000  Ethernet Controller RP2000 Virtual Function for 10GbE SFP+
        2001  Ethernet Controller RP2000 for 10GbE SFP+
@@ -34482,6 +34800,10 @@
                1bd4 0078  RS0800M5E24iM
                1bd4 0079  RS0800M5H24iM
                1bd4 0080  RS0804M5R16iM
+               1bd4 0086  RT0800M7E
+               1bd4 0087  RT0800M7H
+               1bd4 0088  RT0804M7R
+               1bd4 0089  RT0808M7R
                1cc4 0101  Ramaxel FBGF-RAD PM8204
                1cc4 0201  Ramaxel FBGF-RAD PM8222
                1d49 0220  ThinkSystem 4350-8i SAS/SATA 12Gb HBA
@@ -34532,11 +34854,17 @@
                9005 1462  HBA 1200-8i
                9005 1471  SmartRAID 3254-16i /e
                9005 1472  SmartRAID 3258-16i /e
+               9005 1475  SmartRAID 3254-16e /e
                9005 14a0  SmartRAID 3254-8i
                9005 14a1  SmartRAID 3204-8i
                9005 14a2  SmartRAID 3252-8i
+               9005 14a4  SmartRAID 3254-8i /e
+               9005 14a5  SmartRAID 3252-8i /e
+               9005 14a6  SmartRAID 3204-8i /e
                9005 14c0  SmartHBA 2200-16i
                9005 14c1  HBA 1200-16i
+               9005 14c3  HBA 1200-16e
+               9005 14c4  HBA 1200-8e
        0410  AIC-9410W SAS (Razor HBA RAID)
                9005 0410  ASC-48300(Spirit RAID)
                9005 0411  ASC-58300 (Oakmont RAID)
@@ -34644,7 +34972,7 @@
 # 2-port Serial 1-port Parallel Adaptor
        9912  PCIe 9912 Multi-I/O Controller
        9922  MCS9922 PCIe Multi-I/O Controller
-       9990  MCS9990 PCIe to 4â\80\90Port USB 2.0 Host Controller
+       9990  MCS9990 PCIe to 4ââ\82¬Â\90Port USB 2.0 Host Controller
 # Subsystem ID on a 3c985B-SX network card
 9850  3Com (wrong ID)
 9902  Stargen Inc.

diff --git a/hwdb.d/pnp_id_registry.html b/hwdb.d/pnp_id_registry.html
index ac15190e4cda481d62ef802374f66f519f06d2be..9dcb276b7fb253ab80acea5d4c1e2bc7cb2c47f3 100644 (file)
--- a/hwdb.d/pnp_id_registry.html
+++ b/hwdb.d/pnp_id_registry.html
@@ -2502,6 +2502,16 @@
  <tr class="even"><td>Shiftall Inc.</td><td>SFL</td><td>12/31/2021</td> </tr>
  <tr class="odd"><td>AudioControl</td><td>AUD</td><td>12/31/2021</td> </tr>
  <tr class="even"><td>Schneider Consumer Group</td><td>SCA</td><td>02/08/2022</td> </tr>
+ <tr class="odd"><td>NOLO CO., LTD.</td><td>NVR</td><td>04/08/2022</td> </tr>
+ <tr class="even"><td>Riedel Communications Canada Inc.</td><td>RDL</td><td>04/08/2022</td> </tr>
+ <tr class="odd"><td>arpara Technology Co., Ltd.</td><td>IMX</td><td>04/08/2022</td> </tr>
+ <tr class="even"><td>Nreal</td><td>MRG</td><td>04/08/2022</td> </tr>
+ <tr class="odd"><td>Venetex Corporation</td><td>VNX</td><td>04/08/2022</td> </tr>
+ <tr class="even"><td>G.VISION</td><td>GVS</td><td>06/17/2022</td> </tr>
+ <tr class="odd"><td>Galaxy Microsystems Ltd.</td><td>GXL</td><td>06/17/2022</td> </tr>
+ <tr class="even"><td>OZO Co.Ltd</td><td>OZD</td><td>06/17/2022</td> </tr>
+ <tr class="odd"><td>GoUp Co.,Ltd</td><td>GUP</td><td>06/24/2022</td> </tr>
+ <tr class="even"><td>Eizo Technologies GmbH</td><td>ETG</td><td>06/24/2022</td> </tr>
       </tbody>
     </table>
   </body>

diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
index 2a1f654112553d47f8b9061429c156b0a7946339..d28a177842347ae6fa75c4bf1c434555348cb375 100644 (file)
--- a/man/coredumpctl.xml
+++ b/man/coredumpctl.xml
@@ -334,9 +334,9 @@
       <title>List all the core dumps of a program</title>
 
       <programlisting>$ coredumpctl list /usr/lib64/firefox/firefox
-TIME     PID  UID  GID SIG     COREFILE EXE                         SIZE
-Tue …   8018 1000 1000 SIGSEGV missing  /usr/lib64/firefox/firefox   n/a
-Wed … 251609 1000 1000 SIGTRAP missing  /usr/lib64/firefox/firefox   n/a
+TIME       PID  UID  GID SIG     COREFILE EXE                         SIZE
+Tue …   8018 1000 1000 SIGSEGV missing  /usr/lib64/firefox/firefox     -
+Wed … 251609 1000 1000 SIGTRAP missing  /usr/lib64/firefox/firefox     -
 Fri … 552351 1000 1000 SIGSEGV present  /usr/lib64/firefox/firefox 28.7M
 </programlisting>
 
@@ -380,7 +380,7 @@ Fri … 552351 1000 1000 SIGSEGV present  /usr/lib64/firefox/firefox 28.7M
     Machine ID: …
       Hostname: …
        Storage: /var/lib/systemd/coredump/core.bash.1000.….zst (present)
-     Disk Size: 51.7K
+  Size on Disk: 51.7K
        Message: Process 130414 (bash) of user 1000 dumped core.
 
                 Stack trace of thread 130414:

diff --git a/man/halt.xml b/man/halt.xml
index 7ab21c148fbb56aae87252cb49c82454c5f06ae2..6d272f7daf7c109b56df8cfc8e60663c8ba0bf15 100644 (file)
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -84,8 +84,12 @@
         <term><option>-f</option></term>
         <term><option>--force</option></term>
 
-        <listitem><para>Force immediate halt, power-off, reboot. Do
-        not contact the init system.</para></listitem>
+        <listitem>
+          <para>Force immediate halt, power-off, reboot. If specified, the command does not contact the init
+          system. In most cases, filesystems are not properly unmounted before shutdown. For example, the
+          command <command>reboot -f</command> is mostly equivalent to <command>systemctl reboot -ff</command>,
+          instead of <command>systemctl reboot -f</command>.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>

diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index 475dd325a5234f454303eb2be3d20f34e74739f3..b8ea2b16b26e0e08793fa7e859a0a0dc7df63ebb 100644 (file)
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -24,8 +24,8 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>kernel-install</command>
-      <arg choice="plain">COMMAND</arg>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
+      <arg choice="plain">COMMAND</arg>
       <arg choice="plain"><replaceable>KERNEL-VERSION</replaceable></arg>
       <arg choice="plain"><replaceable>KERNEL-IMAGE</replaceable></arg>
       <arg choice="opt" rep="repeat"><replaceable>INITRD-FILE</replaceable></arg>

diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index 945c24a3a76719a14a4e50bd5ea0384cc03ef6a9..741a72d2649f7dce255967ed959aa8bcf7eae7d4 100644 (file)
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -393,6 +393,12 @@ node /org/freedesktop/systemd1 {
       readonly s DefaultStandardOutput = '...';
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s DefaultStandardError = '...';
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
+      readonly s WatchdogDevice = '...';
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
+      readonly t WatchdogLastPingTimestamp = ...;
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
+      readonly t WatchdogLastPingTimestampMonotonic = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       @org.freedesktop.systemd1.Privileged("true")
       readwrite t RuntimeWatchdogUSec = ...;
@@ -515,16 +521,6 @@ node /org/freedesktop/systemd1 {
       readonly i DefaultOOMScoreAdjust = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s CtrlAltDelBurstAction = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly s WatchdogDevice = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly t WatchdogTimeoutUsec = ...;
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly t WatchdogPreTimeoutUsec = ...;
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly t WatchdogLastPingTimestamp = ...;
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly t WatchdogLastPingTimestampMonotonic = ...;
   };
   interface org.freedesktop.DBus.Peer { ... };
   interface org.freedesktop.DBus.Introspectable { ... };
@@ -662,6 +658,12 @@ node /org/freedesktop/systemd1 {
 
     <!--property DefaultStandardError is not documented!-->
 
+    <!--property WatchdogDevice is not documented!-->
+
+    <!--property WatchdogLastPingTimestamp is not documented!-->
+
+    <!--property WatchdogLastPingTimestampMonotonic is not documented!-->
+
     <!--property RuntimeWatchdogUSec is not documented!-->
 
     <!--property RuntimeWatchdogPreUSec is not documented!-->
@@ -776,16 +778,6 @@ node /org/freedesktop/systemd1 {
 
     <!--property CtrlAltDelBurstAction is not documented!-->
 
-    <!--property WatchdogDevice is not documented!-->
-
-    <!--property WatchdogTimeoutUsec is not documented!-->
-
-    <!--property WatchdogPreTimeoutUsec is not documented!-->
-
-    <!--property WatchdogLastPingTimestamp is not documented!-->
-
-    <!--property WatchdogLastPingTimestampMonotonic is not documented!-->
-
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
     <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.systemd1.Manager"/>
@@ -1080,6 +1072,12 @@ node /org/freedesktop/systemd1 {
 
     <variablelist class="dbus-property" generated="True" extra-ref="DefaultStandardError"/>
 
+    <variablelist class="dbus-property" generated="True" extra-ref="WatchdogDevice"/>
+
+    <variablelist class="dbus-property" generated="True" extra-ref="WatchdogLastPingTimestamp"/>
+
+    <variablelist class="dbus-property" generated="True" extra-ref="WatchdogLastPingTimestampMonotonic"/>
+
     <variablelist class="dbus-property" generated="True" extra-ref="RuntimeWatchdogUSec"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="RuntimeWatchdogPreUSec"/>
@@ -1196,16 +1194,6 @@ node /org/freedesktop/systemd1 {
 
     <variablelist class="dbus-property" generated="True" extra-ref="CtrlAltDelBurstAction"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="WatchdogDevice"/>
-
-    <variablelist class="dbus-property" generated="True" extra-ref="WatchdogTimeoutUsec"/>
-
-    <variablelist class="dbus-property" generated="True" extra-ref="WatchdogPreTimeoutUsec"/>
-
-    <variablelist class="dbus-property" generated="True" extra-ref="WatchdogLastPingTimestamp"/>
-
-    <variablelist class="dbus-property" generated="True" extra-ref="WatchdogLastPingTimestampMonotonic"/>
-
     <!--End of Autogenerated section-->
 
     <refsect2>

diff --git a/man/repart.d.xml b/man/repart.d.xml
index bdbf054fcf699ca42df12b05df180abea1ef5e55..df5338c92af12af70d768b7af9b8d409ab6bd203 100644 (file)
--- a/man/repart.d.xml
+++ b/man/repart.d.xml
@@ -484,12 +484,12 @@
         <term><varname>Format=</varname></term>
 
         <listitem><para>Takes a file system name, such as <literal>ext4</literal>, <literal>btrfs</literal>,
-        <literal>xfs</literal> or <literal>vfat</literal>, or the special value <literal>swap</literal>. If
-        specified and the partition is newly created it is formatted with the specified file system (or as
-        swap device). The file system UUID and label are automatically derived from the partition UUID and
-        label. If this option is used, the size allocation algorithm is slightly altered: the partition is
-        created as least as big as required for the minimal file system of the specified type (or 4KiB if the
-        minimal size is not known).</para>
+        <literal>xfs</literal>, <literal>vfat</literal>, <literal>squashfs</literal>, or the special value
+        <literal>swap</literal>. If specified and the partition is newly created it is formatted with the
+        specified file system (or as swap device). The file system UUID and label are automatically derived
+        from the partition UUID and label. If this option is used, the size allocation algorithm is slightly
+        altered: the partition is created as least as big as required for the minimal file system of the
+        specified type (or 4KiB if the minimal size is not known).</para>
 
         <para>This option has no effect if the partition already exists.</para>
 

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 4f70cd0c6396d2e0a810f4065146ab92c9530ca1..56bd4b84b93e6dec3becd412fe24b9dfb5e09a74 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -159,7 +159,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             Produces output similar to
             <programlisting>
 NEXT                         LEFT          LAST                         PASSED     UNIT                         ACTIVATES
-n/a                          n/a           Thu 2017-02-23 13:40:29 EST  3 days ago ureadahead-stop.timer        ureadahead-stop.service
+-                            -             Thu 2017-02-23 13:40:29 EST  3 days ago ureadahead-stop.timer        ureadahead-stop.service
 Sun 2017-02-26 18:55:42 EST  1min 14s left Thu 2017-02-23 13:54:44 EST  3 days ago systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.service
 Sun 2017-02-26 20:37:16 EST  1h 42min left Sun 2017-02-26 11:56:36 EST  6h ago     apt-daily.timer              apt-daily.service
 Sun 2017-02-26 20:57:49 EST  2h 3min left  Sun 2017-02-26 11:56:36 EST  6h ago     snapd.refresh.timer          snapd.refresh.service

diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 0e67911fb03f2e1ea90570e7dcb11762bdb39844..0c91d61d7634a676e55c1ae8be54b5f2cfbbf4d3 100644 (file)
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -478,7 +478,7 @@ Dec 08 20:44:48 container systemd[1]: Started /bin/touch /tmp/foo.</programlisti
     <example>
       <title>Allowing access to the tty</title>
 
-      <para>The following command invokes <citerefentry project='die-net'><refentrytitle>bash</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+      <para>The following command invokes <citerefentry project='man-pages'><refentrytitle>bash</refentrytitle><manvolnum>1</manvolnum></citerefentry>
       as a service passing its standard input, output and error to the calling TTY.</para>
 
       <programlisting># systemd-run -t --send-sighup bash</programlisting>

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 02d5e72aeebf717244afa03b690d9cda567d4165..e29bb98540491991af341e7bb6c8027de086c76d 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -331,11 +331,11 @@
 
       <para>For example, target units will complement all configured dependencies of type
       <varname>Wants=</varname> or <varname>Requires=</varname> with dependencies of type
-      <varname>After=</varname> unless <varname>DefaultDependencies=no</varname> is set in the
-      specified units. See
+      <varname>After=</varname>. See
       <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      for details. Note that this behavior can be turned off by setting
-      <varname>DefaultDependencies=no</varname>.</para>
+      for details. Note that this behavior can be opted out by setting
+      <varname>DefaultDependencies=no</varname> in the specified units, or it can be selectively
+      overidden via an explicit <varname>Before=</varname> dependency.</para>
     </refsect2>
   </refsect1>
 

diff --git a/meson.build b/meson.build
index 41a110871675b8f5ce2bf3adc8798b6e52c54da5..a1bedc220b430a444e7515fddd38e0fa9c7fcb2d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -3881,7 +3881,8 @@ foreach tuple : tests
                         test(name, exe,
                              env : test_env,
                              timeout : timeout,
-                             suite : suite)
+                             suite : suite,
+                             is_parallel : parallel)
                 endif
         else
                 message('Not compiling @0@ because @1@ is not true'.format(name, condition))

diff --git a/mkosi.default.d/10-systemd.conf b/mkosi.default.d/10-systemd.conf
index 1c69dc46e0f2befd3387fc72c8deeca548415f99..d1f00c2d5d2c235e0f02652c0990994cfcef61bf 100644 (file)
--- a/mkosi.default.d/10-systemd.conf
+++ b/mkosi.default.d/10-systemd.conf
@@ -59,6 +59,7 @@ BuildPackages=
 QemuHeadless=yes
 Netdev=yes
 QemuMem=2G
+ExtraSearchPaths=build/
 
 [Validation]
 Password=

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 4968946963aecd6b0219b938bab51d7f6843815f..6215f50faca193ed257b464406b1600e61f96efa 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -539,7 +539,6 @@ static int parse_argv(int argc, char *argv[]) {
 
 static int run(int argc, char *argv[]) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *unlink_dir = NULL;
 
         static const Verb verbs[] = {
@@ -598,8 +597,7 @@ static int run(int argc, char *argv[]) {
                                 DISSECT_IMAGE_RELAX_VAR_CHECK |
                                 DISSECT_IMAGE_READ_ONLY,
                                 &unlink_dir,
-                                &loop_device,
-                                &decrypted_image);
+                                &loop_device);
                 if (r < 0)
                         return r;
 

diff --git a/src/basic/chase-symlinks.c b/src/basic/chase-symlinks.c
index ce50ff972619d883508ae9a971a389adcb3501d3..ad1c92900b605b7a4aacf56f61dee05c88978690 100644 (file)
--- a/src/basic/chase-symlinks.c
+++ b/src/basic/chase-symlinks.c
@@ -84,10 +84,6 @@ int chase_symlinks(
         if (isempty(path))
                 return -EINVAL;
 
-        /* We don't support relative paths in combination with a root directory */
-        if (FLAGS_SET(flags, CHASE_PREFIX_ROOT) && !path_is_absolute(path))
-                return -EINVAL;
-
         /* This is a lot like canonicalize_file_name(), but takes an additional "root" parameter, that allows following
          * symlinks relative to a root directory, instead of the root of the host.
          *
@@ -265,8 +261,7 @@ int chase_symlinks(
                                 previous_stat = st;
                         }
 
-                        safe_close(fd);
-                        fd = TAKE_FD(fd_parent);
+                        close_and_replace(fd, fd_parent);
 
                         continue;
                 }
@@ -362,8 +357,7 @@ int chase_symlinks(
                         return -ENOMEM;
 
                 /* And iterate again, but go one directory further down. */
-                safe_close(fd);
-                fd = TAKE_FD(child);
+                close_and_replace(fd, child);
         }
 
         if (ret_path)

diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 00591d6c2d31fe67805f6c6970100d6698273009..6c85a34896c97173a6739f0e6f67c35e33321c7d 100644 (file)
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -654,7 +654,7 @@ int rearrange_stdio(int original_input_fd, int original_output_fd, int original_
                                 goto finish;
                         }
 
-                        CLOSE_AND_REPLACE(null_fd, copy);
+                        close_and_replace(null_fd, copy);
                 }
         }
 

diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index 808cac4d5d4a10a9733de2ecb1cbec7e45a7bd38..8543d0d5eaa4d13f17160a5f4a2a8501f7e18b81 100644 (file)
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -98,7 +98,7 @@ static inline int make_null_stdio(void) {
         })
 
 /* Like free_and_replace(), but for file descriptors */
-#define CLOSE_AND_REPLACE(a, b)                 \
+#define close_and_replace(a, b)                 \
         ({                                      \
                 int *_fdp_ = &(a);              \
                 safe_close(*_fdp_);             \

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index d1272fb04b1c12a9824aaad077de2f9c203c3a51..cbab59b777349ba4aa1653c8fca9acfda3048b4f 100644 (file)
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -406,13 +406,7 @@ int symlink_idempotent(const char *from, const char *to, bool make_relative) {
         assert(to);
 
         if (make_relative) {
-                _cleanup_free_ char *parent = NULL;
-
-                r = path_extract_directory(to, &parent);
-                if (r < 0)
-                        return r;
-
-                r = path_make_relative(parent, from, &relpath);
+                r = path_make_relative_parent(to, from, &relpath);
                 if (r < 0)
                         return r;
 
@@ -438,13 +432,21 @@ int symlink_idempotent(const char *from, const char *to, bool make_relative) {
         return 0;
 }
 
-int symlink_atomic(const char *from, const char *to) {
-        _cleanup_free_ char *t = NULL;
+int symlink_atomic_full(const char *from, const char *to, bool make_relative) {
+        _cleanup_free_ char *relpath = NULL, *t = NULL;
         int r;
 
         assert(from);
         assert(to);
 
+        if (make_relative) {
+                r = path_make_relative_parent(to, from, &relpath);
+                if (r < 0)
+                        return r;
+
+                from = relpath;
+        }
+
         r = tempfn_random(to, NULL, &t);
         if (r < 0)
                 return r;

diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 080959d3b99b9e221803276ba49bf0cea9518bcb..f2174af15d7f0c47719ac10115e08c16463528d5 100644 (file)
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -58,7 +58,10 @@ static inline int touch(const char *path) {
 
 int symlink_idempotent(const char *from, const char *to, bool make_relative);
 
-int symlink_atomic(const char *from, const char *to);
+int symlink_atomic_full(const char *from, const char *to, bool make_relative);
+static inline int symlink_atomic(const char *from, const char *to) {
+        return symlink_atomic_full(from, to, false);
+}
 int mknod_atomic(const char *path, mode_t mode, dev_t dev);
 int mkfifo_atomic(const char *path, mode_t mode);
 int mkfifoat_atomic(int dir_fd, const char *path, mode_t mode);

diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index cd966cba9420662f2db007aab7d48326d5d0aa3d..c8ff342d0f7e45156f796bde8cc8d03ebe301f49 100644 (file)
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -19,7 +19,8 @@
 int mkdir_safe_internal(
                 const char *path,
                 mode_t mode,
-                uid_t uid, gid_t gid,
+                uid_t uid,
+                gid_t gid,
                 MkdirFlags flags,
                 mkdirat_func_t _mkdirat) {
 
@@ -42,13 +43,16 @@ int mkdir_safe_internal(
         if ((flags & MKDIR_FOLLOW_SYMLINK) && S_ISLNK(st.st_mode)) {
                 _cleanup_free_ char *p = NULL;
 
-                r = chase_symlinks_and_stat(path, NULL, 0, &p, &st, NULL);
+                r = chase_symlinks(path, NULL, CHASE_NONEXISTENT, &p, NULL);
                 if (r < 0)
                         return r;
                 if (r == 0)
                         return mkdir_safe_internal(p, mode, uid, gid,
                                                    flags & ~MKDIR_FOLLOW_SYMLINK,
                                                    _mkdirat);
+
+                if (lstat(p, &st) < 0)
+                        return -errno;
         }
 
         if (flags & MKDIR_IGNORE_EXISTING)

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 29a899b421d7a2e1e8c268abf3c4550775743d53..d8167da4f84e85048a458d847b13e34d8f6d2798 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -202,7 +202,17 @@ int path_make_relative_parent(const char *from_child, const char *to, char **ret
         assert(ret);
 
         /* Similar to path_make_relative(), but provides the relative path from the parent directory of
-         * 'from_child'. This may be useful when creating relative symlink. */
+         * 'from_child'. This may be useful when creating relative symlink.
+         *
+         * E.g.
+         * - from = "/path/to/aaa", to = "/path/to/bbb"
+         *      path_make_relative(from, to) = "../bbb"
+         *      path_make_relative_parent(from, to) = "bbb"
+         *
+         * - from = "/path/to/aaa/bbb", to = "/path/to/ccc/ddd"
+         *      path_make_relative(from, to) = "../../ccc/ddd"
+         *      path_make_relative_parent(from, to) = "../ccc/ddd"
+         */
 
         r = path_extract_directory(from_child, &from);
         if (r < 0)

diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c
index efa1797b7bab73816adee78858c546a1fbf24ca8..d16ca98f67a1785e4aa6d1c7bcdd9e5e91dde584 100644 (file)
--- a/src/basic/recurse-dir.c
+++ b/src/basic/recurse-dir.c
@@ -255,9 +255,9 @@ int recurse_dir(
                                          * directory fd — which should be riskless now that we pinned the
                                          * inode. */
 
-                                        subdir_fd = openat(AT_FDCWD, FORMAT_PROC_FD_PATH(inode_fd), O_DIRECTORY|O_CLOEXEC);
+                                        subdir_fd = fd_reopen(inode_fd, O_DIRECTORY|O_CLOEXEC);
                                         if (subdir_fd < 0)
-                                                return -errno;
+                                                return subdir_fd;
 
                                         inode_fd = safe_close(inode_fd);
                                 }

diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index c31b4d89d020e35c6d00be51bfa8f5377a4498d1..51adaca9d070ce10d0838a3801d460586bc83fd5 100644 (file)
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -360,6 +360,32 @@ bool stat_inode_unmodified(const struct stat *a, const struct stat *b) {
                 (!(S_ISCHR(a->st_mode) || S_ISBLK(a->st_mode)) || a->st_rdev == b->st_rdev); /* if device node, also compare major/minor, because we can */
 }
 
+bool statx_inode_same(const struct statx *a, const struct statx *b) {
+
+        /* Same as stat_inode_same() but for struct statx */
+
+        return a && b &&
+                FLAGS_SET(a->stx_mask, STATX_TYPE|STATX_INO) && FLAGS_SET(b->stx_mask, STATX_TYPE|STATX_INO) &&
+                (a->stx_mode & S_IFMT) != 0 &&
+                ((a->stx_mode ^ b->stx_mode) & S_IFMT) == 0 &&
+                a->stx_dev_major == b->stx_dev_major &&
+                a->stx_dev_minor == b->stx_dev_minor &&
+                a->stx_ino == b->stx_ino;
+}
+
+bool statx_mount_same(const struct new_statx *a, const struct new_statx *b) {
+        if (!a || !b)
+                return false;
+
+        /* if we have the mount ID, that's all we need */
+        if (FLAGS_SET(a->stx_mask, STATX_MNT_ID) && FLAGS_SET(b->stx_mask, STATX_MNT_ID))
+                return a->stx_mnt_id == b->stx_mnt_id;
+
+        /* Otherwise, major/minor of backing device must match */
+        return a->stx_dev_major == b->stx_dev_major &&
+                a->stx_dev_minor == b->stx_dev_minor;
+}
+
 int statx_fallback(int dfd, const char *path, int flags, unsigned mask, struct statx *sx) {
         static bool avoid_statx = false;
         struct stat st;

diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 56f15534aa2565d51f0f6b0f1ecd8bc44785f93b..f9519d8cbde3591cb142d059238a641e5751f449 100644 (file)
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -73,6 +73,9 @@ int proc_mounted(void);
 bool stat_inode_same(const struct stat *a, const struct stat *b);
 bool stat_inode_unmodified(const struct stat *a, const struct stat *b);
 
+bool statx_inode_same(const struct statx *a, const struct statx *b);
+bool statx_mount_same(const struct new_statx *a, const struct new_statx *b);
+
 int statx_fallback(int dfd, const char *path, int flags, unsigned mask, struct statx *sx);
 
 #if HAS_FEATURE_MEMORY_SANITIZER

diff --git a/src/basic/uid-range.c b/src/basic/uid-range.c
index 630bf42f92e1ef691f0a2012847bd4a3b3e540b1..846359927612a22532f9435dedc902b4b2ddada0 100644 (file)
--- a/src/basic/uid-range.c
+++ b/src/basic/uid-range.c
@@ -15,43 +15,27 @@
 #include "uid-range.h"
 #include "user-util.h"
 
-static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
-        assert(range);
+UidRange *uid_range_free(UidRange *range) {
+        if (!range)
+                return NULL;
 
-        return range->start <= start + nr &&
-                range->start + range->nr >= start;
+        free(range->entries);
+        return mfree(range);
 }
 
-static void uid_range_coalesce(UidRange **p, size_t *n) {
-        assert(p);
-        assert(n);
-
-        for (size_t i = 0; i < *n; i++) {
-                for (size_t j = i + 1; j < *n; j++) {
-                        UidRange *x = (*p)+i, *y = (*p)+j;
-
-                        if (uid_range_intersect(x, y->start, y->nr)) {
-                                uid_t begin, end;
-
-                                begin = MIN(x->start, y->start);
-                                end = MAX(x->start + x->nr, y->start + y->nr);
+static bool uid_range_entry_intersect(const UidRangeEntry *a, const UidRangeEntry *b) {
+        assert(a);
+        assert(b);
 
-                                x->start = begin;
-                                x->nr = end - begin;
-
-                                if (*n > j+1)
-                                        memmove(y, y+1, sizeof(UidRange) * (*n - j -1));
-
-                                (*n)--;
-                                j--;
-                        }
-                }
-        }
+        return a->start <= b->start + b->nr && a->start + a->nr >= b->start;
 }
 
-static int uid_range_compare(const UidRange *a, const UidRange *b) {
+static int uid_range_entry_compare(const UidRangeEntry *a, const UidRangeEntry *b) {
         int r;
 
+        assert(a);
+        assert(b);
+
         r = CMP(a->start, b->start);
         if (r != 0)
                 return r;
@@ -59,97 +43,96 @@ static int uid_range_compare(const UidRange *a, const UidRange *b) {
         return CMP(a->nr, b->nr);
 }
 
-int uid_range_add(UidRange **p, size_t *n, uid_t start, uid_t nr) {
-        bool found = false;
-        UidRange *x;
+static void uid_range_coalesce(UidRange *range) {
+        assert(range);
 
-        assert(p);
-        assert(n);
+        if (range->n_entries <= 0)
+                return;
 
-        if (nr <= 0)
-                return 0;
+        typesafe_qsort(range->entries, range->n_entries, uid_range_entry_compare);
 
-        if (start > UINT32_MAX - nr) /* overflow check */
-                return -ERANGE;
+        for (size_t i = 0; i < range->n_entries; i++) {
+                UidRangeEntry *x = range->entries + i;
 
-        for (size_t i = 0; i < *n; i++) {
-                x = (*p) + i;
-                if (uid_range_intersect(x, start, nr)) {
-                        found = true;
-                        break;
+                for (size_t j = i + 1; j < range->n_entries; j++) {
+                        UidRangeEntry *y = range->entries + j;
+                        uid_t begin, end;
+
+                        if (!uid_range_entry_intersect(x, y))
+                                break;
+
+                        begin = MIN(x->start, y->start);
+                        end = MAX(x->start + x->nr, y->start + y->nr);
+
+                        x->start = begin;
+                        x->nr = end - begin;
+
+                        if (range->n_entries > j + 1)
+                                memmove(y, y + 1, sizeof(UidRangeEntry) * (range->n_entries - j - 1));
+
+                        range->n_entries--;
+                        j--;
                 }
         }
+}
 
-        if (found) {
-                uid_t begin, end;
+int uid_range_add_internal(UidRange **range, uid_t start, uid_t nr, bool coalesce) {
+        _cleanup_(uid_range_freep) UidRange *range_new = NULL;
+        UidRange *p;
 
-                begin = MIN(x->start, start);
-                end = MAX(x->start + x->nr, start + nr);
+        assert(range);
 
-                x->start = begin;
-                x->nr = end - begin;
-        } else {
-                UidRange *t;
+        if (nr <= 0)
+                return 0;
 
-                t = reallocarray(*p, *n + 1, sizeof(UidRange));
-                if (!t)
-                        return -ENOMEM;
+        if (start > UINT32_MAX - nr) /* overflow check */
+                return -ERANGE;
 
-                *p = t;
-                x = t + ((*n) ++);
+        if (*range)
+                p = *range;
+        else {
+                range_new = new0(UidRange, 1);
+                if (!range_new)
+                        return -ENOMEM;
 
-                x->start = start;
-                x->nr = nr;
+                p = range_new;
         }
 
-        typesafe_qsort(*p, *n, uid_range_compare);
-        uid_range_coalesce(p, n);
+        if (!GREEDY_REALLOC(p->entries, p->n_entries + 1))
+                return -ENOMEM;
 
-        return *n;
-}
+        p->entries[p->n_entries++] = (UidRangeEntry) {
+                .start = start,
+                .nr = nr,
+        };
 
-int uid_range_add_str(UidRange **p, size_t *n, const char *s) {
-        uid_t start, nr;
-        const char *t;
-        int r;
+        if (coalesce)
+                uid_range_coalesce(p);
 
-        assert(p);
-        assert(n);
-        assert(s);
-
-        t = strchr(s, '-');
-        if (t) {
-                char *b;
-                uid_t end;
-
-                b = strndupa_safe(s, t - s);
-                r = parse_uid(b, &start);
-                if (r < 0)
-                        return r;
+        TAKE_PTR(range_new);
+        *range = p;
 
-                r = parse_uid(t+1, &end);
-                if (r < 0)
-                        return r;
+        return 0;
+}
 
-                if (end < start)
-                        return -EINVAL;
+int uid_range_add_str(UidRange **range, const char *s) {
+        uid_t start, end;
+        int r;
 
-                nr = end - start + 1;
-        } else {
-                r = parse_uid(s, &start);
-                if (r < 0)
-                        return r;
+        assert(range);
+        assert(s);
 
-                nr = 1;
-        }
+        r = parse_uid_range(s, &start, &end);
+        if (r < 0)
+                return r;
 
-        return uid_range_add(p, n, start, nr);
+        return uid_range_add_internal(range, start, end - start + 1, /* coalesce = */ true);
 }
 
-int uid_range_next_lower(const UidRange *p, size_t n, uid_t *uid) {
+int uid_range_next_lower(const UidRange *range, uid_t *uid) {
         uid_t closest = UID_INVALID, candidate;
 
-        assert(p);
+        assert(range);
         assert(uid);
 
         if (*uid == 0)
@@ -157,11 +140,11 @@ int uid_range_next_lower(const UidRange *p, size_t n, uid_t *uid) {
 
         candidate = *uid - 1;
 
-        for (size_t i = 0; i < n; i++) {
+        for (size_t i = 0; i < range->n_entries; i++) {
                 uid_t begin, end;
 
-                begin = p[i].start;
-                end = p[i].start + p[i].nr - 1;
+                begin = range->entries[i].start;
+                end = range->entries[i].start + range->entries[i].nr - 1;
 
                 if (candidate >= begin && candidate <= end) {
                         *uid = candidate;
@@ -179,23 +162,26 @@ int uid_range_next_lower(const UidRange *p, size_t n, uid_t *uid) {
         return 1;
 }
 
-bool uid_range_covers(const UidRange *p, size_t n, uid_t start, uid_t nr) {
-        assert(p || n == 0);
-
+bool uid_range_covers(const UidRange *range, uid_t start, uid_t nr) {
         if (nr == 0) /* empty range? always covered... */
                 return true;
 
         if (start > UINT32_MAX - nr) /* range overflows? definitely not covered... */
                 return false;
 
-        for (size_t i = 0; i < n; i++)
-                if (start >= p[i].start && start + nr <= p[i].start + p[i].nr)
+        if (!range)
+                return false;
+
+        for (size_t i = 0; i < range->n_entries; i++)
+                if (start >= range->entries[i].start &&
+                    start + nr <= range->entries[i].start + range->entries[i].nr)
                         return true;
 
         return false;
 }
 
-int uid_range_load_userns(UidRange **p, size_t *n, const char *path) {
+int uid_range_load_userns(UidRange **ret, const char *path) {
+        _cleanup_(uid_range_freep) UidRange *range = NULL;
         _cleanup_fclose_ FILE *f = NULL;
         int r;
 
@@ -205,6 +191,8 @@ int uid_range_load_userns(UidRange **p, size_t *n, const char *path) {
          *
          * To simplify things this will modify the passed array in case of later failure. */
 
+        assert(ret);
+
         if (!path)
                 path = "/proc/self/uid_map";
 
@@ -218,6 +206,10 @@ int uid_range_load_userns(UidRange **p, size_t *n, const char *path) {
                 return r;
         }
 
+        range = new0(UidRange, 1);
+        if (!range)
+                return -ENOMEM;
+
         for (;;) {
                 uid_t uid_base, uid_shift, uid_range;
                 int k;
@@ -228,13 +220,18 @@ int uid_range_load_userns(UidRange **p, size_t *n, const char *path) {
                         if (ferror(f))
                                 return errno_or_else(EIO);
 
-                        return 0;
+                        break;
                 }
                 if (k != 3)
                         return -EBADMSG;
 
-                r = uid_range_add(p, n, uid_base, uid_range);
+                r = uid_range_add_internal(&range, uid_base, uid_range, /* coalesce = */ false);
                 if (r < 0)
                         return r;
         }
+
+        uid_range_coalesce(range);
+
+        *ret = TAKE_PTR(range);
+        return 0;
 }

diff --git a/src/basic/uid-range.h b/src/basic/uid-range.h
index 7259c9e371bf104fdde16391b37d61bf4da109e7..461a5117373bbe2c12c4d2c78122af7d9b81a8a9 100644 (file)
--- a/src/basic/uid-range.h
+++ b/src/basic/uid-range.h
@@ -4,18 +4,31 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-typedef struct UidRange {
+#include "macro.h"
+
+typedef struct UidRangeEntry {
         uid_t start, nr;
+} UidRangeEntry;
+
+typedef struct UidRange {
+        UidRangeEntry *entries;
+        size_t n_entries;
 } UidRange;
 
-int uid_range_add(UidRange **p, size_t *n, uid_t start, uid_t nr);
-int uid_range_add_str(UidRange **p, size_t *n, const char *s);
+UidRange *uid_range_free(UidRange *range);
+DEFINE_TRIVIAL_CLEANUP_FUNC(UidRange*, uid_range_free);
+
+int uid_range_add_internal(UidRange **range, uid_t start, uid_t nr, bool coalesce);
+static inline int uid_range_add(UidRange **range, uid_t start, uid_t nr) {
+        return uid_range_add_internal(range, start, nr, true);
+}
+int uid_range_add_str(UidRange **range, const char *s);
 
-int uid_range_next_lower(const UidRange *p, size_t n, uid_t *uid);
-bool uid_range_covers(const UidRange *p, size_t n, uid_t start, uid_t nr);
+int uid_range_next_lower(const UidRange *range, uid_t *uid);
 
-static inline bool uid_range_contains(const UidRange *p, size_t n, uid_t uid) {
-        return uid_range_covers(p, n, uid, 1);
+bool uid_range_covers(const UidRange *range, uid_t start, uid_t nr);
+static inline bool uid_range_contains(const UidRange *range, uid_t uid) {
+        return uid_range_covers(range, uid, 1);
 }
 
-int uid_range_load_userns(UidRange **p, size_t *n, const char *path);
+int uid_range_load_userns(UidRange **ret, const char *path);

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index c59eb62555298e34f8681dff5b6d5654155c14aa..b53df11764418a42bfea3467bd97020de6a4d075 100644 (file)
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -2579,7 +2579,6 @@ static int bootctl_main(int argc, char *argv[]) {
 
 static int run(int argc, char *argv[]) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *unlink_dir = NULL;
         int r;
 
@@ -2603,8 +2602,7 @@ static int run(int argc, char *argv[]) {
                                 DISSECT_IMAGE_GENERIC_ROOT |
                                 DISSECT_IMAGE_RELAX_VAR_CHECK,
                                 &unlink_dir,
-                                &loop_device,
-                                &decrypted_image);
+                                &loop_device);
                 if (r < 0)
                         return r;
 

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index a7ef57cb99f621786f61ecb5232af57490ad412e..fdbc55b884fdfbf98f0c66c2176dfded810d4215 100644 (file)
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -2415,7 +2415,7 @@ static EFI_STATUS image_start(
         if (err == EFI_UNSUPPORTED && entry->type == LOADER_LINUX) {
                 uint32_t kernel_entry_address;
 
-                err = pe_alignment_info(loaded_image->ImageBase, &kernel_entry_address, NULL, NULL);
+                err = pe_kernel_info(loaded_image->ImageBase, &kernel_entry_address, NULL, NULL);
                 if (err != EFI_SUCCESS) {
                         if (err != EFI_UNSUPPORTED)
                                 return log_error_status_stall(err, L"Error finding kernel compat entry address: %r", err);

diff --git a/src/boot/efi/efi-string.c b/src/boot/efi/efi-string.c
index dfb2b06a75924609807c16f1c32e39f59259a6d3..6929e8667efedc0c0c7a1b1bcd506279898953d8 100644 (file)
--- a/src/boot/efi/efi-string.c
+++ b/src/boot/efi/efi-string.c
@@ -128,7 +128,8 @@ DEFINE_STRCHR(char16_t, strchr16);
                 size_t size = len * sizeof(type);         \
                                                           \
                 type *dup = xmalloc(size + sizeof(type)); \
-                efi_memcpy(dup, s, size);                 \
+                if (size > 0)                             \
+                        memcpy(dup, s, size);             \
                 dup[len] = '\0';                          \
                                                           \
                 return dup;                               \
@@ -271,7 +272,19 @@ bool efi_fnmatch(const char16_t *pattern, const char16_t *haystack) {
 DEFINE_PARSE_NUMBER(char, parse_number8);
 DEFINE_PARSE_NUMBER(char16_t, parse_number16);
 
-int efi_memcmp(const void *p1, const void *p2, size_t n) {
+#ifdef SD_BOOT
+/* To provide the actual implementation for these we need to remove the redirection to the builtins. */
+#  undef memcmp
+#  undef memcpy
+#  undef memset
+#else
+/* And for userpsace unit testing we need to give them an efi_ prefix. */
+#  define memcmp efi_memcmp
+#  define memcpy efi_memcpy
+#  define memset efi_memset
+#endif
+
+_used_ int memcmp(const void *p1, const void *p2, size_t n) {
         const uint8_t *up1 = p1, *up2 = p2;
         int r;
 
@@ -291,7 +304,7 @@ int efi_memcmp(const void *p1, const void *p2, size_t n) {
         return 0;
 }
 
-void *efi_memcpy(void * restrict dest, const void * restrict src, size_t n) {
+_used_ _weak_ void *memcpy(void * restrict dest, const void * restrict src, size_t n) {
         if (!dest || !src || n == 0)
                 return dest;
 
@@ -318,7 +331,7 @@ void *efi_memcpy(void * restrict dest, const void * restrict src, size_t n) {
         return dest;
 }
 
-void *efi_memset(void *p, int c, size_t n) {
+_used_ _weak_ void *memset(void *p, int c, size_t n) {
         if (!p || n == 0)
                 return p;
 
@@ -339,16 +352,3 @@ void *efi_memset(void *p, int c, size_t n) {
 
         return p;
 }
-
-#ifdef SD_BOOT
-#  undef memcmp
-#  undef memcpy
-#  undef memset
-/* Provide the actual implementation for the builtins by providing aliases. These need to be marked as used,
- * as otherwise the compiler might remove them but still emit calls, which would break when linking.
- * To prevent a different linker error, we mark memcpy/memset as weak, because gnu-efi is currently
- * providing them. */
-__attribute__((used, alias("efi_memcmp"))) int memcmp(const void *p1, const void *p2, size_t n);
-__attribute__((used, weak, alias("efi_memcpy"))) void *memcpy(void * restrict dest, const void * restrict src, size_t n);
-__attribute__((used, weak, alias("efi_memset"))) void *memset(void *p, int c, size_t n);
-#endif

diff --git a/src/boot/efi/efi-string.h b/src/boot/efi/efi-string.h
index 57899c978bf7a1e2a54c225696629ea5cb6b4bf3..1ebd5fd6b7d42b3c0821af465f085706b483f070 100644 (file)
--- a/src/boot/efi/efi-string.h
+++ b/src/boot/efi/efi-string.h
@@ -119,9 +119,9 @@ static inline void *mempcpy(void * restrict dest, const void * restrict src, siz
         memcpy(dest, src, n);
         return (uint8_t *) dest + n;
 }
-#endif
-
-/* The actual implementations of builtins with efi_ prefix so we can unit test them. */
+#else
+/* For unit testing. */
 int efi_memcmp(const void *p1, const void *p2, size_t n);
 void *efi_memcpy(void * restrict dest, const void * restrict src, size_t n);
 void *efi_memset(void *p, int c, size_t n);
+#endif

diff --git a/src/boot/efi/linux.c b/src/boot/efi/linux.c
index 3cbffdbbeb59489e9fbea477415527e8b6b90f76..7771058c3a2e4c375687dbd3403a8652021ddd4a 100644 (file)
--- a/src/boot/efi/linux.c
+++ b/src/boot/efi/linux.c
@@ -92,18 +92,6 @@ static inline void cleanup_loaded_image(EFI_HANDLE *loaded_image_handle) {
         *loaded_image_handle = NULL;
 }
 
-/* struct to call cleanup_pages */
-struct pages {
-        EFI_PHYSICAL_ADDRESS addr;
-        UINTN num;
-};
-
-static inline void cleanup_pages(struct pages *p) {
-        if (p->addr == 0)
-                return;
-        (void) BS->FreePages(p->addr, p->num);
-}
-
 EFI_STATUS linux_exec(
                 EFI_HANDLE image,
                 const char *cmdline, UINTN cmdline_len,
@@ -114,7 +102,6 @@ EFI_STATUS linux_exec(
         _cleanup_(cleanup_loaded_image) EFI_HANDLE loaded_image_handle = NULL;
         uint32_t kernel_alignment, kernel_size_of_image, kernel_entry_address;
         EFI_IMAGE_ENTRY_POINT kernel_entry;
-        _cleanup_(cleanup_pages) struct pages kernel = {};
         void *new_buffer;
         EFI_STATUS err;
 
@@ -124,7 +111,20 @@ EFI_STATUS linux_exec(
         assert(initrd_buffer || initrd_length == 0);
 
         /* get the necessary fields from the PE header */
-        err = pe_alignment_info(linux_buffer, &kernel_entry_address, &kernel_size_of_image, &kernel_alignment);
+        err = pe_kernel_info(linux_buffer, &kernel_entry_address, &kernel_size_of_image, &kernel_alignment);
+#if defined(__i386__) || defined(__x86_64__)
+        if (err == EFI_UNSUPPORTED)
+                /* Kernel is too old to support LINUX_INITRD_MEDIA_GUID, try the deprecated EFI handover
+                 * protocol. */
+                return linux_exec_efi_handover(
+                                image,
+                                cmdline,
+                                cmdline_len,
+                                linux_buffer,
+                                linux_length,
+                                initrd_buffer,
+                                initrd_length);
+#endif
         if (err != EFI_SUCCESS)
                 return err;
         /* sanity check */
@@ -140,11 +140,15 @@ EFI_STATUS linux_exec(
            if they are not met. x86 and x86_64 kernel stubs don't do checks and fail if the BSS section is too small.
         */
         /* allocate SizeOfImage + SectionAlignment because the new_buffer can move up to Alignment-1 bytes */
-        kernel.num = EFI_SIZE_TO_PAGES(ALIGN_TO(kernel_size_of_image, kernel_alignment) + kernel_alignment);
-        err = BS->AllocatePages(AllocateAnyPages, EfiLoaderCode, kernel.num, &kernel.addr);
-        if (err != EFI_SUCCESS)
-                return EFI_OUT_OF_RESOURCES;
+        _cleanup_pages_ Pages kernel = xmalloc_pages(
+                        AllocateAnyPages,
+                        EfiLoaderCode,
+                        EFI_SIZE_TO_PAGES(ALIGN_TO(kernel_size_of_image, kernel_alignment) + kernel_alignment),
+                        0);
         new_buffer = PHYSICAL_ADDRESS_TO_POINTER(ALIGN_TO(kernel.addr, kernel_alignment));
+        if (!new_buffer) /* Silence gcc 11.2.0, assert(new_buffer) doesn't work. */
+                return EFI_OUT_OF_RESOURCES;
+
         memcpy(new_buffer, linux_buffer, linux_length);
         /* zero out rest of memory (probably not needed, but BSS section should be 0) */
         memset((uint8_t *)new_buffer + linux_length, 0, kernel_size_of_image - linux_length);

diff --git a/src/boot/efi/linux.h b/src/boot/efi/linux.h
index 0dfe7446680326a217970e9fdb382096e7eef558..eab617e579877b46881f177d3eb8969bd652b839 100644 (file)
--- a/src/boot/efi/linux.h
+++ b/src/boot/efi/linux.h
@@ -8,3 +8,8 @@ EFI_STATUS linux_exec(
                 const char *cmdline, UINTN cmdline_len,
                 const void *linux_buffer, UINTN linux_length,
                 const void *initrd_buffer, UINTN initrd_length);
+EFI_STATUS linux_exec_efi_handover(
+                EFI_HANDLE image,
+                const char *cmdline, UINTN cmdline_len,
+                const void *linux_buffer, UINTN linux_length,
+                const void *initrd_buffer, UINTN initrd_length);

diff --git a/src/boot/efi/linux_x86.c b/src/boot/efi/linux_x86.c
index d506070926c10ceb7fcfcfbe46f85fefeaf111cd..83bd7b2c3193f75fb22925c5151382508fa41d8b 100644 (file)
--- a/src/boot/efi/linux_x86.c
+++ b/src/boot/efi/linux_x86.c
@@ -18,9 +18,27 @@
 #include "macro-fundamental.h"
 #include "util.h"
 
-#define SETUP_MAGIC             0x53726448      /* "HdrS" */
+#define KERNEL_SECTOR_SIZE 512u
+#define BOOT_FLAG_MAGIC    0xAA55u
+#define SETUP_MAGIC        0x53726448u /* "HdrS" */
+#define SETUP_VERSION_2_11 0x20bu
+#define SETUP_VERSION_2_12 0x20cu
+#define SETUP_VERSION_2_15 0x20fu
+#define CMDLINE_PTR_MAX    0xA0000u
+
+enum {
+        XLF_KERNEL_64              = 1 << 0,
+        XLF_CAN_BE_LOADED_ABOVE_4G = 1 << 1,
+        XLF_EFI_HANDOVER_32        = 1 << 2,
+        XLF_EFI_HANDOVER_64        = 1 << 3,
+#ifdef __x86_64__
+        XLF_EFI_HANDOVER           = XLF_EFI_HANDOVER_64,
+#else
+        XLF_EFI_HANDOVER           = XLF_EFI_HANDOVER_32,
+#endif
+};
 
-struct setup_header {
+typedef struct {
         uint8_t  setup_sects;
         uint16_t root_flags;
         uint32_t syssize;
@@ -28,7 +46,8 @@ struct setup_header {
         uint16_t vid_mode;
         uint16_t root_dev;
         uint16_t boot_flag;
-        uint16_t jump;
+        uint8_t  jump; /* We split the 2-byte jump field from the spec in two for convenience. */
+        uint8_t  setup_size;
         uint32_t header;
         uint16_t version;
         uint32_t realmode_swtch;
@@ -59,143 +78,127 @@ struct setup_header {
         uint64_t pref_address;
         uint32_t init_size;
         uint32_t handover_offset;
-} _packed_;
-
-/* adapted from linux' bootparam.h */
-struct boot_params {
-        uint8_t  screen_info[64];         // was: struct screen_info
-        uint8_t  apm_bios_info[20];       // was: struct apm_bios_info
-        uint8_t  _pad2[4];
-        uint64_t tboot_addr;
-        uint8_t  ist_info[16];            // was: struct ist_info
-        uint8_t  _pad3[16];
-        uint8_t  hd0_info[16];
-        uint8_t  hd1_info[16];
-        uint8_t  sys_desc_table[16];      // was: struct sys_desc_table
-        uint8_t  olpc_ofw_header[16];     // was: struct olpc_ofw_header
+} _packed_ SetupHeader;
+
+/* We really only care about a few fields, but we still have to provide a full page otherwise. */
+typedef struct {
+        uint8_t pad[192];
         uint32_t ext_ramdisk_image;
         uint32_t ext_ramdisk_size;
         uint32_t ext_cmd_line_ptr;
-        uint8_t  _pad4[116];
-        uint8_t  edid_info[128];          // was: struct edid_info
-        uint8_t  efi_info[32];            // was: struct efi_info
-        uint32_t alt_mem_k;
-        uint32_t scratch;
-        uint8_t  e820_entries;
-        uint8_t  eddbuf_entries;
-        uint8_t  edd_mbr_sig_buf_entries;
-        uint8_t  kbd_status;
-        uint8_t  secure_boot;
-        uint8_t  _pad5[2];
-        uint8_t  sentinel;
-        uint8_t  _pad6[1];
-        struct setup_header hdr;
-        uint8_t  _pad7[0x290-0x1f1-sizeof(struct setup_header)];
-        uint32_t edd_mbr_sig_buffer[16];  // was: edd_mbr_sig_buffer[EDD_MBR_SIG_MAX]
-        uint8_t  e820_table[20*128];      // was: struct boot_e820_entry e820_table[E820_MAX_ENTRIES_ZEROPAGE]
-        uint8_t  _pad8[48];
-        uint8_t  eddbuf[6*82];            // was: struct edd_info eddbuf[EDDMAXNR]
-        uint8_t  _pad9[276];
-} _packed_;
+        uint8_t pad2[293];
+        SetupHeader hdr;
+        uint8_t pad3[3480];
+} _packed_ BootParams;
+assert_cc(offsetof(BootParams, ext_ramdisk_image) == 0x0C0);
+assert_cc(sizeof(BootParams) == 4096);
 
 #ifdef __i386__
-#define __regparm0__ __attribute__((regparm(0)))
+#  define __regparm0__ __attribute__((regparm(0)))
 #else
-#define __regparm0__
+#  define __regparm0__
 #endif
 
-typedef void(*handover_f)(void *image, EFI_SYSTEM_TABLE *table, struct boot_params *params) __regparm0__;
-
-static void linux_efi_handover(EFI_HANDLE image, struct boot_params *params) {
-        handover_f handover;
-        UINTN start = (UINTN)params->hdr.code32_start;
+typedef void (*handover_f)(void *image, EFI_SYSTEM_TABLE *table, BootParams *params) __regparm0__
+                __attribute__((sysv_abi));
 
+static void linux_efi_handover(EFI_HANDLE image, uintptr_t kernel, BootParams *params) {
         assert(params);
 
+        kernel += (params->hdr.setup_sects + 1) * KERNEL_SECTOR_SIZE; /* 32bit entry address. */
+
 #ifdef __x86_64__
-        asm volatile ("cli");
-        start += 512;
+        kernel += KERNEL_SECTOR_SIZE; /* 64bit entry address. */
 #endif
-        handover = (handover_f)(start + params->hdr.handover_offset);
+
+        kernel += params->hdr.handover_offset; /* 32/64bit EFI handover address. */
+
+        /* Note in EFI mixed mode this now points to the correct 32bit handover entry point, allowing a 64bit
+         * kernel to be booted from a 32bit sd-stub. */
+
+        handover_f handover = (handover_f) kernel;
         handover(image, ST, params);
 }
 
-EFI_STATUS linux_exec(
+EFI_STATUS linux_exec_efi_handover(
                 EFI_HANDLE image,
                 const char *cmdline, UINTN cmdline_len,
                 const void *linux_buffer, UINTN linux_length,
                 const void *initrd_buffer, UINTN initrd_length) {
 
-        const struct boot_params *image_params;
-        struct boot_params *boot_params;
-        EFI_HANDLE initrd_handle = NULL;
-        EFI_PHYSICAL_ADDRESS addr;
-        uint8_t setup_sectors;
-        EFI_STATUS err;
-
         assert(image);
         assert(cmdline || cmdline_len == 0);
         assert(linux_buffer);
         assert(initrd_buffer || initrd_length == 0);
 
-        if (linux_length < sizeof(struct boot_params))
+        if (linux_length < sizeof(BootParams))
                 return EFI_LOAD_ERROR;
 
-        image_params = (const struct boot_params *) linux_buffer;
+        const BootParams *image_params = (const BootParams *) linux_buffer;
+        if (image_params->hdr.header != SETUP_MAGIC || image_params->hdr.boot_flag != BOOT_FLAG_MAGIC)
+                return log_error_status_stall(EFI_UNSUPPORTED, u"Unsupported kernel image.");
+        if (image_params->hdr.version < SETUP_VERSION_2_11)
+                return log_error_status_stall(EFI_UNSUPPORTED, u"Kernel too old.");
+        if (!image_params->hdr.relocatable_kernel)
+                return log_error_status_stall(EFI_UNSUPPORTED, u"Kernel is not relocatable.");
+
+        /* The xloadflags were added in version 2.12+ of the boot protocol but the handover support predates
+         * that, so we cannot safety-check this for 2.11. */
+        if (image_params->hdr.version >= SETUP_VERSION_2_12 &&
+            !FLAGS_SET(image_params->hdr.xloadflags, XLF_EFI_HANDOVER))
+                return log_error_status_stall(EFI_UNSUPPORTED, u"Kernel does not support EFI handover protocol.");
+
+        bool can_4g = image_params->hdr.version >= SETUP_VERSION_2_12 &&
+                        FLAGS_SET(image_params->hdr.xloadflags, XLF_CAN_BE_LOADED_ABOVE_4G);
+
+        if (!can_4g && POINTER_TO_PHYSICAL_ADDRESS(linux_buffer) + linux_length > UINT32_MAX)
+                return log_error_status_stall(
+                                EFI_UNSUPPORTED,
+                                u"Unified kernel image was loaded above 4G, but kernel lacks support.");
+        if (!can_4g && POINTER_TO_PHYSICAL_ADDRESS(initrd_buffer) + initrd_length > UINT32_MAX)
+                return log_error_status_stall(
+                                EFI_UNSUPPORTED, u"Initrd is above 4G, but kernel lacks support.");
+
+        _cleanup_pages_ Pages boot_params_page = xmalloc_pages(
+                        can_4g ? AllocateAnyPages : AllocateMaxAddress,
+                        EfiLoaderData,
+                        EFI_SIZE_TO_PAGES(sizeof(BootParams)),
+                        UINT32_MAX /* Below the 4G boundary */);
+        BootParams *boot_params = PHYSICAL_ADDRESS_TO_POINTER(boot_params_page.addr);
+        *boot_params = (BootParams){};
 
-        if (image_params->hdr.boot_flag != 0xAA55 ||
-            image_params->hdr.header != SETUP_MAGIC ||
-            image_params->hdr.version < 0x20b ||
-            !image_params->hdr.relocatable_kernel)
-                return EFI_LOAD_ERROR;
+        /* Setup size is determined by offset 0x0202 + byte value at offset 0x0201, which is the same as
+         * offset of the header field and the target from the jump field (which we split for this reason). */
+        memcpy(&boot_params->hdr,
+               &image_params->hdr,
+               offsetof(SetupHeader, header) + image_params->hdr.setup_size);
 
-        addr = UINT32_MAX; /* Below the 32bit boundary */
-        err = BS->AllocatePages(
-                        AllocateMaxAddress,
-                        EfiLoaderData,
-                        EFI_SIZE_TO_PAGES(0x4000),
-                        &addr);
-        if (err != EFI_SUCCESS)
-                return err;
-
-        boot_params = (struct boot_params *) PHYSICAL_ADDRESS_TO_POINTER(addr);
-        memset(boot_params, 0, 0x4000);
-        boot_params->hdr = image_params->hdr;
         boot_params->hdr.type_of_loader = 0xff;
-        setup_sectors = image_params->hdr.setup_sects > 0 ? image_params->hdr.setup_sects : 4;
-        boot_params->hdr.code32_start = (uint32_t) POINTER_TO_PHYSICAL_ADDRESS(linux_buffer) + (setup_sectors + 1) * 512;
 
-        if (cmdline) {
-                addr = 0xA0000;
+        /* Spec says: For backwards compatibility, if the setup_sects field contains 0, the real value is 4. */
+        if (boot_params->hdr.setup_sects == 0)
+                boot_params->hdr.setup_sects = 4;
 
-                err = BS->AllocatePages(
-                                AllocateMaxAddress,
+        _cleanup_pages_ Pages cmdline_pages = {};
+        if (cmdline) {
+                cmdline_pages = xmalloc_pages(
+                                can_4g ? AllocateAnyPages : AllocateMaxAddress,
                                 EfiLoaderData,
                                 EFI_SIZE_TO_PAGES(cmdline_len + 1),
-                                &addr);
-                if (err != EFI_SUCCESS)
-                        return err;
+                                CMDLINE_PTR_MAX);
 
-                memcpy(PHYSICAL_ADDRESS_TO_POINTER(addr), cmdline, cmdline_len);
-                ((char *) PHYSICAL_ADDRESS_TO_POINTER(addr))[cmdline_len] = 0;
-                boot_params->hdr.cmd_line_ptr = (uint32_t) addr;
+                memcpy(PHYSICAL_ADDRESS_TO_POINTER(cmdline_pages.addr), cmdline, cmdline_len);
+                ((char *) PHYSICAL_ADDRESS_TO_POINTER(cmdline_pages.addr))[cmdline_len] = 0;
+                boot_params->hdr.cmd_line_ptr = (uint32_t) cmdline_pages.addr;
+                boot_params->ext_cmd_line_ptr = cmdline_pages.addr >> 32;
+                assert(can_4g || cmdline_pages.addr <= CMDLINE_PTR_MAX);
         }
 
-        /* Providing the initrd via LINUX_INITRD_MEDIA_GUID is only supported by Linux 5.8+ (5.7+ on ARM64).
-           Until supported kernels become more established, we continue to set ramdisk in the handover struct.
-           This value is overridden by kernels that support LINUX_INITRD_MEDIA_GUID.
-           If you need to know which protocol was used by the kernel, pass "efi=debug" to the kernel,
-           this will print a line when InitrdMediaGuid was successfully used to load the initrd.
-         */
-        boot_params->hdr.ramdisk_image = (uint32_t) POINTER_TO_PHYSICAL_ADDRESS(initrd_buffer);
-        boot_params->hdr.ramdisk_size = (uint32_t) initrd_length;
-
-        /* register LINUX_INITRD_MEDIA_GUID */
-        err = initrd_register(initrd_buffer, initrd_length, &initrd_handle);
-        if (err != EFI_SUCCESS)
-                return err;
-        linux_efi_handover(image, boot_params);
-        (void) initrd_unregister(initrd_handle);
-        initrd_handle = NULL;
+        boot_params->hdr.ramdisk_image = (uintptr_t) initrd_buffer;
+        boot_params->ext_ramdisk_image = POINTER_TO_PHYSICAL_ADDRESS(initrd_buffer) >> 32;
+        boot_params->hdr.ramdisk_size = initrd_length;
+        boot_params->ext_ramdisk_size = ((uint64_t) initrd_length) >> 32;
+
+        linux_efi_handover(image, (uintptr_t) linux_buffer, boot_params);
         return EFI_LOAD_ERROR;
 }

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index efe056c225a507b1d5cf8a3011c87e030dd9fe9f..b149735246e883c53a6162534061617db5835613 100644 (file)
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -392,14 +392,13 @@ systemd_boot_sources = files(
 
 stub_sources = files(
         'cpio.c',
+        'linux.c',
         'splash.c',
         'stub.c',
 )
 
 if efi_arch[1] in ['ia32', 'x86_64']
         stub_sources += files('linux_x86.c')
-else
-        stub_sources += files('linux.c')
 endif
 
 tests += [

diff --git a/src/boot/efi/pe.c b/src/boot/efi/pe.c
index 8d7061d55b21e92b1860a8e1a2794658f7430411..4602827f198dbc655e9d235c03c506916adca3ff 100644 (file)
--- a/src/boot/efi/pe.c
+++ b/src/boot/efi/pe.c
@@ -209,7 +209,7 @@ static uint32_t get_compatibility_entry_address(const DosFileHeader *dos, const
         return 0;
 }
 
-EFI_STATUS pe_alignment_info(
+EFI_STATUS pe_kernel_info(
                 const void *base,
                 uint32_t *ret_entry_point_address,
                 uint32_t *ret_size_of_image,
@@ -229,6 +229,10 @@ EFI_STATUS pe_alignment_info(
         if (!verify_pe(pe, /* allow_compatibility= */ true))
                 return EFI_LOAD_ERROR;
 
+        /* Support for LINUX_INITRD_MEDIA_GUID was added in kernel stub 1.0. */
+        if (pe->OptionalHeader.MajorImageVersion < 1)
+                return EFI_UNSUPPORTED;
+
         uint32_t entry_address = pe->OptionalHeader.AddressOfEntryPoint;
 
         /* Look for a compat entry point. */

diff --git a/src/boot/efi/pe.h b/src/boot/efi/pe.h
index ea4801ced5963c65035403de2becfb53d48426a1..ead2ba01ccf61e1ce6c38e91f1de453936cbfbff 100644 (file)
--- a/src/boot/efi/pe.h
+++ b/src/boot/efi/pe.h
@@ -17,7 +17,7 @@ EFI_STATUS pe_file_locate_sections(
                 UINTN *offsets,
                 UINTN *sizes);
 
-EFI_STATUS pe_alignment_info(
+EFI_STATUS pe_kernel_info(
                 const void *base,
                 uint32_t *ret_entry_point_address,
                 uint32_t *ret_size_of_image,

diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
index 494972fa38c551ce7e000dc0e61ae2755e27c528..c2321aa0eb55836726ef019a80f5c8b637e4f082 100644 (file)
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@ -21,14 +21,11 @@ _used_ _section_(".sdmagic") static const char magic[] = "#### LoaderInfo: syste
 static EFI_STATUS combine_initrd(
                 EFI_PHYSICAL_ADDRESS initrd_base, UINTN initrd_size,
                 const void * const extra_initrds[], const size_t extra_initrd_sizes[], size_t n_extra_initrds,
-                EFI_PHYSICAL_ADDRESS *ret_initrd_base, UINTN *ret_initrd_size) {
+                Pages *ret_initr_pages, UINTN *ret_initrd_size) {
 
-        EFI_PHYSICAL_ADDRESS base = UINT32_MAX; /* allocate an area below the 32bit boundary for this */
-        EFI_STATUS err;
-        uint8_t *p;
         UINTN n;
 
-        assert(ret_initrd_base);
+        assert(ret_initr_pages);
         assert(ret_initrd_size);
 
         /* Combines four initrds into one, by simple concatenation in memory */
@@ -45,15 +42,12 @@ static EFI_STATUS combine_initrd(
                 n += extra_initrd_sizes[i];
         }
 
-        err = BS->AllocatePages(
+        _cleanup_pages_ Pages pages = xmalloc_pages(
                         AllocateMaxAddress,
                         EfiLoaderData,
                         EFI_SIZE_TO_PAGES(n),
-                        &base);
-        if (err != EFI_SUCCESS)
-                return log_error_status_stall(err, L"Failed to allocate space for combined initrd: %r", err);
-
-        p = PHYSICAL_ADDRESS_TO_POINTER(base);
+                        UINT32_MAX /* Below 4G boundary. */);
+        uint8_t *p = PHYSICAL_ADDRESS_TO_POINTER(pages.addr);
         if (initrd_base != 0) {
                 UINTN pad;
 
@@ -75,10 +69,11 @@ static EFI_STATUS combine_initrd(
                 p = mempcpy(p, extra_initrds[i], extra_initrd_sizes[i]);
         }
 
-        assert((uint8_t*) PHYSICAL_ADDRESS_TO_POINTER(base) + n == p);
+        assert(PHYSICAL_ADDRESS_TO_POINTER(pages.addr + n) == p);
 
-        *ret_initrd_base = base;
+        *ret_initr_pages = pages;
         *ret_initrd_size = n;
+        pages.n_pages = 0;
 
         return EFI_SUCCESS;
 }
@@ -342,7 +337,8 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
         dt_size = szs[UNIFIED_SECTION_DTB];
         dt_base = dt_size != 0 ? POINTER_TO_PHYSICAL_ADDRESS(loaded_image->ImageBase) + addrs[UNIFIED_SECTION_DTB] : 0;
 
-        if (credential_initrd || global_credential_initrd || sysext_initrd) {
+        _cleanup_pages_ Pages initrd_pages = {};
+        if (credential_initrd || global_credential_initrd || sysext_initrd || pcrsig_initrd || pcrpkey_initrd) {
                 /* If we have generated initrds dynamically, let's combine them with the built-in initrd. */
                 err = combine_initrd(
                                 initrd_base, initrd_size,
@@ -361,10 +357,12 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
                                         pcrpkey_initrd_size,
                                 },
                                 5,
-                                &initrd_base, &initrd_size);
+                                &initrd_pages, &initrd_size);
                 if (err != EFI_SUCCESS)
                         return err;
 
+                initrd_base = initrd_pages.addr;
+
                 /* Given these might be large let's free them explicitly, quickly. */
                 credential_initrd = mfree(credential_initrd);
                 global_credential_initrd = mfree(global_credential_initrd);

diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
index afbc217d5357d3b9e64725fee1c7a7bdd2ee4de6..be79b205a42264956ea88155958345660813f9ca 100644 (file)
--- a/src/boot/efi/util.h
+++ b/src/boot/efi/util.h
@@ -60,7 +60,9 @@ static inline void *xmalloc_multiply(size_t size, size_t n) {
 _malloc_ _alloc_(3) _returns_nonnull_ _warn_unused_result_
 static inline void *xrealloc(void *p, size_t old_size, size_t new_size) {
         void *r = xmalloc(new_size);
-        efi_memcpy(r, p, MIN(old_size, new_size));
+        new_size = MIN(old_size, new_size);
+        if (new_size > 0)
+                memcpy(r, p, new_size);
         free(p);
         return r;
 }
@@ -68,6 +70,32 @@ static inline void *xrealloc(void *p, size_t old_size, size_t new_size) {
 #define xpool_print(fmt, ...) ((char16_t *) ASSERT_SE_PTR(PoolPrint((fmt), ##__VA_ARGS__)))
 #define xnew(type, n) ((type *) xmalloc_multiply(sizeof(type), (n)))
 
+typedef struct {
+        EFI_PHYSICAL_ADDRESS addr;
+        size_t n_pages;
+} Pages;
+
+static inline void cleanup_pages(Pages *p) {
+        if (p->n_pages == 0)
+                return;
+#ifdef EFI_DEBUG
+        assert_se(BS->FreePages(p->addr, p->n_pages) == EFI_SUCCESS);
+#else
+        (void) BS->FreePages(p->addr, p->n_pages);
+#endif
+}
+
+#define _cleanup_pages_ _cleanup_(cleanup_pages)
+
+static inline Pages xmalloc_pages(
+                EFI_ALLOCATE_TYPE type, EFI_MEMORY_TYPE memory_type, size_t n_pages, EFI_PHYSICAL_ADDRESS addr) {
+        assert_se(BS->AllocatePages(type, memory_type, n_pages, &addr) == EFI_SUCCESS);
+        return (Pages) {
+                .addr = addr,
+                .n_pages = n_pages,
+        };
+}
+
 EFI_STATUS parse_boolean(const char *v, bool *b);
 
 EFI_STATUS efivar_set(const EFI_GUID *vendor, const char16_t *name, const char16_t *value, uint32_t flags);

diff --git a/src/boot/measure.c b/src/boot/measure.c
index bc8f720514bed15d5d21c2e328245a48d09a388a..eee076075cbba04671fd5d9cb9b0e218e3a5d018 100644 (file)
--- a/src/boot/measure.c
+++ b/src/boot/measure.c
@@ -311,7 +311,7 @@ static int pcr_state_extend(PcrState *pcr_state, const void *data, size_t sz) {
 
 #define BUFFER_SIZE (16U * 1024U)
 
-static int measure_pcr(PcrState *pcr_states, size_t n) {
+static int measure_kernel(PcrState *pcr_states, size_t n) {
         _cleanup_free_ void *buffer = NULL;
         int r;
 
@@ -415,7 +415,7 @@ static int measure_pcr(PcrState *pcr_states, size_t n) {
                         if (r < 0)
                                 return r;
 
-                        /* Retrieve hash of data an measure it*/
+                        /* Retrieve hash of data and measure it */
                         if (EVP_DigestFinal_ex(mdctx[i], data_hash, &data_hash_size) != 1)
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to finalize hash context.");
 
@@ -486,7 +486,7 @@ static int verb_calculate(int argc, char *argv[], void *userdata) {
 
         n = (size_t) r;
 
-        r = measure_pcr(pcr_states, n);
+        r = measure_kernel(pcr_states, n);
         if (r < 0)
                 return r;
 
@@ -531,22 +531,6 @@ static int verb_calculate(int argc, char *argv[], void *userdata) {
         return 0;
 }
 
-static TPM2_ALG_ID convert_evp_md_name_to_tpm2_alg(const EVP_MD *md) {
-        const char *mdname;
-
-        mdname = EVP_MD_name(md);
-        if (strcaseeq(mdname, "sha1"))
-                return TPM2_ALG_SHA1;
-        if (strcaseeq(mdname, "sha256"))
-                return TPM2_ALG_SHA256;
-        if (strcaseeq(mdname, "sha384"))
-                return TPM2_ALG_SHA384;
-        if (strcaseeq(mdname, "sha512"))
-                return TPM2_ALG_SHA512;
-
-        return TPM2_ALG_ERROR;
-}
-
 static int verb_sign(int argc, char *argv[], void *userdata) {
         _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
         _cleanup_(pcr_state_free_all) PcrState *pcr_states = NULL;
@@ -591,7 +575,7 @@ static int verb_sign(int argc, char *argv[], void *userdata) {
 
         n = (size_t) r;
 
-        r = measure_pcr(pcr_states, n);
+        r = measure_kernel(pcr_states, n);
         if (r < 0)
                 return r;
 
@@ -637,9 +621,9 @@ static int verb_sign(int argc, char *argv[], void *userdata) {
                 assert(sizeof(intermediate_digest.buffer) >= SHA256_DIGEST_SIZE);
                 sha256_direct(p->value, p->value_size, intermediate_digest.buffer);
 
-                TPM2_ALG_ID tpmalg = convert_evp_md_name_to_tpm2_alg(p->md);
-                if (tpmalg == TPM2_ALG_ERROR) {
-                        r = log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Unsupported PCR bank");
+                int tpmalg = tpm2_pcr_bank_from_string(EVP_MD_name(p->md));
+                if (tpmalg < 0) {
+                        log_error_errno(tpmalg, "Unsupported PCR bank");
                         goto finish;
                 }
 

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 3486bab84bab0e27f0f26a4e63f203b5ebd469ab..473c0bc5abbc8ac68c4b35949a9948c5481a970e 100644 (file)
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -62,8 +62,6 @@ static BUS_DEFINE_PROPERTY_GET_REF(property_get_hashmap_size, "u", Hashmap *, ha
 static BUS_DEFINE_PROPERTY_GET_REF(property_get_set_size, "u", Set *, set_size);
 static BUS_DEFINE_PROPERTY_GET(property_get_default_timeout_abort_usec, "t", Manager, manager_default_timeout_abort_usec);
 static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_watchdog_device, "s", watchdog_get_device());
-static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_watchdog_timeout, "t", watchdog_get_timeout());
-static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_watchdog_pretimeout, "t", watchdog_get_pretimeout());
 static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_watchdog_last_ping_realtime, "t", watchdog_get_last_ping(CLOCK_REALTIME));
 static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_watchdog_last_ping_monotonic, "t", watchdog_get_last_ping(CLOCK_MONOTONIC));
 
@@ -2725,6 +2723,9 @@ const sd_bus_vtable bus_manager_vtable[] = {
         SD_BUS_PROPERTY("UnitPath", "as", NULL, offsetof(Manager, lookup_paths.search_path), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("DefaultStandardOutput", "s", bus_property_get_exec_output, offsetof(Manager, default_std_output), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("DefaultStandardError", "s", bus_property_get_exec_output, offsetof(Manager, default_std_error), SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("WatchdogDevice", "s", property_get_watchdog_device, 0, SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("WatchdogLastPingTimestamp", "t", property_get_watchdog_last_ping_realtime, 0, 0),
+        SD_BUS_PROPERTY("WatchdogLastPingTimestampMonotonic", "t", property_get_watchdog_last_ping_monotonic, 0, 0),
         SD_BUS_WRITABLE_PROPERTY("RuntimeWatchdogUSec", "t", property_get_runtime_watchdog, property_set_runtime_watchdog, 0, 0),
         SD_BUS_WRITABLE_PROPERTY("RuntimeWatchdogPreUSec", "t", property_get_pretimeout_watchdog, property_set_pretimeout_watchdog, 0, 0),
         SD_BUS_WRITABLE_PROPERTY("RuntimeWatchdogPreGovernor", "s", property_get_pretimeout_watchdog_governor, property_set_pretimeout_watchdog_governor, 0, 0),
@@ -2788,11 +2789,6 @@ const sd_bus_vtable bus_manager_vtable[] = {
         SD_BUS_PROPERTY("DefaultOOMPolicy", "s", bus_property_get_oom_policy, offsetof(Manager, default_oom_policy), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("DefaultOOMScoreAdjust", "i", property_get_oom_score_adjust, 0, SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("CtrlAltDelBurstAction", "s", bus_property_get_emergency_action, offsetof(Manager, cad_burst_action), SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("WatchdogDevice", "s", property_get_watchdog_device, 0, SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("WatchdogTimeoutUsec", "t", property_get_watchdog_timeout, 0, SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("WatchdogPreTimeoutUsec", "t", property_get_watchdog_pretimeout, 0, SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("WatchdogLastPingTimestamp", "t", property_get_watchdog_last_ping_realtime, 0, SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("WatchdogLastPingTimestampMonotonic", "t", property_get_watchdog_last_ping_monotonic, 0, SD_BUS_VTABLE_PROPERTY_CONST),
 
         SD_BUS_METHOD_WITH_ARGS("GetUnit",
                                 SD_BUS_ARGS("s", name),

diff --git a/src/core/device.c b/src/core/device.c
index d6710262a99360f2ec31ebbaefdffe6eb1e4268b..b3cf77d50c601216748e74f27e11d0d8593783b5 100644 (file)
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -32,6 +32,27 @@ static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
 
 static int device_dispatch_io(sd_device_monitor *monitor, sd_device *dev, void *userdata);
 
+static int device_by_path(Manager *m, const char *path, Unit **ret) {
+        _cleanup_free_ char *e = NULL;
+        Unit *u;
+        int r;
+
+        assert(m);
+        assert(path);
+
+        r = unit_name_from_path(path, ".device", &e);
+        if (r < 0)
+                return r;
+
+        u = manager_get_unit(m, e);
+        if (!u)
+                return -ENOENT;
+
+        if (ret)
+                *ret = u;
+        return 0;
+}
+
 static void device_unset_sysfs(Device *d) {
         Hashmap *devices;
         Device *first;
@@ -214,9 +235,7 @@ static void device_update_found_by_sysfs(Manager *m, const char *sysfs, DeviceFo
 }
 
 static void device_update_found_by_name(Manager *m, const char *path, DeviceFound found, DeviceFound mask) {
-        _cleanup_free_ char *e = NULL;
         Unit *u;
-        int r;
 
         assert(m);
         assert(path);
@@ -224,12 +243,7 @@ static void device_update_found_by_name(Manager *m, const char *path, DeviceFoun
         if (mask == 0)
                 return;
 
-        r = unit_name_from_path(path, ".device", &e);
-        if (r < 0)
-                return (void) log_debug_errno(r, "Failed to generate unit name from device path, ignoring: %m");
-
-        u = manager_get_unit(m, e);
-        if (!u)
+        if (device_by_path(m, path, &u) < 0)
                 return;
 
         device_update_found_one(DEVICE(u), found, mask);
@@ -606,7 +620,7 @@ static void device_upgrade_mount_deps(Unit *u) {
         }
 }
 
-static int device_setup_unit(Manager *m, sd_device *dev, const char *path, bool main) {
+static int device_setup_unit(Manager *m, sd_device *dev, const char *path, bool main, Set **units) {
         _cleanup_(unit_freep) Unit *new_unit = NULL;
         _cleanup_free_ char *e = NULL;
         const char *sysfs = NULL;
@@ -683,6 +697,12 @@ static int device_setup_unit(Manager *m, sd_device *dev, const char *path, bool
         if (dev && device_is_bound_by_mounts(DEVICE(u), dev))
                 device_upgrade_mount_deps(u);
 
+        if (units) {
+                r = set_ensure_put(units, NULL, DEVICE(u));
+                if (r < 0)
+                        return log_unit_error_errno(u, r, "Failed to store unit: %m");
+        }
+
         TAKE_PTR(new_unit);
         return 0;
 }
@@ -692,6 +712,9 @@ static bool device_is_ready(sd_device *dev) {
 
         assert(dev);
 
+        if (device_for_action(dev, SD_DEVICE_REMOVE))
+                return false;
+
         r = device_is_renaming(dev);
         if (r < 0)
                 log_device_warning_errno(dev, r, "Failed to check if device is renaming, assuming device is not renaming: %m");
@@ -718,153 +741,176 @@ static bool device_is_ready(sd_device *dev) {
         return r != 0;
 }
 
-static int device_setup_devlink_unit_one(Manager *m, const char *devlink, sd_device **ret) {
+static int device_setup_devlink_unit_one(Manager *m, const char *devlink, Set **ready_units, Set **not_ready_units) {
         _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
-        int r;
+        Unit *u;
 
         assert(m);
         assert(devlink);
+        assert(ready_units);
+        assert(not_ready_units);
 
-        if (sd_device_new_from_devname(&dev, devlink) < 0 || !device_is_ready(dev)) {
-                /* the devlink is already removed or not ready */
-                device_update_found_by_name(m, devlink, 0, DEVICE_FOUND_UDEV);
-                *ret = NULL;
-                return 0; /* not ready */
-        }
+        if (sd_device_new_from_devname(&dev, devlink) >= 0 && device_is_ready(dev))
+                return device_setup_unit(m, dev, devlink, /* main = */ false, ready_units);
 
-        r = device_setup_unit(m, dev, devlink, /* main = */ false);
-        if (r < 0)
-                return log_device_warning_errno(dev, r, "Failed to setup unit for '%s': %m", devlink);
+        /* the devlink is already removed or not ready */
+        if (device_by_path(m, devlink, &u) < 0)
+                return 0; /* The corresponding .device unit not found. That's fine. */
 
-        *ret = TAKE_PTR(dev);
-        return 1; /* ready */
+        return set_ensure_put(not_ready_units, NULL, DEVICE(u));
 }
 
-static int device_setup_devlink_units(Manager *m, sd_device *dev, char ***ret_ready_devlinks) {
-        _cleanup_strv_free_ char **ready_devlinks = NULL;
-        const char *devlink, *syspath;
+static int device_setup_extra_units(Manager *m, sd_device *dev, Set **ready_units, Set **not_ready_units) {
+        _cleanup_strv_free_ char **aliases = NULL;
+        const char *devlink, *syspath, *devname = NULL;
+        Device *l;
         int r;
 
         assert(m);
         assert(dev);
-        assert(ret_ready_devlinks);
+        assert(ready_units);
+        assert(not_ready_units);
 
         r = sd_device_get_syspath(dev, &syspath);
         if (r < 0)
                 return r;
 
-        FOREACH_DEVICE_DEVLINK(dev, devlink) {
-                _cleanup_(sd_device_unrefp) sd_device *assigned = NULL;
-                const char *s;
+        (void) sd_device_get_devname(dev, &devname);
 
+        /* devlink units */
+        FOREACH_DEVICE_DEVLINK(dev, devlink) {
+                /* These are a kind of special devlink. They should be always unique, but neither persistent
+                 * nor predictable. Hence, let's refuse them. See also the comments for alias units below. */
                 if (PATH_STARTSWITH_SET(devlink, "/dev/block/", "/dev/char/"))
                         continue;
 
-                if (device_setup_devlink_unit_one(m, devlink, &assigned) <= 0)
-                        continue;
-
-                if (sd_device_get_syspath(assigned, &s) < 0)
-                        continue;
+                (void) device_setup_devlink_unit_one(m, devlink, ready_units, not_ready_units);
+        }
 
-                if (path_equal(s, syspath))
-                        continue;
+        if (device_is_ready(dev)) {
+                const char *s;
 
-                r = strv_extend(&ready_devlinks, devlink);
-                if (r < 0)
-                        return -ENOMEM;
+                r = sd_device_get_property_value(dev, "SYSTEMD_ALIAS", &s);
+                if (r < 0 && r != -ENOENT)
+                        log_device_warning_errno(dev, r, "Failed to get SYSTEMD_ALIAS property, ignoring: %m");
+                if (r >= 0) {
+                        r = strv_split_full(&aliases, s, NULL, EXTRACT_UNQUOTE);
+                        if (r < 0)
+                                log_device_warning_errno(dev, r, "Failed to parse SYSTEMD_ALIAS property, ignoring: %m");
+                }
         }
 
-        *ret_ready_devlinks = TAKE_PTR(ready_devlinks);
-        return 0;
-}
+        /* alias units */
+        STRV_FOREACH(alias, aliases) {
+                if (!path_is_absolute(*alias)) {
+                        log_device_warning(dev, "The alias \"%s\" specified in SYSTEMD_ALIAS is not an absolute path, ignoring.", *alias);
+                        continue;
+                }
 
-static int device_setup_devlink_units_on_remove(Manager *m, sd_device *dev, char ***ret_ready_devlinks) {
-        _cleanup_strv_free_ char **ready_devlinks = NULL;
-        const char *syspath;
-        Device *l;
-        int r;
+                if (!path_is_safe(*alias)) {
+                        log_device_warning(dev, "The alias \"%s\" specified in SYSTEMD_ALIAS is not safe, ignoring.", *alias);
+                        continue;
+                }
 
-        assert(m);
-        assert(dev);
-        assert(ret_ready_devlinks);
+                /* Note, even if the devlink is not persistent, LVM expects /dev/block/ symlink units exist.
+                 * To achieve that, they set the path to SYSTEMD_ALIAS. Hence, we cannot refuse aliases start
+                 * with /dev/, unfortunately. */
 
-        r = sd_device_get_syspath(dev, &syspath);
-        if (r < 0)
-                return r;
+                (void) device_setup_unit(m, dev, *alias, /* main = */ false, ready_units);
+        }
 
         l = hashmap_get(m->devices_by_sysfs, syspath);
         LIST_FOREACH(same_sysfs, d, l) {
-                _cleanup_(sd_device_unrefp) sd_device *assigned = NULL;
-                const char *s;
-
                 if (!d->path)
                         continue;
 
-                if (!path_startswith(d->path, "/dev/"))
-                        continue;
+                if (path_equal(d->path, syspath))
+                        continue; /* This is the main unit. */
 
-                if (device_setup_devlink_unit_one(m, d->path, &assigned) <= 0)
-                        continue;
+                if (devname && path_equal(d->path, devname))
+                        continue; /* This is the real device node. */
 
-                if (sd_device_get_syspath(assigned, &s) < 0)
-                        continue;
+                if (device_has_devlink(dev, d->path))
+                        continue; /* The devlink was already processed in the above loop. */
 
-                if (path_equal(s, syspath))
-                        continue;
+                if (strv_contains(aliases, d->path))
+                        continue; /* This is already processed in the above, and ready. */
 
-                r = strv_extend(&ready_devlinks, d->path);
-                if (r < 0)
-                        return -ENOMEM;
+                if (path_startswith(d->path, "/dev/"))
+                        /* This is a devlink unit. Check existence and update syspath. */
+                        (void) device_setup_devlink_unit_one(m, d->path, ready_units, not_ready_units);
+                else
+                        /* This is an alias unit of dropped or not ready device. */
+                        (void) set_ensure_put(not_ready_units, NULL, d);
         }
 
-        *ret_ready_devlinks = TAKE_PTR(ready_devlinks);
         return 0;
 }
 
-static void device_process_new(Manager *m, sd_device *dev, const char *sysfs) {
-        const char *dn, *alias;
+static int device_setup_units(Manager *m, sd_device *dev, Set **ready_units, Set **not_ready_units) {
+        const char *syspath, *devname = NULL;
         int r;
 
         assert(m);
         assert(dev);
-        assert(sysfs);
+        assert(ready_units);
+        assert(not_ready_units);
 
-        /* Add the main unit named after the sysfs path. If this one fails, don't bother with the rest, as
-         * this one shall be the main device unit the others just follow. (Compare with how
-         * device_following() is implemented, see below, which looks for the sysfs device.) */
-        if (device_setup_unit(m, dev, sysfs, /* main = */ true) < 0)
-                return;
+        r = sd_device_get_syspath(dev, &syspath);
+        if (r < 0)
+                return log_device_debug_errno(dev, r, "Couldn't get syspath from device, ignoring: %m");
 
-        /* Add an additional unit for the device node */
-        if (sd_device_get_devname(dev, &dn) >= 0)
-                (void) device_setup_unit(m, dev, dn, /* main = */ false);
+        /* First, process the main (that is, points to the syspath) and (real, not symlink) devnode units. */
+        if (device_for_action(dev, SD_DEVICE_REMOVE))
+                /* If the device is removed, the main and devnode units units will be removed by
+                 * device_update_found_by_sysfs() in device_dispatch_io(). Hence, it is not necessary to
+                 * store them to not_ready_units, and we have nothing to do here.
+                 *
+                 * Note, still we need to process devlink units below, as a devlink previously points to this
+                 * device may still exist and now point to another device node. That is, do not forget to
+                 * call device_setup_extra_units(). */
+                ;
+        else if (device_is_ready(dev)) {
+                /* Add the main unit named after the syspath. If this one fails, don't bother with the rest,
+                 * as this one shall be the main device unit the others just follow. (Compare with how
+                 * device_following() is implemented, see below, which looks for the sysfs device.) */
+                r = device_setup_unit(m, dev, syspath, /* main = */ true, ready_units);
+                if (r < 0)
+                        return r;
 
-        /* Add additional units for all explicitly configured aliases */
-        r = sd_device_get_property_value(dev, "SYSTEMD_ALIAS", &alias);
-        if (r < 0) {
-                if (r != -ENOENT)
-                        log_device_error_errno(dev, r, "Failed to get SYSTEMD_ALIAS property, ignoring: %m");
-                return;
-        }
+                /* Add an additional unit for the device node */
+                if (sd_device_get_devname(dev, &devname) >= 0)
+                        (void) device_setup_unit(m, dev, devname, /* main = */ false, ready_units);
 
-        for (;;) {
-                _cleanup_free_ char *word = NULL;
+        } else {
+                Unit *u;
 
-                r = extract_first_word(&alias, &word, NULL, EXTRACT_UNQUOTE);
-                if (r == 0)
-                        break;
-                if (r == -ENOMEM)
-                        return (void) log_oom();
-                if (r < 0)
-                        return (void) log_device_warning_errno(dev, r, "Failed to parse SYSTEMD_ALIAS property, ignoring: %m");
+                /* If the device exists but not ready, then save the units and unset udev bits later. */
 
-                if (!path_is_absolute(word))
-                        log_device_warning(dev, "SYSTEMD_ALIAS is not an absolute path, ignoring: %s", word);
-                else if (!path_is_normalized(word))
-                        log_device_warning(dev, "SYSTEMD_ALIAS is not a normalized path, ignoring: %s", word);
-                else
-                        (void) device_setup_unit(m, dev, word, /* main = */ false);
+                if (device_by_path(m, syspath, &u) >= 0) {
+                        r = set_ensure_put(not_ready_units, NULL, DEVICE(u));
+                        if (r < 0)
+                                log_unit_debug_errno(u, r, "Failed to store unit, ignoring: %m");
+                }
+
+                if (sd_device_get_devname(dev, &devname) >= 0 &&
+                    device_by_path(m, devname, &u) >= 0) {
+                        r = set_ensure_put(not_ready_units, NULL, DEVICE(u));
+                        if (r < 0)
+                                log_unit_debug_errno(u, r, "Failed to store unit, ignoring: %m");
+                }
         }
+
+        /* Next, add/update additional .device units point to aliases and symlinks. */
+        (void) device_setup_extra_units(m, dev, ready_units, not_ready_units);
+
+        /* Safety check: no unit should be in ready_units and not_ready_units simultaneously. */
+        Unit *u;
+        SET_FOREACH(u, *not_ready_units)
+                if (set_remove(*ready_units, u))
+                        log_unit_error(u, "Cannot active and deactive simultaneously. Deactivating.");
+
+        return 0;
 }
 
 static Unit *device_following(Unit *u) {
@@ -982,28 +1028,16 @@ static void device_enumerate(Manager *m) {
         }
 
         FOREACH_DEVICE(e, dev) {
-                _cleanup_strv_free_ char **ready_devlinks = NULL;
-                const char *sysfs;
-                bool ready;
+                _cleanup_set_free_ Set *ready_units = NULL, *not_ready_units = NULL;
+                Device *d;
 
-                r = sd_device_get_syspath(dev, &sysfs);
-                if (r < 0) {
-                        log_device_debug_errno(dev, r, "Couldn't get syspath from device, ignoring: %m");
+                if (device_setup_units(m, dev, &ready_units, &not_ready_units) < 0)
                         continue;
-                }
-
-                ready = device_is_ready(dev);
-                if (ready)
-                        device_process_new(m, dev, sysfs);
-
-                /* Add additional units for all symlinks */
-                (void) device_setup_devlink_units(m, dev, &ready_devlinks);
 
-                if (ready)
-                        device_update_found_by_sysfs(m, sysfs, DEVICE_FOUND_UDEV, DEVICE_FOUND_UDEV);
-
-                STRV_FOREACH(devlink, ready_devlinks)
-                        device_update_found_by_name(m, *devlink, DEVICE_FOUND_UDEV, DEVICE_FOUND_UDEV);
+                SET_FOREACH(d, ready_units)
+                        device_update_found_one(d, DEVICE_FOUND_UDEV, DEVICE_FOUND_UDEV);
+                SET_FOREACH(d, not_ready_units)
+                        device_update_found_one(d, DEVICE_NOT_FOUND, DEVICE_FOUND_UDEV);
         }
 
         return;
@@ -1012,46 +1046,18 @@ fail:
         device_shutdown(m);
 }
 
-static void device_propagate_reload_by_sysfs(Manager *m, const char *sysfs) {
-        Device *l;
-        int r;
-
-        assert(m);
-        assert(sysfs);
-
-        l = hashmap_get(m->devices_by_sysfs, sysfs);
-        LIST_FOREACH(same_sysfs, d, l) {
-                if (d->state == DEVICE_DEAD)
-                        continue;
-
-                r = manager_propagate_reload(m, UNIT(d), JOB_REPLACE, NULL);
-                if (r < 0)
-                        log_unit_warning_errno(UNIT(d), r, "Failed to propagate reload, ignoring: %m");
-        }
-}
-
-static void device_propagate_reload_by_name(Manager *m, const char *path) {
-        _cleanup_free_ char *e = NULL;
-        Unit *u;
+static void device_propagate_reload(Manager *m, Device *d) {
         int r;
 
         assert(m);
-        assert(path);
-
-        r = unit_name_from_path(path, ".device", &e);
-        if (r < 0)
-                return (void) log_debug_errno(r, "Failed to generate unit name from device path, ignoring: %m");
-
-        u = manager_get_unit(m, e);
-        if (!u)
-                return;
+        assert(d);
 
-        if (DEVICE(u)->state == DEVICE_DEAD)
+        if (d->state == DEVICE_DEAD)
                 return;
 
-        r = manager_propagate_reload(m, u, JOB_REPLACE, NULL);
+        r = manager_propagate_reload(m, UNIT(d), JOB_REPLACE, NULL);
         if (r < 0)
-                log_unit_warning_errno(u, r, "Failed to propagate reload, ignoring: %m");
+                log_unit_warning_errno(UNIT(d), r, "Failed to propagate reload, ignoring: %m");
 }
 
 static void device_remove_old_on_move(Manager *m, sd_device *dev) {
@@ -1074,11 +1080,12 @@ static void device_remove_old_on_move(Manager *m, sd_device *dev) {
 }
 
 static int device_dispatch_io(sd_device_monitor *monitor, sd_device *dev, void *userdata) {
-        _cleanup_strv_free_ char **ready_devlinks = NULL;
+        _cleanup_set_free_ Set *ready_units = NULL, *not_ready_units = NULL;
         Manager *m = ASSERT_PTR(userdata);
         sd_device_action_t action;
         const char *sysfs;
         bool ready;
+        Device *d;
         int r;
 
         assert(dev);
@@ -1103,54 +1110,42 @@ static int device_dispatch_io(sd_device_monitor *monitor, sd_device *dev, void *
         /* A change event can signal that a device is becoming ready, in particular if the device is using
          * the SYSTEMD_READY logic in udev so we need to reach the else block of the following if, even for
          * change events */
+        ready = device_is_ready(dev);
+
+        (void) device_setup_units(m, dev, &ready_units, &not_ready_units);
+
         if (action == SD_DEVICE_REMOVE) {
                 r = swap_process_device_remove(m, dev);
                 if (r < 0)
                         log_device_warning_errno(dev, r, "Failed to process swap device remove event, ignoring: %m");
-
-                ready = false;
-
-                (void) device_setup_devlink_units_on_remove(m, dev, &ready_devlinks);
-
-        } else {
-                ready = device_is_ready(dev);
-
-                if (ready) {
-                        device_process_new(m, dev, sysfs);
-
-                        r = swap_process_device_new(m, dev);
-                        if (r < 0)
-                                log_device_warning_errno(dev, r, "Failed to process swap device new event, ignoring: %m");
-                }
-
-                /* Add additional units for all symlinks */
-                (void) device_setup_devlink_units(m, dev, &ready_devlinks);
+        } else if (ready) {
+                r = swap_process_device_new(m, dev);
+                if (r < 0)
+                        log_device_warning_errno(dev, r, "Failed to process swap device new event, ignoring: %m");
         }
 
-        if (!IN_SET(action, SD_DEVICE_ADD, SD_DEVICE_REMOVE, SD_DEVICE_MOVE)) {
-                device_propagate_reload_by_sysfs(m, sysfs);
+        if (!IN_SET(action, SD_DEVICE_ADD, SD_DEVICE_REMOVE, SD_DEVICE_MOVE))
+                SET_FOREACH(d, ready_units)
+                        device_propagate_reload(m, d);
 
-                STRV_FOREACH(devlink, ready_devlinks)
-                        device_propagate_reload_by_name(m, *devlink);
-        }
-
-        if (ready || !strv_isempty(ready_devlinks))
+        if (!set_isempty(ready_units))
                 manager_dispatch_load_queue(m);
 
         if (action == SD_DEVICE_REMOVE)
                 /* If we get notified that a device was removed by udev, then it's completely gone, hence
-                 * unset all found bits */
-                device_update_found_by_sysfs(m, sysfs, 0, DEVICE_FOUND_MASK);
-        else if (ready)
-                /* The device is found now, set the udev found bit */
-                device_update_found_by_sysfs(m, sysfs, DEVICE_FOUND_UDEV, DEVICE_FOUND_UDEV);
-        else
-                /* The device is nominally around, but not ready for us. Hence unset the udev bit, but leave
-                 * the rest around. */
-                device_update_found_by_sysfs(m, sysfs, DEVICE_NOT_FOUND, DEVICE_FOUND_UDEV);
+                 * unset all found bits. Note this affects all .device units still point to the removed
+                 * device. */
+                device_update_found_by_sysfs(m, sysfs, DEVICE_NOT_FOUND, DEVICE_FOUND_MASK);
+
+        /* These devices are found and ready now, set the udev found bit. Note, this is also necessary to do
+         * on remove uevent, as some devlinks may be updated and now point to other device nodes. */
+        SET_FOREACH(d, ready_units)
+                device_update_found_one(d, DEVICE_FOUND_UDEV, DEVICE_FOUND_UDEV);
 
-        STRV_FOREACH(devlink, ready_devlinks)
-                device_update_found_by_name(m, *devlink, DEVICE_FOUND_UDEV, DEVICE_FOUND_UDEV);
+        /* These devices may be nominally around, but not ready for us. Hence unset the udev bit, but leave
+         * the rest around. This may be redundant for remove uevent, but should be harmless. */
+        SET_FOREACH(d, not_ready_units)
+                device_update_found_one(d, DEVICE_NOT_FOUND, DEVICE_FOUND_UDEV);
 
         return 0;
 }
@@ -1194,7 +1189,7 @@ void device_found_node(Manager *m, const char *node, DeviceFound found, DeviceFo
                         return;
                 }
 
-                (void) device_setup_unit(m, dev, node, /* main = */ false); /* 'dev' may be NULL. */
+                (void) device_setup_unit(m, dev, node, /* main = */ false, NULL); /* 'dev' may be NULL. */
         }
 
         /* Update the device unit's state, should it exist */

diff --git a/src/core/execute.c b/src/core/execute.c
index e9443500acf51208e4b51d629975a565eff7c561..6a4e1e09547444ff9d743324c6b766bb76e75f3b 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -4073,7 +4073,7 @@ static int add_shifted_fd(int *fds, size_t fds_size, size_t *n_fds, int fd, int
                 if (r < 0)
                         return -errno;
 
-                CLOSE_AND_REPLACE(fd, r);
+                close_and_replace(fd, r);
         }
 
         *ret_fd = fds[*n_fds] = fd;

diff --git a/src/core/manager.c b/src/core/manager.c
index cc89ae3f9c082949db8b7941081b428a03880acb..90e126840a79bb53634b729ecdd44c0ce38652fb 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4457,8 +4457,7 @@ int manager_dispatch_user_lookup_fd(sd_event_source *source, int fd, uint32_t re
 }
 
 static int short_uid_range(const char *path) {
-        _cleanup_free_ UidRange *p = NULL;
-        size_t n = 0;
+        _cleanup_(uid_range_freep) UidRange *p = NULL;
         int r;
 
         assert(path);
@@ -4466,13 +4465,14 @@ static int short_uid_range(const char *path) {
         /* Taint systemd if we the UID range assigned to this environment doesn't at least cover 0…65534,
          * i.e. from root to nobody. */
 
-        r = uid_range_load_userns(&p, &n, path);
-        if (ERRNO_IS_NOT_SUPPORTED(r))
-                return false;
-        if (r < 0)
+        r = uid_range_load_userns(&p, path);
+        if (r < 0) {
+                if (ERRNO_IS_NOT_SUPPORTED(r))
+                        return false;
                 return log_debug_errno(r, "Failed to load %s: %m", path);
+        }
 
-        return !uid_range_covers(p, n, 0, 65535);
+        return !uid_range_covers(p, 0, 65535);
 }
 
 char* manager_taint_string(const Manager *m) {

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 468b27905e7e9fdb788e2217e9a15615e7515133..1911c4139170ab801dc4affeaba769b5e51f5511 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -2003,7 +2003,6 @@ int setup_namespace(
                 char **error_path) {
 
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(dissected_image_unrefp) DissectedImage *dissected_image = NULL;
         _cleanup_(verity_settings_done) VeritySettings verity = VERITY_SETTINGS_DEFAULT;
         _cleanup_strv_free_ char **hierarchies = NULL;
@@ -2083,8 +2082,7 @@ int setup_namespace(
                                 dissected_image,
                                 NULL,
                                 &verity,
-                                dissect_image_flags,
-                                &decrypted_image);
+                                dissect_image_flags);
                 if (r < 0)
                         return log_debug_errno(r, "Failed to decrypt dissected image: %m");
         }
@@ -2416,16 +2414,12 @@ int setup_namespace(
                         goto finish;
                 }
 
-                if (decrypted_image) {
-                        r = decrypted_image_relinquish(decrypted_image);
-                        if (r < 0) {
-                                log_debug_errno(r, "Failed to relinquish decrypted image: %m");
-                                goto finish;
-                        }
+                r = dissected_image_relinquish(dissected_image);
+                if (r < 0) {
+                        log_debug_errno(r, "Failed to relinquish dissected image: %m");
+                        goto finish;
                 }
 
-                loop_device_relinquish(loop_device);
-
         } else if (root_directory) {
 
                 /* A root directory is specified. Turn its directory into bind mount, if it isn't one yet. */

diff --git a/src/core/service.c b/src/core/service.c
index 6ceb0a20578f59197f9c17ea149594fd72e24347..1e14cdc6ca028c082f9a67d08dc265d11d7486bd 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2293,7 +2293,7 @@ static void service_enter_start_pre(Service *s) {
                 r = service_spawn(s,
                                   s->control_command,
                                   s->timeout_start_usec,
-                                  EXEC_APPLY_SANDBOXING|EXEC_APPLY_CHROOT|EXEC_IS_CONTROL|EXEC_APPLY_TTY_STDIN|EXEC_SETENV_MONITOR_RESULT,
+                                  EXEC_APPLY_SANDBOXING|EXEC_APPLY_CHROOT|EXEC_IS_CONTROL|EXEC_APPLY_TTY_STDIN|EXEC_SETENV_MONITOR_RESULT|EXEC_WRITE_CREDENTIALS,
                                   &s->control_pid);
                 if (r < 0)
                         goto fail;

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 43babb9803301dc08b484d8be27b1330d027cd3d..6557e98f0aee9108e835838055112f40cdc2eecb 100644 (file)
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -717,7 +717,7 @@ static int print_info(FILE *file, sd_journal *j, bool need_space) {
                         ansi_normal());
 
                 if (size != UINT64_MAX)
-                        fprintf(file, "     Disk Size: %s\n", FORMAT_BYTES(size));
+                        fprintf(file, "  Size on Disk: %s\n", FORMAT_BYTES(size));
 
         } else if (coredump)
                 fprintf(file, "       Storage: journal\n");

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index d6e5833b2402af14bebc14c94f5883610d1d6e8a..03b85359a511ef2c572c8d0b955b8c280f0bf8af 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -1461,7 +1461,7 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2(
                                         key_file, arg_keyfile_size, arg_keyfile_offset,
                                         key_data, key_data_size,
                                         /* policy_hash= */ NULL, /* policy_hash_size= */ 0, /* we don't know the policy hash */
-                                        arg_tpm2_pin,
+                                        arg_tpm2_pin ? TPM2_FLAGS_USE_PIN : 0,
                                         until,
                                         arg_headless,
                                         arg_ask_password_flags,

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index b075222ec5622a9bb389596548429abcbb7e389e..eeba0183646e998d0c6d2880040da22dc39aef36 100644 (file)
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -657,7 +657,6 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
 }
 
 static int action_mount(DissectedImage *m, LoopDevice *d) {
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *di = NULL;
         int r;
 
         assert(m);
@@ -666,8 +665,7 @@ static int action_mount(DissectedImage *m, LoopDevice *d) {
         r = dissected_image_decrypt_interactively(
                         m, NULL,
                         &arg_verity_settings,
-                        arg_flags,
-                        &di);
+                        arg_flags);
         if (r < 0)
                 return r;
 
@@ -679,19 +677,15 @@ static int action_mount(DissectedImage *m, LoopDevice *d) {
         if (r < 0)
                 return log_error_errno(r, "Failed to unlock loopback block device: %m");
 
-        if (di) {
-                r = decrypted_image_relinquish(di);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to relinquish DM devices: %m");
-        }
+        r = dissected_image_relinquish(m);
+        if (r < 0)
+                return log_error_errno(r, "Failed to relinquish DM and loopback block devices: %m");
 
-        loop_device_relinquish(d);
         return 0;
 }
 
 static int action_copy(DissectedImage *m, LoopDevice *d) {
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *di = NULL;
         _cleanup_(rmdir_and_freep) char *created_dir = NULL;
         _cleanup_free_ char *temp = NULL;
         int r;
@@ -702,8 +696,7 @@ static int action_copy(DissectedImage *m, LoopDevice *d) {
         r = dissected_image_decrypt_interactively(
                         m, NULL,
                         &arg_verity_settings,
-                        arg_flags,
-                        &di);
+                        arg_flags);
         if (r < 0)
                 return r;
 
@@ -731,13 +724,9 @@ static int action_copy(DissectedImage *m, LoopDevice *d) {
         if (r < 0)
                 return log_error_errno(r, "Failed to unlock loopback block device: %m");
 
-        if (di) {
-                r = decrypted_image_relinquish(di);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to relinquish DM devices: %m");
-        }
-
-        loop_device_relinquish(d);
+        r = dissected_image_relinquish(m);
+        if (r < 0)
+                return log_error_errno(r, "Failed to relinquish DM and loopback block devices: %m");
 
         if (arg_action == ACTION_COPY_FROM) {
                 _cleanup_close_ int source_fd = -1, target_fd = -1;

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index abeafacc3870e9ddadb071bad67a4c2d018aec19..74fd722e808a816608a65246e7d7c48fbf1cda8b 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -1311,7 +1311,6 @@ static int parse_argv(int argc, char *argv[]) {
 
 static int run(int argc, char *argv[]) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *unlink_dir = NULL;
         int r;
 
@@ -1349,8 +1348,7 @@ static int run(int argc, char *argv[]) {
                                 DISSECT_IMAGE_FSCK |
                                 DISSECT_IMAGE_GROWFS,
                                 &unlink_dir,
-                                &loop_device,
-                                &decrypted_image);
+                                &loop_device);
                 if (r < 0)
                         return r;
 

diff --git a/src/home/homed-home.c b/src/home/homed-home.c
index 47dc16d83f9d23a2fcd29ef89cf6956274fbc5f2..19be186400dc1ef60819a6bedae28f6adff6528d 100644 (file)
--- a/src/home/homed-home.c
+++ b/src/home/homed-home.c
@@ -2041,8 +2041,7 @@ void home_process_notify(Home *h, char **l, int fd) {
                         if (taken_fd < 0)
                                 return (void) log_debug("Got notify message with SYSTEMD_LUKS_LOCK_FD=1 but no fd passed, ignoring: %m");
 
-                        safe_close(h->luks_lock_fd);
-                        h->luks_lock_fd = TAKE_FD(taken_fd);
+                        close_and_replace(h->luks_lock_fd, taken_fd);
 
                         log_debug("Successfully acquired LUKS lock fd from worker.");
 

diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c
index bf0c2abb8c3dd769cf360ea2605040eea39aca85..0369e285a70289bfe14d65003428bea0fb4c5c81 100644 (file)
--- a/src/home/homework-luks.c
+++ b/src/home/homework-luks.c
@@ -2333,7 +2333,7 @@ int home_create_luks(
 
         log_info("Setting up LUKS device %s completed.", setup->dm_node);
 
-        r = make_filesystem(setup->dm_node, fstype, user_record_user_name_and_realm(h), fs_uuid, user_record_luks_discard(h));
+        r = make_filesystem(setup->dm_node, fstype, user_record_user_name_and_realm(h), NULL, fs_uuid, user_record_luks_discard(h));
         if (r < 0)
                 return r;
 

diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 0faa58acf5bad78380cc78474de2f7f80ee33ef8..30f5b9050ba5803eb24b30a490d0747c0049a714 100644 (file)
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -195,7 +195,7 @@ static int raw_import_maybe_convert_qcow2(RawImport *i) {
 
         unlink_and_free(i->temp_path);
         i->temp_path = TAKE_PTR(t);
-        CLOSE_AND_REPLACE(i->output_fd, converted_fd);
+        close_and_replace(i->output_fd, converted_fd);
 
         return 1;
 }

diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 0623afcc84bb5fac374373d0f62591efd11a7d23..f4f869d38e926f8af49d97744354dd6ee8ba8770 100644 (file)
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -280,7 +280,7 @@ static int raw_pull_maybe_convert_qcow2(RawPull *i) {
 
         unlink_and_free(i->temp_path);
         i->temp_path = TAKE_PTR(t);
-        CLOSE_AND_REPLACE(i->raw_job->disk_fd, converted_fd);
+        close_and_replace(i->raw_job->disk_fd, converted_fd);
 
         return 1;
 }

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5e25ed9bfdf3d87be149a7eab62c212dbda01795..f3d3e2eca3b6d8b431180eeaf80120d0882fe325 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1960,7 +1960,7 @@ static int setup_keys(void) {
 #endif
 }
 
-static int verify(sd_journal *j) {
+static int verify(sd_journal *j, bool verbose) {
         int r = 0;
         JournalFile *f;
 
@@ -1977,7 +1977,7 @@ static int verify(sd_journal *j) {
                         log_notice("Journal file %s has sealing enabled but verification key has not been passed using --verify-key=.", f->path);
 #endif
 
-                k = journal_file_verify(f, arg_verify_key, &first, &validated, &last, true);
+                k = journal_file_verify(f, arg_verify_key, &first, &validated, &last, verbose);
                 if (k == -EINVAL)
                         /* If the key was invalid give up right-away. */
                         return k;
@@ -1985,19 +1985,22 @@ static int verify(sd_journal *j) {
                         r = log_warning_errno(k, "FAIL: %s (%m)", f->path);
                 else {
                         char a[FORMAT_TIMESTAMP_MAX], b[FORMAT_TIMESTAMP_MAX];
-                        log_info("PASS: %s", f->path);
+                        log_full(verbose ? LOG_INFO : LOG_DEBUG, "PASS: %s", f->path);
 
                         if (arg_verify_key && JOURNAL_HEADER_SEALED(f->header)) {
                                 if (validated > 0) {
-                                        log_info("=> Validated from %s to %s, final %s entries not sealed.",
+                                        log_full(verbose ? LOG_INFO : LOG_DEBUG,
+                                                 "=> Validated from %s to %s, final %s entries not sealed.",
                                                  format_timestamp_maybe_utc(a, sizeof(a), first),
                                                  format_timestamp_maybe_utc(b, sizeof(b), validated),
                                                  FORMAT_TIMESPAN(last > validated ? last - validated : 0, 0));
                                 } else if (last > 0)
-                                        log_info("=> No sealing yet, %s of entries not sealed.",
+                                        log_full(verbose ? LOG_INFO : LOG_DEBUG,
+                                                 "=> No sealing yet, %s of entries not sealed.",
                                                  FORMAT_TIMESPAN(last - first, 0));
                                 else
-                                        log_info("=> No sealing yet, no entries in file.");
+                                        log_full(verbose ? LOG_INFO : LOG_DEBUG,
+                                                 "=> No sealing yet, no entries in file.");
                         }
                 }
         }
@@ -2092,7 +2095,6 @@ static int wait_for_change(sd_journal *j, int poll_fd) {
 
 int main(int argc, char *argv[]) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *unlink_dir = NULL;
         bool previous_boot_id_valid = false, first_line = true, ellipsized = false, need_seek = false;
         bool use_cursor = false, after_cursor = false;
@@ -2122,8 +2124,7 @@ int main(int argc, char *argv[]) {
                                 DISSECT_IMAGE_RELAX_VAR_CHECK |
                                 (arg_action == ACTION_UPDATE_CATALOG ? DISSECT_IMAGE_FSCK|DISSECT_IMAGE_GROWFS : DISSECT_IMAGE_READ_ONLY),
                                 &unlink_dir,
-                                &loop_device,
-                                &decrypted_image);
+                                &loop_device);
                 if (r < 0)
                         return r;
 
@@ -2298,7 +2299,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
 
         case ACTION_VERIFY:
-                r = verify(j);
+                r = verify(j, !arg_quiet);
                 goto finish;
 
         case ACTION_DISK_USAGE: {

diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
index b34bbd83cdf54431e4e781ca6a684192b34cccfa..743af33aa9345269f7e53a02333290cfd365a5db 100755 (executable)
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -111,7 +111,7 @@ install -m 0644 "$KERNEL_IMAGE" "$ENTRY_DIR_ABS/linux" || {
     echo "Error: could not copy '$KERNEL_IMAGE' to '$ENTRY_DIR_ABS/linux'." >&2
     exit 1
 }
-chown root.root "$ENTRY_DIR_ABS/linux" || :
+chown root:root "$ENTRY_DIR_ABS/linux" || :
 
 shift "$INITRD_OPTIONS_SHIFT"
 # All files listed as arguments, and staged files starting with "initrd" are installed as initrds.
@@ -128,7 +128,7 @@ for initrd in "$@" "${KERNEL_INSTALL_STAGING_AREA}"/initrd*; do
         echo "Error: could not copy '$initrd' to '$ENTRY_DIR_ABS/$initrd_basename'." >&2
         exit 1
     }
-    chown root.root "$ENTRY_DIR_ABS/$initrd_basename" || :
+    chown root:root "$ENTRY_DIR_ABS/$initrd_basename" || :
 done
 
 mkdir -p "${LOADER_ENTRY%/*}" || {

diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
index 673783b2b3721a3d607890ce7e512150543ba115..9b11b2f160663f68a49e0ed6c78339284bad31a1 100644 (file)
--- a/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/libsystemd-network/sd-ipv4acd.c
@@ -583,7 +583,7 @@ int sd_ipv4acd_start(sd_ipv4acd *acd, bool reset_conflicts) {
         if (r < 0)
                 return r;
 
-        CLOSE_AND_REPLACE(acd->fd, r);
+        close_and_replace(acd->fd, r);
 
         if (reset_conflicts)
                 acd->n_conflict = 0;

diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym
index 3510beea5becd34999258879772601845577530e..18717cbb7b71455a1816a8b6de96f8bc096bd12e 100644 (file)
--- a/src/libsystemd/libsystemd.sym
+++ b/src/libsystemd/libsystemd.sym
@@ -791,159 +791,4 @@ global:
         sd_id128_string_equal;
 
         sd_hwdb_new_from_path;
-
-        sd_netlink_open;
-        sd_netlink_open_fd;
-        sd_netlink_increase_rxbuf;
-        sd_netlink_ref;
-        sd_netlink_unref;
-        sd_netlink_send;
-        sd_netlink_call_async;
-        sd_netlink_call;
-        sd_netlink_read;
-        sd_netlink_get_events;
-        sd_netlink_get_timeout;
-        sd_netlink_process;
-        sd_netlink_wait;
-        sd_netlink_add_match;
-        sd_netlink_attach_event;
-        sd_netlink_detach_event;
-        sd_netlink_attach_filter;
-        sd_netlink_message_append_string;
-        sd_netlink_message_append_strv;
-        sd_netlink_message_append_flag;
-        sd_netlink_message_append_u8;
-        sd_netlink_message_append_u16;
-        sd_netlink_message_append_u32;
-        sd_netlink_message_append_u64;
-        sd_netlink_message_append_s8;
-        sd_netlink_message_append_s16;
-        sd_netlink_message_append_s32;
-        sd_netlink_message_append_s64;
-        sd_netlink_message_append_data;
-        sd_netlink_message_append_container_data;
-        sd_netlink_message_append_in_addr;
-        sd_netlink_message_append_in6_addr;
-        sd_netlink_message_append_sockaddr_in;
-        sd_netlink_message_append_sockaddr_in6;
-        sd_netlink_message_append_ether_addr;
-        sd_netlink_message_append_cache_info;
-        sd_netlink_message_open_container;
-        sd_netlink_message_open_container_union;
-        sd_netlink_message_close_container;
-        sd_netlink_message_read;
-        sd_netlink_message_read_data;
-        sd_netlink_message_read_data_suffix0;
-        sd_netlink_message_read_string_strdup;
-        sd_netlink_message_read_string;
-        sd_netlink_message_read_strv;
-        sd_netlink_message_read_u8;
-        sd_netlink_message_read_u16;
-        sd_netlink_message_read_u32;
-        sd_netlink_message_read_ether_addr;
-        sd_netlink_message_read_cache_info;
-        sd_netlink_message_read_in_addr;
-        sd_netlink_message_read_in6_addr;
-        sd_netlink_message_has_flag;
-        sd_netlink_message_enter_container;
-        sd_netlink_message_enter_array;
-        sd_netlink_message_exit_container;
-        sd_netlink_message_open_array;
-        sd_netlink_message_cancel_array;
-        sd_netlink_message_rewind;
-        sd_netlink_message_next;
-        sd_netlink_message_ref;
-        sd_netlink_message_unref;
-        sd_netlink_message_set_request_dump;
-        sd_netlink_message_is_error;
-        sd_netlink_message_get_errno;
-        sd_netlink_message_get_type;
-        sd_netlink_message_set_flags;
-        sd_netlink_message_is_broadcast;
-        sd_netlink_message_get_max_attribute;
-        sd_netlink_slot_ref;
-        sd_netlink_slot_unref;
-        sd_netlink_slot_get_netlink;
-        sd_netlink_slot_get_userdata;
-        sd_netlink_slot_set_userdata;
-        sd_netlink_slot_get_destroy_callback;
-        sd_netlink_slot_set_destroy_callback;
-        sd_netlink_slot_get_floating;
-        sd_netlink_slot_set_floating;
-        sd_netlink_slot_get_description;
-        sd_netlink_slot_set_description;
-
-        sd_rtnl_message_get_family;
-        sd_rtnl_message_new_addr;
-        sd_rtnl_message_new_addr_update;
-        sd_rtnl_message_addr_set_prefixlen;
-        sd_rtnl_message_addr_set_scope;
-        sd_rtnl_message_addr_set_flags;
-        sd_rtnl_message_addr_get_family;
-        sd_rtnl_message_addr_get_prefixlen;
-        sd_rtnl_message_addr_get_scope;
-        sd_rtnl_message_addr_get_flags;
-        sd_rtnl_message_addr_get_ifindex;
-        sd_rtnl_message_new_link;
-        sd_rtnl_message_link_set_flags;
-        sd_rtnl_message_link_set_type;
-        sd_rtnl_message_link_set_family;
-        sd_rtnl_message_link_get_ifindex;
-        sd_rtnl_message_link_get_flags;
-        sd_rtnl_message_link_get_type;
-        sd_rtnl_message_new_route;
-        sd_rtnl_message_route_set_dst_prefixlen;
-        sd_rtnl_message_route_set_src_prefixlen;
-        sd_rtnl_message_route_set_scope;
-        sd_rtnl_message_route_set_flags;
-        sd_rtnl_message_route_set_table;
-        sd_rtnl_message_route_set_type;
-        sd_rtnl_message_route_get_flags;
-        sd_rtnl_message_route_get_family;
-        sd_rtnl_message_route_get_protocol;
-        sd_rtnl_message_route_get_scope;
-        sd_rtnl_message_route_get_tos;
-        sd_rtnl_message_route_get_table;
-        sd_rtnl_message_route_get_dst_prefixlen;
-        sd_rtnl_message_route_get_src_prefixlen;
-        sd_rtnl_message_route_get_type;
-        sd_rtnl_message_new_nexthop;
-        sd_rtnl_message_nexthop_set_flags;
-        sd_rtnl_message_nexthop_get_flags;
-        sd_rtnl_message_nexthop_get_family;
-        sd_rtnl_message_nexthop_get_protocol;
-        sd_rtnl_message_new_neigh;
-        sd_rtnl_message_neigh_set_flags;
-        sd_rtnl_message_neigh_set_state;
-        sd_rtnl_message_neigh_get_family;
-        sd_rtnl_message_neigh_get_ifindex;
-        sd_rtnl_message_neigh_get_state;
-        sd_rtnl_message_neigh_get_flags;
-        sd_rtnl_message_new_addrlabel;
-        sd_rtnl_message_addrlabel_set_prefixlen;
-        sd_rtnl_message_addrlabel_get_prefixlen;
-        sd_rtnl_message_new_routing_policy_rule;
-        sd_rtnl_message_routing_policy_rule_set_tos;
-        sd_rtnl_message_routing_policy_rule_get_tos;
-        sd_rtnl_message_routing_policy_rule_set_table;
-        sd_rtnl_message_routing_policy_rule_get_table;
-        sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen;
-        sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen;
-        sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen;
-        sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen;
-        sd_rtnl_message_routing_policy_rule_set_fib_type;
-        sd_rtnl_message_routing_policy_rule_get_fib_type;
-        sd_rtnl_message_routing_policy_rule_set_flags;
-        sd_rtnl_message_routing_policy_rule_get_flags;
-        sd_rtnl_message_new_traffic_control;
-        sd_rtnl_message_traffic_control_get_ifindex;
-        sd_rtnl_message_traffic_control_get_handle;
-        sd_rtnl_message_traffic_control_get_parent;
-        sd_rtnl_message_new_mdb;
-
-        sd_genl_socket_open;
-        sd_genl_message_new;
-        sd_genl_message_get_family_name;
-        sd_genl_message_get_command;
-        sd_genl_add_match;
 } LIBSYSTEMD_251;

diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c
index 072c6b94d3589cbaa3511c596802317760f19a3e..48f425396acd5fe1a2bc5e3b4c956046e8e4d99c 100644 (file)
--- a/src/libsystemd/sd-device/device-monitor.c
+++ b/src/libsystemd/sd-device/device-monitor.c
@@ -48,7 +48,6 @@ struct sd_device_monitor {
         bool bound;
 
         UidRange *mapped_userns_uid_range;
-        size_t n_uid_range;
 
         Hashmap *subsystem_filter;
         Set *tag_filter;
@@ -174,7 +173,6 @@ int device_monitor_new_full(sd_device_monitor **ret, MonitorNetlinkGroup group,
                 .bound = fd >= 0,
                 .snl.nl.nl_family = AF_NETLINK,
                 .snl.nl.nl_groups = group,
-                .n_uid_range = SIZE_MAX,
         };
 
         if (fd >= 0) {
@@ -376,7 +374,7 @@ static sd_device_monitor *device_monitor_free(sd_device_monitor *m) {
 
         (void) sd_device_monitor_detach_event(m);
 
-        free(m->mapped_userns_uid_range);
+        uid_range_free(m->mapped_userns_uid_range);
         free(m->description);
         hashmap_free(m->subsystem_filter);
         set_free(m->tag_filter);
@@ -468,15 +466,14 @@ static bool check_sender_uid(sd_device_monitor *m, uid_t uid) {
         if (uid == getuid() || uid == geteuid())
                 return true;
 
-        if (m->n_uid_range == SIZE_MAX) {
-                m->n_uid_range = 0;
-                r = uid_range_load_userns(&m->mapped_userns_uid_range, &m->n_uid_range, NULL);
+        if (!m->mapped_userns_uid_range) {
+                r = uid_range_load_userns(&m->mapped_userns_uid_range, NULL);
                 if (r < 0)
                         log_monitor_errno(m, r, "Failed to load UID ranges mapped to the current user namespace, ignoring: %m");
         }
 
         /* Trust messages come from outside of the current user namespace. */
-        if (m->n_uid_range != SIZE_MAX && !uid_range_contains(m->mapped_userns_uid_range, m->n_uid_range, uid))
+        if (!uid_range_contains(m->mapped_userns_uid_range, uid))
                 return true;
 
         /* Otherwise, refuse messages. */

diff --git a/src/libsystemd/sd-device/device-private.h b/src/libsystemd/sd-device/device-private.h
index 724061a28cd2f328fec815766f77a5fdd0ac7612..d53479e8c97ae87d6ee50af3b5fd6db91a146cb9 100644 (file)
--- a/src/libsystemd/sd-device/device-private.h
+++ b/src/libsystemd/sd-device/device-private.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <dirent.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <sys/stat.h>
@@ -14,6 +15,8 @@ int device_new_from_mode_and_devnum(sd_device **ret, mode_t mode, dev_t devnum);
 int device_new_from_nulstr(sd_device **ret, char *nulstr, size_t len);
 int device_new_from_strv(sd_device **ret, char **strv);
 
+int device_opendir(sd_device *device, const char *subdir, DIR **ret);
+
 int device_get_property_bool(sd_device *device, const char *key);
 int device_get_sysattr_unsigned(sd_device *device, const char *sysattr, unsigned *ret_value);
 int device_get_sysattr_bool(sd_device *device, const char *sysattr);

diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index 91af4a27ed8d4536c9fbe355e2797518880ae5d3..9364a69dcd00d7283ed6243d099779db81528db1 100644 (file)
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -281,7 +281,7 @@ _public_ int sd_device_new_from_syspath(sd_device **ret, const char *syspath) {
 int device_new_from_mode_and_devnum(sd_device **ret, mode_t mode, dev_t devnum) {
         _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
         _cleanup_free_ char *syspath = NULL;
-        const char *t, *subsystem;
+        const char *t, *subsystem = NULL;
         dev_t n;
         int r;
 
@@ -315,7 +315,7 @@ int device_new_from_mode_and_devnum(sd_device **ret, mode_t mode, dev_t devnum)
         r = sd_device_get_subsystem(dev, &subsystem);
         if (r < 0 && r != -ENOENT)
                 return r;
-        if (r >= 0 && streq(subsystem, "block") != !!S_ISBLK(mode))
+        if (streq_ptr(subsystem, "block") != !!S_ISBLK(mode))
                 return -ENXIO;
 
         *ret = TAKE_PTR(dev);
@@ -1866,42 +1866,32 @@ _public_ const char *sd_device_get_property_next(sd_device *device, const char *
         return key;
 }
 
-static int device_sysattrs_read_all_internal(sd_device *device, const char *subdir) {
-        _cleanup_free_ char *path_dir = NULL;
+static int device_sysattrs_read_all_internal(sd_device *device, const char *subdir, Set **stack) {
         _cleanup_closedir_ DIR *dir = NULL;
-        const char *syspath;
         int r;
 
-        r = sd_device_get_syspath(device, &syspath);
+        assert(device);
+        assert(stack);
+
+        r = device_opendir(device, subdir, &dir);
+        if (r == -ENOENT && subdir)
+                return 0; /* Maybe, this is a child device, and is already removed. */
         if (r < 0)
                 return r;
 
         if (subdir) {
-                _cleanup_free_ char *p = NULL;
-
-                p = path_join(syspath, subdir, "uevent");
-                if (!p)
-                        return -ENOMEM;
-
-                if (access(p, F_OK) >= 0)
-                        /* this is a child device, skipping */
-                        return 0;
+                if (faccessat(dirfd(dir), "uevent", F_OK, 0) >= 0)
+                        return 0; /* this is a child device, skipping */
                 if (errno != ENOENT) {
-                        log_device_debug_errno(device, errno, "sd-device: Failed to stat %s, ignoring subdir: %m", p);
+                        log_device_debug_errno(device, errno,
+                                               "sd-device: Failed to access %s/uevent, ignoring sub-directory %s: %m",
+                                               subdir, subdir);
                         return 0;
                 }
-
-                path_dir = path_join(syspath, subdir);
-                if (!path_dir)
-                        return -ENOMEM;
         }
 
-        dir = opendir(path_dir ?: syspath);
-        if (!dir)
-                return -errno;
-
         FOREACH_DIRENT_ALL(de, dir, return -errno) {
-                _cleanup_free_ char *path = NULL, *p = NULL;
+                _cleanup_free_ char *p = NULL;
                 struct stat statbuf;
 
                 if (dot_or_dot_dot(de->d_name))
@@ -1918,25 +1908,27 @@ static int device_sysattrs_read_all_internal(sd_device *device, const char *subd
                 }
 
                 if (de->d_type == DT_DIR) {
-                        /* read subdirectory */
-                        r = device_sysattrs_read_all_internal(device, p ?: de->d_name);
+                        /* push the sub-directory into the stack, and read it later. */
+                        if (p)
+                                r = set_ensure_consume(stack, &path_hash_ops_free, TAKE_PTR(p));
+                        else
+                                r = set_put_strdup_full(stack, &path_hash_ops_free, de->d_name);
                         if (r < 0)
                                 return r;
 
                         continue;
                 }
 
-                path = path_join(syspath, p ?: de->d_name);
-                if (!path)
-                        return -ENOMEM;
-
-                if (lstat(path, &statbuf) != 0)
+                if (fstatat(dirfd(dir), de->d_name, &statbuf, AT_SYMLINK_NOFOLLOW) < 0)
                         continue;
 
                 if ((statbuf.st_mode & (S_IRUSR | S_IWUSR)) == 0)
                         continue;
 
-                r = set_put_strdup(&device->sysattrs, p ?: de->d_name);
+                if (p)
+                        r = set_ensure_consume(&device->sysattrs, &path_hash_ops_free, TAKE_PTR(p));
+                else
+                        r = set_put_strdup_full(&device->sysattrs, &path_hash_ops_free, de->d_name);
                 if (r < 0)
                         return r;
         }
@@ -1945,6 +1937,7 @@ static int device_sysattrs_read_all_internal(sd_device *device, const char *subd
 }
 
 static int device_sysattrs_read_all(sd_device *device) {
+        _cleanup_set_free_ Set *stack = NULL;
         int r;
 
         assert(device);
@@ -1952,10 +1945,22 @@ static int device_sysattrs_read_all(sd_device *device) {
         if (device->sysattrs_read)
                 return 0;
 
-        r = device_sysattrs_read_all_internal(device, NULL);
+        r = device_sysattrs_read_all_internal(device, NULL, &stack);
         if (r < 0)
                 return r;
 
+        for (;;) {
+                _cleanup_free_ char *subdir = NULL;
+
+                subdir = set_steal_first(stack);
+                if (!subdir)
+                        break;
+
+                r = device_sysattrs_read_all_internal(device, subdir, &stack);
+                if (r < 0)
+                        return r;
+        }
+
         device->sysattrs_read = true;
 
         return 0;
@@ -2437,9 +2442,9 @@ _public_ int sd_device_open(sd_device *device, int flags) {
                 }
         }
 
-        fd2 = open(FORMAT_PROC_FD_PATH(fd), flags);
+        fd2 = fd_reopen(fd, flags);
         if (fd2 < 0)
-                return -errno;
+                return fd2;
 
         if (diskseq == 0)
                 return TAKE_FD(fd2);
@@ -2453,3 +2458,33 @@ _public_ int sd_device_open(sd_device *device, int flags) {
 
         return TAKE_FD(fd2);
 }
+
+int device_opendir(sd_device *device, const char *subdir, DIR **ret) {
+        _cleanup_closedir_ DIR *d = NULL;
+        _cleanup_free_ char *path = NULL;
+        const char *syspath;
+        int r;
+
+        assert(device);
+        assert(ret);
+
+        r = sd_device_get_syspath(device, &syspath);
+        if (r < 0)
+                return r;
+
+        if (subdir) {
+                if (!path_is_safe(subdir))
+                        return -EINVAL;
+
+                path = path_join(syspath, subdir);
+                if (!path)
+                        return -ENOMEM;
+        }
+
+        d = opendir(path ?: syspath);
+        if (!d)
+                return -errno;
+
+        *ret = TAKE_PTR(d);
+        return 0;
+}

diff --git a/src/libsystemd/sd-netlink/netlink-genl.c b/src/libsystemd/sd-netlink/netlink-genl.c
index aeb4b8a68680dd52dbea8af9e8dc688099947dd8..1dc62e89ba151cc6da8fca3cd595296e49cf263f 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-genl.c
+++ b/src/libsystemd/sd-netlink/netlink-genl.c
@@ -365,7 +365,7 @@ int genl_get_policy_set_and_header_size(
         return 0;
 }
 
-_public_ int sd_genl_message_new(sd_netlink *nl, const char *family_name, uint8_t cmd, sd_netlink_message **ret) {
+int sd_genl_message_new(sd_netlink *nl, const char *family_name, uint8_t cmd, sd_netlink_message **ret) {
         const GenericNetlinkFamily *family;
         int r;
 
@@ -381,7 +381,7 @@ _public_ int sd_genl_message_new(sd_netlink *nl, const char *family_name, uint8_
         return genl_message_new(nl, family, cmd, ret);
 }
 
-_public_ int sd_genl_message_get_family_name(sd_netlink *nl, sd_netlink_message *m, const char **ret) {
+int sd_genl_message_get_family_name(sd_netlink *nl, sd_netlink_message *m, const char **ret) {
         const GenericNetlinkFamily *family;
         uint16_t nlmsg_type;
         int r;
@@ -403,7 +403,7 @@ _public_ int sd_genl_message_get_family_name(sd_netlink *nl, sd_netlink_message
         return 0;
 }
 
-_public_ int sd_genl_message_get_command(sd_netlink *nl, sd_netlink_message *m, uint8_t *ret) {
+int sd_genl_message_get_command(sd_netlink *nl, sd_netlink_message *m, uint8_t *ret) {
         struct genlmsghdr *h;
         uint16_t nlmsg_type;
         size_t size;
@@ -448,7 +448,7 @@ static int genl_family_get_multicast_group_id_by_name(const GenericNetlinkFamily
         return 0;
 }
 
-_public_ int sd_genl_add_match(
+int sd_genl_add_match(
                 sd_netlink *nl,
                 sd_netlink_slot **ret_slot,
                 const char *family_name,
@@ -483,6 +483,6 @@ _public_ int sd_genl_add_match(
                                           callback, destroy_callback, userdata, description);
 }
 
-_public_ int sd_genl_socket_open(sd_netlink **ret) {
+int sd_genl_socket_open(sd_netlink **ret) {
         return netlink_open_family(ret, NETLINK_GENERIC);
 }

diff --git a/src/libsystemd/sd-netlink/netlink-message-rtnl.c b/src/libsystemd/sd-netlink/netlink-message-rtnl.c
index c7fe031c99be68d3dee71bbae7d6c1a4818e0b75..109f3ee814d42f1feede36eacab5070e0fe9fe10 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-message-rtnl.c
+++ b/src/libsystemd/sd-netlink/netlink-message-rtnl.c
@@ -57,7 +57,7 @@ static bool rtnl_message_type_is_mdb(uint16_t type) {
         return IN_SET(type, RTM_NEWMDB, RTM_DELMDB, RTM_GETMDB);
 }
 
-_public_ int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
+int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -75,7 +75,7 @@ _public_ int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
+int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -93,7 +93,7 @@ _public_ int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_scope(sd_netlink_message *m, unsigned char scope) {
+int sd_rtnl_message_route_set_scope(sd_netlink_message *m, unsigned char scope) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -107,7 +107,7 @@ _public_ int sd_rtnl_message_route_set_scope(sd_netlink_message *m, unsigned cha
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_flags(sd_netlink_message *m, unsigned flags) {
+int sd_rtnl_message_route_set_flags(sd_netlink_message *m, unsigned flags) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -121,7 +121,7 @@ _public_ int sd_rtnl_message_route_set_flags(sd_netlink_message *m, unsigned fla
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_flags(sd_netlink_message *m, unsigned *flags) {
+int sd_rtnl_message_route_get_flags(sd_netlink_message *m, unsigned *flags) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -136,7 +136,7 @@ _public_ int sd_rtnl_message_route_get_flags(sd_netlink_message *m, unsigned *fl
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_table(sd_netlink_message *m, unsigned char table) {
+int sd_rtnl_message_route_set_table(sd_netlink_message *m, unsigned char table) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -150,7 +150,7 @@ _public_ int sd_rtnl_message_route_set_table(sd_netlink_message *m, unsigned cha
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_family(sd_netlink_message *m, int *family) {
+int sd_rtnl_message_route_get_family(sd_netlink_message *m, int *family) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -165,7 +165,7 @@ _public_ int sd_rtnl_message_route_get_family(sd_netlink_message *m, int *family
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_type(sd_netlink_message *m, unsigned char *type) {
+int sd_rtnl_message_route_get_type(sd_netlink_message *m, unsigned char *type) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -180,7 +180,7 @@ _public_ int sd_rtnl_message_route_get_type(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_type(sd_netlink_message *m, unsigned char type) {
+int sd_rtnl_message_route_set_type(sd_netlink_message *m, unsigned char type) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -194,7 +194,7 @@ _public_ int sd_rtnl_message_route_set_type(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_protocol(sd_netlink_message *m, unsigned char *protocol) {
+int sd_rtnl_message_route_get_protocol(sd_netlink_message *m, unsigned char *protocol) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -209,7 +209,7 @@ _public_ int sd_rtnl_message_route_get_protocol(sd_netlink_message *m, unsigned
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_scope(sd_netlink_message *m, unsigned char *scope) {
+int sd_rtnl_message_route_get_scope(sd_netlink_message *m, unsigned char *scope) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -224,7 +224,7 @@ _public_ int sd_rtnl_message_route_get_scope(sd_netlink_message *m, unsigned cha
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_tos(sd_netlink_message *m, uint8_t *tos) {
+int sd_rtnl_message_route_get_tos(sd_netlink_message *m, uint8_t *tos) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -239,7 +239,7 @@ _public_ int sd_rtnl_message_route_get_tos(sd_netlink_message *m, uint8_t *tos)
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_table(sd_netlink_message *m, unsigned char *table) {
+int sd_rtnl_message_route_get_table(sd_netlink_message *m, unsigned char *table) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -254,7 +254,7 @@ _public_ int sd_rtnl_message_route_get_table(sd_netlink_message *m, unsigned cha
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_dst_prefixlen(sd_netlink_message *m, unsigned char *dst_len) {
+int sd_rtnl_message_route_get_dst_prefixlen(sd_netlink_message *m, unsigned char *dst_len) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -269,7 +269,7 @@ _public_ int sd_rtnl_message_route_get_dst_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_src_prefixlen(sd_netlink_message *m, unsigned char *src_len) {
+int sd_rtnl_message_route_get_src_prefixlen(sd_netlink_message *m, unsigned char *src_len) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -284,7 +284,7 @@ _public_ int sd_rtnl_message_route_get_src_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_route(sd_netlink *rtnl, sd_netlink_message **ret,
+int sd_rtnl_message_new_route(sd_netlink *rtnl, sd_netlink_message **ret,
                               uint16_t nlmsg_type, int rtm_family,
                               unsigned char rtm_protocol) {
         struct rtmsg *rtm;
@@ -310,7 +310,7 @@ _public_ int sd_rtnl_message_new_route(sd_netlink *rtnl, sd_netlink_message **re
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **ret,
+int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **ret,
                                 uint16_t nlmsg_type, int nh_family,
                                 unsigned char nh_protocol) {
         struct nhmsg *nhm;
@@ -348,7 +348,7 @@ _public_ int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **
         return 0;
 }
 
-_public_ int sd_rtnl_message_nexthop_set_flags(sd_netlink_message *m, uint8_t flags) {
+int sd_rtnl_message_nexthop_set_flags(sd_netlink_message *m, uint8_t flags) {
         struct nhmsg *nhm;
 
         assert_return(m, -EINVAL);
@@ -361,7 +361,7 @@ _public_ int sd_rtnl_message_nexthop_set_flags(sd_netlink_message *m, uint8_t fl
         return 0;
 }
 
-_public_ int sd_rtnl_message_nexthop_get_flags(sd_netlink_message *m, uint8_t *ret) {
+int sd_rtnl_message_nexthop_get_flags(sd_netlink_message *m, uint8_t *ret) {
         struct nhmsg *nhm;
 
         assert_return(m, -EINVAL);
@@ -375,7 +375,7 @@ _public_ int sd_rtnl_message_nexthop_get_flags(sd_netlink_message *m, uint8_t *r
         return 0;
 }
 
-_public_ int sd_rtnl_message_nexthop_get_family(sd_netlink_message *m, uint8_t *family) {
+int sd_rtnl_message_nexthop_get_family(sd_netlink_message *m, uint8_t *family) {
         struct nhmsg *nhm;
 
         assert_return(m, -EINVAL);
@@ -389,7 +389,7 @@ _public_ int sd_rtnl_message_nexthop_get_family(sd_netlink_message *m, uint8_t *
         return 0;
 }
 
-_public_ int sd_rtnl_message_nexthop_get_protocol(sd_netlink_message *m, uint8_t *protocol) {
+int sd_rtnl_message_nexthop_get_protocol(sd_netlink_message *m, uint8_t *protocol) {
         struct nhmsg *nhm;
 
         assert_return(m, -EINVAL);
@@ -403,7 +403,7 @@ _public_ int sd_rtnl_message_nexthop_get_protocol(sd_netlink_message *m, uint8_t
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_set_flags(sd_netlink_message *m, uint8_t flags) {
+int sd_rtnl_message_neigh_set_flags(sd_netlink_message *m, uint8_t flags) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -416,7 +416,7 @@ _public_ int sd_rtnl_message_neigh_set_flags(sd_netlink_message *m, uint8_t flag
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_set_state(sd_netlink_message *m, uint16_t state) {
+int sd_rtnl_message_neigh_set_state(sd_netlink_message *m, uint16_t state) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -429,7 +429,7 @@ _public_ int sd_rtnl_message_neigh_set_state(sd_netlink_message *m, uint16_t sta
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_get_flags(sd_netlink_message *m, uint8_t *flags) {
+int sd_rtnl_message_neigh_get_flags(sd_netlink_message *m, uint8_t *flags) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -442,7 +442,7 @@ _public_ int sd_rtnl_message_neigh_get_flags(sd_netlink_message *m, uint8_t *fla
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_get_state(sd_netlink_message *m, uint16_t *state) {
+int sd_rtnl_message_neigh_get_state(sd_netlink_message *m, uint16_t *state) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -455,7 +455,7 @@ _public_ int sd_rtnl_message_neigh_get_state(sd_netlink_message *m, uint16_t *st
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_get_family(sd_netlink_message *m, int *family) {
+int sd_rtnl_message_neigh_get_family(sd_netlink_message *m, int *family) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -470,7 +470,7 @@ _public_ int sd_rtnl_message_neigh_get_family(sd_netlink_message *m, int *family
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_get_ifindex(sd_netlink_message *m, int *index) {
+int sd_rtnl_message_neigh_get_ifindex(sd_netlink_message *m, int *index) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -485,7 +485,7 @@ _public_ int sd_rtnl_message_neigh_get_ifindex(sd_netlink_message *m, int *index
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_neigh(
+int sd_rtnl_message_new_neigh(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -518,7 +518,7 @@ _public_ int sd_rtnl_message_new_neigh(
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flags, unsigned change) {
+int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flags, unsigned change) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -534,7 +534,7 @@ _public_ int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flag
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type) {
+int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -548,7 +548,7 @@ _public_ int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type)
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned family) {
+int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned family) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -562,7 +562,7 @@ _public_ int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned fam
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_link(sd_netlink *rtnl, sd_netlink_message **ret,
+int sd_rtnl_message_new_link(sd_netlink *rtnl, sd_netlink_message **ret,
                              uint16_t nlmsg_type, int index) {
         struct ifinfomsg *ifi;
         int r;
@@ -587,7 +587,7 @@ _public_ int sd_rtnl_message_new_link(sd_netlink *rtnl, sd_netlink_message **ret
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
+int sd_rtnl_message_addr_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -605,7 +605,7 @@ _public_ int sd_rtnl_message_addr_set_prefixlen(sd_netlink_message *m, unsigned
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_set_flags(sd_netlink_message *m, unsigned char flags) {
+int sd_rtnl_message_addr_set_flags(sd_netlink_message *m, unsigned char flags) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -619,7 +619,7 @@ _public_ int sd_rtnl_message_addr_set_flags(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_set_scope(sd_netlink_message *m, unsigned char scope) {
+int sd_rtnl_message_addr_set_scope(sd_netlink_message *m, unsigned char scope) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -633,7 +633,7 @@ _public_ int sd_rtnl_message_addr_set_scope(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_family(sd_netlink_message *m, int *ret_family) {
+int sd_rtnl_message_addr_get_family(sd_netlink_message *m, int *ret_family) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -648,7 +648,7 @@ _public_ int sd_rtnl_message_addr_get_family(sd_netlink_message *m, int *ret_fam
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_prefixlen(sd_netlink_message *m, unsigned char *ret_prefixlen) {
+int sd_rtnl_message_addr_get_prefixlen(sd_netlink_message *m, unsigned char *ret_prefixlen) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -663,7 +663,7 @@ _public_ int sd_rtnl_message_addr_get_prefixlen(sd_netlink_message *m, unsigned
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_scope(sd_netlink_message *m, unsigned char *ret_scope) {
+int sd_rtnl_message_addr_get_scope(sd_netlink_message *m, unsigned char *ret_scope) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -678,7 +678,7 @@ _public_ int sd_rtnl_message_addr_get_scope(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_flags(sd_netlink_message *m, unsigned char *ret_flags) {
+int sd_rtnl_message_addr_get_flags(sd_netlink_message *m, unsigned char *ret_flags) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -693,7 +693,7 @@ _public_ int sd_rtnl_message_addr_get_flags(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_ifindex(sd_netlink_message *m, int *ret_ifindex) {
+int sd_rtnl_message_addr_get_ifindex(sd_netlink_message *m, int *ret_ifindex) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -708,7 +708,7 @@ _public_ int sd_rtnl_message_addr_get_ifindex(sd_netlink_message *m, int *ret_if
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_addr(
+int sd_rtnl_message_new_addr(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -737,7 +737,7 @@ _public_ int sd_rtnl_message_new_addr(
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_addr_update(
+int sd_rtnl_message_new_addr_update(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 int index,
@@ -753,7 +753,7 @@ _public_ int sd_rtnl_message_new_addr_update(
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifindex) {
+int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifindex) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -768,7 +768,7 @@ _public_ int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifinde
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *flags) {
+int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *flags) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -783,7 +783,7 @@ _public_ int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *fla
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short *type) {
+int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short *type) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -798,7 +798,7 @@ _public_ int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short
         return 0;
 }
 
-_public_ int sd_rtnl_message_get_family(sd_netlink_message *m, int *family) {
+int sd_rtnl_message_get_family(sd_netlink_message *m, int *family) {
         assert_return(m, -EINVAL);
         assert_return(family, -EINVAL);
 
@@ -857,7 +857,7 @@ _public_ int sd_rtnl_message_get_family(sd_netlink_message *m, int *family) {
         return -EOPNOTSUPP;
 }
 
-_public_ int sd_rtnl_message_new_addrlabel(
+int sd_rtnl_message_new_addrlabel(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -885,7 +885,7 @@ _public_ int sd_rtnl_message_new_addrlabel(
         return 0;
 }
 
-_public_ int sd_rtnl_message_addrlabel_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
+int sd_rtnl_message_addrlabel_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
         struct ifaddrlblmsg *addrlabel;
 
         assert_return(m, -EINVAL);
@@ -902,7 +902,7 @@ _public_ int sd_rtnl_message_addrlabel_set_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_addrlabel_get_prefixlen(sd_netlink_message *m, unsigned char *prefixlen) {
+int sd_rtnl_message_addrlabel_get_prefixlen(sd_netlink_message *m, unsigned char *prefixlen) {
         struct ifaddrlblmsg *addrlabel;
 
         assert_return(m, -EINVAL);
@@ -916,7 +916,7 @@ _public_ int sd_rtnl_message_addrlabel_get_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_routing_policy_rule(
+int sd_rtnl_message_new_routing_policy_rule(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -941,7 +941,7 @@ _public_ int sd_rtnl_message_new_routing_policy_rule(
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_tos(sd_netlink_message *m, uint8_t tos) {
+int sd_rtnl_message_routing_policy_rule_set_tos(sd_netlink_message *m, uint8_t tos) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -955,7 +955,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_tos(sd_netlink_message *m,
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_tos(sd_netlink_message *m, uint8_t *tos) {
+int sd_rtnl_message_routing_policy_rule_get_tos(sd_netlink_message *m, uint8_t *tos) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -969,7 +969,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_tos(sd_netlink_message *m,
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_table(sd_netlink_message *m, uint8_t table) {
+int sd_rtnl_message_routing_policy_rule_set_table(sd_netlink_message *m, uint8_t table) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -983,7 +983,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_table(sd_netlink_message *m
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_table(sd_netlink_message *m, uint8_t *table) {
+int sd_rtnl_message_routing_policy_rule_get_table(sd_netlink_message *m, uint8_t *table) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -997,7 +997,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_table(sd_netlink_message *m
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_flags(sd_netlink_message *m, uint32_t flags) {
+int sd_rtnl_message_routing_policy_rule_set_flags(sd_netlink_message *m, uint32_t flags) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1010,7 +1010,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_flags(sd_netlink_message *m
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_flags(sd_netlink_message *m, uint32_t *flags) {
+int sd_rtnl_message_routing_policy_rule_get_flags(sd_netlink_message *m, uint32_t *flags) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1023,7 +1023,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_flags(sd_netlink_message *m
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_fib_type(sd_netlink_message *m, uint8_t type) {
+int sd_rtnl_message_routing_policy_rule_set_fib_type(sd_netlink_message *m, uint8_t type) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1037,7 +1037,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_fib_type(sd_netlink_message
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_fib_type(sd_netlink_message *m, uint8_t *type) {
+int sd_rtnl_message_routing_policy_rule_get_fib_type(sd_netlink_message *m, uint8_t *type) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1051,7 +1051,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_fib_type(sd_netlink_message
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen(sd_netlink_message *m, uint8_t len) {
+int sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen(sd_netlink_message *m, uint8_t len) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1065,7 +1065,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen(sd_netlin
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen(sd_netlink_message *m, uint8_t *len) {
+int sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen(sd_netlink_message *m, uint8_t *len) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1079,7 +1079,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen(sd_netlin
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen(sd_netlink_message *m, uint8_t len) {
+int sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen(sd_netlink_message *m, uint8_t len) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1093,7 +1093,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen(sd_netlin
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen(sd_netlink_message *m, uint8_t *len) {
+int sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen(sd_netlink_message *m, uint8_t *len) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1107,7 +1107,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen(sd_netlin
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_traffic_control(
+int sd_rtnl_message_new_traffic_control(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -1136,7 +1136,7 @@ _public_ int sd_rtnl_message_new_traffic_control(
         return 0;
 }
 
-_public_ int sd_rtnl_message_traffic_control_get_ifindex(sd_netlink_message *m, int *ret) {
+int sd_rtnl_message_traffic_control_get_ifindex(sd_netlink_message *m, int *ret) {
         struct tcmsg *tcm;
 
         assert_return(m, -EINVAL);
@@ -1150,7 +1150,7 @@ _public_ int sd_rtnl_message_traffic_control_get_ifindex(sd_netlink_message *m,
         return 0;
 }
 
-_public_ int sd_rtnl_message_traffic_control_get_handle(sd_netlink_message *m, uint32_t *ret) {
+int sd_rtnl_message_traffic_control_get_handle(sd_netlink_message *m, uint32_t *ret) {
         struct tcmsg *tcm;
 
         assert_return(m, -EINVAL);
@@ -1164,7 +1164,7 @@ _public_ int sd_rtnl_message_traffic_control_get_handle(sd_netlink_message *m, u
         return 0;
 }
 
-_public_ int sd_rtnl_message_traffic_control_get_parent(sd_netlink_message *m, uint32_t *ret) {
+int sd_rtnl_message_traffic_control_get_parent(sd_netlink_message *m, uint32_t *ret) {
         struct tcmsg *tcm;
 
         assert_return(m, -EINVAL);
@@ -1178,7 +1178,7 @@ _public_ int sd_rtnl_message_traffic_control_get_parent(sd_netlink_message *m, u
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_mdb(
+int sd_rtnl_message_new_mdb(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,

diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c
index 33bec2ac9b0cbb28de69d1acc15f630ce5551b73..000a50ee3e2558f9471408caa599ace1247b15ae 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-message.c
+++ b/src/libsystemd/sd-netlink/netlink-message.c
@@ -113,7 +113,7 @@ int message_new_synthetic_error(sd_netlink *nl, int error, uint32_t serial, sd_n
         return 0;
 }
 
-_public_ int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump) {
+int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump) {
         assert_return(m, -EINVAL);
         assert_return(m->hdr, -EINVAL);
         assert_return(m->protocol != NETLINK_ROUTE ||
@@ -129,7 +129,7 @@ _public_ int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump
 
 DEFINE_TRIVIAL_REF_FUNC(sd_netlink_message, sd_netlink_message);
 
-_public_ sd_netlink_message* sd_netlink_message_unref(sd_netlink_message *m) {
+sd_netlink_message* sd_netlink_message_unref(sd_netlink_message *m) {
         while (m && --m->n_ref == 0) {
                 unsigned i;
 
@@ -146,7 +146,7 @@ _public_ sd_netlink_message* sd_netlink_message_unref(sd_netlink_message *m) {
         return NULL;
 }
 
-_public_ int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *ret) {
+int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *ret) {
         assert_return(m, -EINVAL);
         assert_return(ret, -EINVAL);
 
@@ -155,7 +155,7 @@ _public_ int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *ret) {
         return 0;
 }
 
-_public_ int sd_netlink_message_set_flags(sd_netlink_message *m, uint16_t flags) {
+int sd_netlink_message_set_flags(sd_netlink_message *m, uint16_t flags) {
         assert_return(m, -EINVAL);
         assert_return(flags != 0, -EINVAL);
 
@@ -164,7 +164,7 @@ _public_ int sd_netlink_message_set_flags(sd_netlink_message *m, uint16_t flags)
         return 0;
 }
 
-_public_ int sd_netlink_message_is_broadcast(sd_netlink_message *m) {
+int sd_netlink_message_is_broadcast(sd_netlink_message *m) {
         assert_return(m, -EINVAL);
 
         return m->multicast_group != 0;
@@ -230,7 +230,7 @@ static int message_attribute_has_type(sd_netlink_message *m, size_t *ret_size, u
         return 0;
 }
 
-_public_ int sd_netlink_message_append_string(sd_netlink_message *m, uint16_t attr_type, const char *data) {
+int sd_netlink_message_append_string(sd_netlink_message *m, uint16_t attr_type, const char *data) {
         size_t length, size;
         int r;
 
@@ -256,7 +256,7 @@ _public_ int sd_netlink_message_append_string(sd_netlink_message *m, uint16_t at
         return 0;
 }
 
-_public_ int sd_netlink_message_append_strv(sd_netlink_message *m, uint16_t attr_type, const char* const *data) {
+int sd_netlink_message_append_strv(sd_netlink_message *m, uint16_t attr_type, const char* const *data) {
         size_t length, size;
         int r;
 
@@ -284,7 +284,7 @@ _public_ int sd_netlink_message_append_strv(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_append_flag(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_append_flag(sd_netlink_message *m, uint16_t attr_type) {
         size_t size;
         int r;
 
@@ -302,7 +302,7 @@ _public_ int sd_netlink_message_append_flag(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_append_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t data) {
+int sd_netlink_message_append_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -319,7 +319,7 @@ _public_ int sd_netlink_message_append_u8(sd_netlink_message *m, uint16_t attr_t
         return 0;
 }
 
-_public_ int sd_netlink_message_append_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t data) {
+int sd_netlink_message_append_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -336,7 +336,7 @@ _public_ int sd_netlink_message_append_u16(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t data) {
+int sd_netlink_message_append_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -353,7 +353,7 @@ _public_ int sd_netlink_message_append_u32(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_u64(sd_netlink_message *m, uint16_t attr_type, uint64_t data) {
+int sd_netlink_message_append_u64(sd_netlink_message *m, uint16_t attr_type, uint64_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -370,7 +370,7 @@ _public_ int sd_netlink_message_append_u64(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_s8(sd_netlink_message *m, uint16_t attr_type, int8_t data) {
+int sd_netlink_message_append_s8(sd_netlink_message *m, uint16_t attr_type, int8_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -387,7 +387,7 @@ _public_ int sd_netlink_message_append_s8(sd_netlink_message *m, uint16_t attr_t
         return 0;
 }
 
-_public_ int sd_netlink_message_append_s16(sd_netlink_message *m, uint16_t attr_type, int16_t data) {
+int sd_netlink_message_append_s16(sd_netlink_message *m, uint16_t attr_type, int16_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -404,7 +404,7 @@ _public_ int sd_netlink_message_append_s16(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_s32(sd_netlink_message *m, uint16_t attr_type, int32_t data) {
+int sd_netlink_message_append_s32(sd_netlink_message *m, uint16_t attr_type, int32_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -421,7 +421,7 @@ _public_ int sd_netlink_message_append_s32(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_s64(sd_netlink_message *m, uint16_t attr_type, int64_t data) {
+int sd_netlink_message_append_s64(sd_netlink_message *m, uint16_t attr_type, int64_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -438,7 +438,7 @@ _public_ int sd_netlink_message_append_s64(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_data(sd_netlink_message *m, uint16_t attr_type, const void *data, size_t len) {
+int sd_netlink_message_append_data(sd_netlink_message *m, uint16_t attr_type, const void *data, size_t len) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -451,7 +451,7 @@ _public_ int sd_netlink_message_append_data(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_append_container_data(
+int sd_netlink_message_append_container_data(
                 sd_netlink_message *m,
                 uint16_t container_type,
                 uint16_t attr_type,
@@ -493,11 +493,11 @@ int netlink_message_append_in_addr_union(sd_netlink_message *m, uint16_t attr_ty
         return 0;
 }
 
-_public_ int sd_netlink_message_append_in_addr(sd_netlink_message *m, uint16_t attr_type, const struct in_addr *data) {
+int sd_netlink_message_append_in_addr(sd_netlink_message *m, uint16_t attr_type, const struct in_addr *data) {
         return netlink_message_append_in_addr_union(m, attr_type, AF_INET, (const union in_addr_union *) data);
 }
 
-_public_ int sd_netlink_message_append_in6_addr(sd_netlink_message *m, uint16_t attr_type, const struct in6_addr *data) {
+int sd_netlink_message_append_in6_addr(sd_netlink_message *m, uint16_t attr_type, const struct in6_addr *data) {
         return netlink_message_append_in_addr_union(m, attr_type, AF_INET6, (const union in_addr_union *) data);
 }
 
@@ -520,15 +520,15 @@ int netlink_message_append_sockaddr_union(sd_netlink_message *m, uint16_t attr_t
         return 0;
 }
 
-_public_ int sd_netlink_message_append_sockaddr_in(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in *data) {
+int sd_netlink_message_append_sockaddr_in(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in *data) {
         return netlink_message_append_sockaddr_union(m, attr_type, (const union sockaddr_union *) data);
 }
 
-_public_ int sd_netlink_message_append_sockaddr_in6(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in6 *data) {
+int sd_netlink_message_append_sockaddr_in6(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in6 *data) {
         return netlink_message_append_sockaddr_union(m, attr_type, (const union sockaddr_union *) data);
 }
 
-_public_ int sd_netlink_message_append_ether_addr(sd_netlink_message *m, uint16_t attr_type, const struct ether_addr *data) {
+int sd_netlink_message_append_ether_addr(sd_netlink_message *m, uint16_t attr_type, const struct ether_addr *data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -565,7 +565,7 @@ int netlink_message_append_hw_addr(sd_netlink_message *m, uint16_t attr_type, co
         return 0;
 }
 
-_public_ int sd_netlink_message_append_cache_info(sd_netlink_message *m, uint16_t attr_type, const struct ifa_cacheinfo *info) {
+int sd_netlink_message_append_cache_info(sd_netlink_message *m, uint16_t attr_type, const struct ifa_cacheinfo *info) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -583,7 +583,7 @@ _public_ int sd_netlink_message_append_cache_info(sd_netlink_message *m, uint16_
         return 0;
 }
 
-_public_ int sd_netlink_message_open_container(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_open_container(sd_netlink_message *m, uint16_t attr_type) {
         size_t size;
         int r;
 
@@ -632,7 +632,7 @@ _public_ int sd_netlink_message_open_container(sd_netlink_message *m, uint16_t a
         return 0;
 }
 
-_public_ int sd_netlink_message_open_container_union(sd_netlink_message *m, uint16_t attr_type, const char *key) {
+int sd_netlink_message_open_container_union(sd_netlink_message *m, uint16_t attr_type, const char *key) {
         const NLAPolicySetUnion *policy_set_union;
         int r;
 
@@ -671,7 +671,7 @@ _public_ int sd_netlink_message_open_container_union(sd_netlink_message *m, uint
         return 0;
 }
 
-_public_ int sd_netlink_message_close_container(sd_netlink_message *m) {
+int sd_netlink_message_close_container(sd_netlink_message *m) {
         assert_return(m, -EINVAL);
         assert_return(!m->sealed, -EPERM);
         assert_return(m->n_containers > 0, -EINVAL);
@@ -683,7 +683,7 @@ _public_ int sd_netlink_message_close_container(sd_netlink_message *m) {
         return 0;
 }
 
-_public_ int sd_netlink_message_open_array(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_open_array(sd_netlink_message *m, uint16_t attr_type) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -701,7 +701,7 @@ _public_ int sd_netlink_message_open_array(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_cancel_array(sd_netlink_message *m) {
+int sd_netlink_message_cancel_array(sd_netlink_message *m) {
         uint32_t rta_len;
 
         assert_return(m, -EINVAL);
@@ -757,7 +757,7 @@ static int netlink_message_read_internal(
         return RTA_PAYLOAD(rta);
 }
 
-_public_ int sd_netlink_message_read(sd_netlink_message *m, uint16_t attr_type, size_t size, void *data) {
+int sd_netlink_message_read(sd_netlink_message *m, uint16_t attr_type, size_t size, void *data) {
         void *attr_data;
         int r;
 
@@ -776,7 +776,7 @@ _public_ int sd_netlink_message_read(sd_netlink_message *m, uint16_t attr_type,
         return r;
 }
 
-_public_ int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) {
+int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) {
         void *attr_data;
         int r;
 
@@ -802,7 +802,7 @@ _public_ int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_t
         return r;
 }
 
-_public_ int sd_netlink_message_read_data_suffix0(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) {
+int sd_netlink_message_read_data_suffix0(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) {
         void *attr_data;
         int r;
 
@@ -828,7 +828,7 @@ _public_ int sd_netlink_message_read_data_suffix0(sd_netlink_message *m, uint16_
         return r;
 }
 
-_public_ int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16_t attr_type, char **data) {
+int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16_t attr_type, char **data) {
         void *attr_data;
         int r;
 
@@ -855,7 +855,7 @@ _public_ int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16
         return 0;
 }
 
-_public_ int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr_type, const char **data) {
+int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr_type, const char **data) {
         void *attr_data;
         int r;
 
@@ -878,7 +878,7 @@ _public_ int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_read_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t *data) {
+int sd_netlink_message_read_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t *data) {
         void *attr_data;
         int r;
 
@@ -901,7 +901,7 @@ _public_ int sd_netlink_message_read_u8(sd_netlink_message *m, uint16_t attr_typ
         return 0;
 }
 
-_public_ int sd_netlink_message_read_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t *data) {
+int sd_netlink_message_read_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t *data) {
         void *attr_data;
         bool net_byteorder;
         int r;
@@ -929,7 +929,7 @@ _public_ int sd_netlink_message_read_u16(sd_netlink_message *m, uint16_t attr_ty
         return 0;
 }
 
-_public_ int sd_netlink_message_read_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t *data) {
+int sd_netlink_message_read_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t *data) {
         void *attr_data;
         bool net_byteorder;
         int r;
@@ -957,7 +957,7 @@ _public_ int sd_netlink_message_read_u32(sd_netlink_message *m, uint16_t attr_ty
         return 0;
 }
 
-_public_ int sd_netlink_message_read_ether_addr(sd_netlink_message *m, uint16_t attr_type, struct ether_addr *data) {
+int sd_netlink_message_read_ether_addr(sd_netlink_message *m, uint16_t attr_type, struct ether_addr *data) {
         void *attr_data;
         int r;
 
@@ -1005,7 +1005,7 @@ int netlink_message_read_hw_addr(sd_netlink_message *m, uint16_t attr_type, stru
         return 0;
 }
 
-_public_ int sd_netlink_message_read_cache_info(sd_netlink_message *m, uint16_t attr_type, struct ifa_cacheinfo *info) {
+int sd_netlink_message_read_cache_info(sd_netlink_message *m, uint16_t attr_type, struct ifa_cacheinfo *info) {
         void *attr_data;
         int r;
 
@@ -1052,7 +1052,7 @@ int netlink_message_read_in_addr_union(sd_netlink_message *m, uint16_t attr_type
         return 0;
 }
 
-_public_ int sd_netlink_message_read_in_addr(sd_netlink_message *m, uint16_t attr_type, struct in_addr *data) {
+int sd_netlink_message_read_in_addr(sd_netlink_message *m, uint16_t attr_type, struct in_addr *data) {
         union in_addr_union u;
         int r;
 
@@ -1063,7 +1063,7 @@ _public_ int sd_netlink_message_read_in_addr(sd_netlink_message *m, uint16_t att
         return r;
 }
 
-_public_ int sd_netlink_message_read_in6_addr(sd_netlink_message *m, uint16_t attr_type, struct in6_addr *data) {
+int sd_netlink_message_read_in6_addr(sd_netlink_message *m, uint16_t attr_type, struct in6_addr *data) {
         union in_addr_union u;
         int r;
 
@@ -1074,7 +1074,7 @@ _public_ int sd_netlink_message_read_in6_addr(sd_netlink_message *m, uint16_t at
         return r;
 }
 
-_public_ int sd_netlink_message_has_flag(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_has_flag(sd_netlink_message *m, uint16_t attr_type) {
         void *attr_data;
         int r;
 
@@ -1095,7 +1095,7 @@ _public_ int sd_netlink_message_has_flag(sd_netlink_message *m, uint16_t attr_ty
         return 1;
 }
 
-_public_ int sd_netlink_message_read_strv(sd_netlink_message *m, uint16_t container_type, uint16_t attr_type, char ***ret) {
+int sd_netlink_message_read_strv(sd_netlink_message *m, uint16_t container_type, uint16_t attr_type, char ***ret) {
         _cleanup_strv_free_ char **s = NULL;
         const NLAPolicySet *policy_set;
         const NLAPolicy *policy;
@@ -1192,7 +1192,7 @@ static int netlink_container_parse(
         return 0;
 }
 
-_public_ int sd_netlink_message_enter_container(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_enter_container(sd_netlink_message *m, uint16_t attr_type) {
         const NLAPolicy *policy;
         const NLAPolicySet *policy_set;
         void *container;
@@ -1279,7 +1279,7 @@ _public_ int sd_netlink_message_enter_container(sd_netlink_message *m, uint16_t
         return 0;
 }
 
-_public_ int sd_netlink_message_enter_array(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_enter_array(sd_netlink_message *m, uint16_t attr_type) {
         void *container;
         size_t size;
         int r;
@@ -1308,7 +1308,7 @@ _public_ int sd_netlink_message_enter_array(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_exit_container(sd_netlink_message *m) {
+int sd_netlink_message_exit_container(sd_netlink_message *m) {
         assert_return(m, -EINVAL);
         assert_return(m->sealed, -EINVAL);
         assert_return(m->n_containers > 0, -EINVAL);
@@ -1322,7 +1322,7 @@ _public_ int sd_netlink_message_exit_container(sd_netlink_message *m) {
         return 0;
 }
 
-_public_ int sd_netlink_message_get_max_attribute(sd_netlink_message *m, uint16_t *ret) {
+int sd_netlink_message_get_max_attribute(sd_netlink_message *m, uint16_t *ret) {
         assert_return(m, -EINVAL);
         assert_return(m->sealed, -EINVAL);
         assert_return(ret, -EINVAL);
@@ -1331,14 +1331,14 @@ _public_ int sd_netlink_message_get_max_attribute(sd_netlink_message *m, uint16_
         return 0;
 }
 
-_public_ int sd_netlink_message_is_error(sd_netlink_message *m) {
+int sd_netlink_message_is_error(sd_netlink_message *m) {
         assert_return(m, 0);
         assert_return(m->hdr, 0);
 
         return m->hdr->nlmsg_type == NLMSG_ERROR;
 }
 
-_public_ int sd_netlink_message_get_errno(sd_netlink_message *m) {
+int sd_netlink_message_get_errno(sd_netlink_message *m) {
         struct nlmsgerr *err;
 
         assert_return(m, -EINVAL);
@@ -1373,7 +1373,7 @@ static int netlink_message_parse_error(sd_netlink_message *m) {
                                        NLMSG_PAYLOAD(m->hdr, hlen));
 }
 
-_public_ int sd_netlink_message_rewind(sd_netlink_message *m, sd_netlink *nl) {
+int sd_netlink_message_rewind(sd_netlink_message *m, sd_netlink *nl) {
         size_t size;
         int r;
 

diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index b1a684a9af68b72f852658ddc289ebae41d3d939..feb751a84848f3159984f1c7170f982439810204 100644 (file)
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -69,7 +69,7 @@ static int netlink_new(sd_netlink **ret) {
         return 0;
 }
 
-_public_ int sd_netlink_open_fd(sd_netlink **ret, int fd) {
+int sd_netlink_open_fd(sd_netlink **ret, int fd) {
         _cleanup_(sd_netlink_unrefp) sd_netlink *nl = NULL;
         int r, protocol;
 
@@ -107,11 +107,11 @@ _public_ int sd_netlink_open_fd(sd_netlink **ret, int fd) {
         return 0;
 }
 
-_public_ int sd_netlink_open(sd_netlink **ret) {
+int sd_netlink_open(sd_netlink **ret) {
         return netlink_open_family(ret, NETLINK_ROUTE);
 }
 
-_public_ int sd_netlink_increase_rxbuf(sd_netlink *nl, size_t size) {
+int sd_netlink_increase_rxbuf(sd_netlink *nl, size_t size) {
         assert_return(nl, -EINVAL);
         assert_return(!netlink_pid_changed(nl), -ECHILD);
 
@@ -155,7 +155,7 @@ static sd_netlink *netlink_free(sd_netlink *nl) {
 
 DEFINE_TRIVIAL_REF_UNREF_FUNC(sd_netlink, sd_netlink, netlink_free);
 
-_public_ int sd_netlink_send(
+int sd_netlink_send(
                 sd_netlink *nl,
                 sd_netlink_message *message,
                 uint32_t *serial) {
@@ -485,7 +485,7 @@ static int timeout_compare(const void *a, const void *b) {
         return CMP(x->timeout, y->timeout);
 }
 
-_public_ int sd_netlink_call_async(
+int sd_netlink_call_async(
                 sd_netlink *nl,
                 sd_netlink_slot **ret_slot,
                 sd_netlink_message *m,
@@ -550,7 +550,7 @@ _public_ int sd_netlink_call_async(
         return k;
 }
 
-_public_ int sd_netlink_read(
+int sd_netlink_read(
                 sd_netlink *nl,
                 uint32_t serial,
                 uint64_t usec,
@@ -627,7 +627,7 @@ _public_ int sd_netlink_read(
         }
 }
 
-_public_ int sd_netlink_call(
+int sd_netlink_call(
                 sd_netlink *nl,
                 sd_netlink_message *message,
                 uint64_t usec,
@@ -647,14 +647,14 @@ _public_ int sd_netlink_call(
         return sd_netlink_read(nl, serial, usec, ret);
 }
 
-_public_ int sd_netlink_get_events(sd_netlink *nl) {
+int sd_netlink_get_events(sd_netlink *nl) {
         assert_return(nl, -EINVAL);
         assert_return(!netlink_pid_changed(nl), -ECHILD);
 
         return nl->rqueue_size == 0 ? POLLIN : 0;
 }
 
-_public_ int sd_netlink_get_timeout(sd_netlink *nl, uint64_t *timeout_usec) {
+int sd_netlink_get_timeout(sd_netlink *nl, uint64_t *timeout_usec) {
         struct reply_callback *c;
 
         assert_return(nl, -EINVAL);
@@ -731,7 +731,7 @@ static int prepare_callback(sd_event_source *s, void *userdata) {
         return 1;
 }
 
-_public_ int sd_netlink_attach_event(sd_netlink *nl, sd_event *event, int64_t priority) {
+int sd_netlink_attach_event(sd_netlink *nl, sd_event *event, int64_t priority) {
         int r;
 
         assert_return(nl, -EINVAL);
@@ -783,7 +783,7 @@ fail:
         return r;
 }
 
-_public_ int sd_netlink_detach_event(sd_netlink *nl) {
+int sd_netlink_detach_event(sd_netlink *nl) {
         assert_return(nl, -EINVAL);
         assert_return(nl->event, -ENXIO);
 
@@ -846,7 +846,7 @@ int netlink_add_match_internal(
         return 0;
 }
 
-_public_ int sd_netlink_add_match(
+int sd_netlink_add_match(
                 sd_netlink *rtnl,
                 sd_netlink_slot **ret_slot,
                 uint16_t type,
@@ -916,7 +916,7 @@ _public_ int sd_netlink_add_match(
                                           destroy_callback, userdata, description);
 }
 
-_public_ int sd_netlink_attach_filter(sd_netlink *nl, size_t len, const struct sock_filter *filter) {
+int sd_netlink_attach_filter(sd_netlink *nl, size_t len, const struct sock_filter *filter) {
         assert_return(nl, -EINVAL);
         assert_return(len == 0 || filter, -EINVAL);
 

diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index dc6a0d5407567248acb08e36841d27f369e73820..acf0f20d8590e921fb6e4ea31ff680b93f4a7ecd 100644 (file)
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -188,7 +188,7 @@ static int session_device_start(SessionDevice *sd) {
 
                 /* For evdev devices, the file descriptor might be left uninitialized. This might happen while resuming
                  * into a session and logind has been restarted right before. */
-                CLOSE_AND_REPLACE(sd->fd, r);
+                close_and_replace(sd->fd, r);
                 break;
 
         case DEVICE_TYPE_UNKNOWN:

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 44fcdaae8194a7448f41c58596007cdf45deae44..8a3b1efb4ce407dc92e9cc28d3a3db4b2c1da63c 100644 (file)
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -125,7 +125,6 @@ static int parse_argv(int argc, char *argv[]) {
 
 static int run(int argc, char *argv[]) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *unlink_dir = NULL;
         sd_id128_t id;
         int r;
@@ -148,8 +147,7 @@ static int run(int argc, char *argv[]) {
                                 DISSECT_IMAGE_FSCK |
                                 DISSECT_IMAGE_GROWFS,
                                 &unlink_dir,
-                                &loop_device,
-                                &decrypted_image);
+                                &loop_device);
                 if (r < 0)
                         return r;
 

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 44e5c509a80960347a2f26df028f308f8a7b10d2..056d4f1bc5dd300b58d417ff87de30b0afd59f29 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1627,9 +1627,9 @@ static int parse_argv(int argc, char *argv[]) {
                         if (r == -ENOMEM)
                                 return log_oom();
                         if (r < 0)
-                                return log_error_errno(r, "Failed to parse --set-credential= parameter: %m");
+                                return log_error_errno(r, "Failed to parse --load-credential= parameter: %m");
                         if (r == 0 || !p)
-                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for --set-credential=: %s", optarg);
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for --load-credential=: %s", optarg);
 
                         if (!credential_name_valid(word))
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Credential name is not valid: %s", word);
@@ -5443,7 +5443,6 @@ static int run(int argc, char *argv[]) {
         _cleanup_(release_lock_file) LockFile tree_global_lock = LOCK_FILE_INIT, tree_local_lock = LOCK_FILE_INIT;
         char tmprootdir[] = "/tmp/nspawn-root-XXXXXX";
         _cleanup_(loop_device_unrefp) LoopDevice *loop = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(dissected_image_unrefp) DissectedImage *dissected_image = NULL;
         _cleanup_(fw_ctx_freep) FirewallContext *fw_ctx = NULL;
         pid_t pid = 0;
@@ -5786,8 +5785,7 @@ static int run(int argc, char *argv[]) {
                                 dissected_image,
                                 NULL,
                                 &arg_verity_settings,
-                                0,
-                                &decrypted_image);
+                                0);
                 if (r < 0)
                         goto finish;
 

diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index b6979b7e4f72824134a4541794c5bed83f77927f..e8aa813bda06c2a1f1298756a98a3987e983e2a4 100644 (file)
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -65,7 +65,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to generate UUID for file system: %m");
 
-        return make_filesystem(device, fstype, basename(device), uuid, true);
+        return make_filesystem(device, fstype, basename(device), NULL, uuid, true);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 301a91d9378f1b61337fd0b99b517134d31c48f3..413d136fe9cc4c380265f34d85c11ff93c0ed395 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -55,6 +55,7 @@
 #include "process-util.h"
 #include "random-util.h"
 #include "resize-fs.h"
+#include "rm-rf.h"
 #include "sort-util.h"
 #include "specifier.h"
 #include "stdio-util.h"
@@ -62,6 +63,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "sync-util.h"
+#include "tmpfile-util.h"
 #include "terminal-util.h"
 #include "tpm-pcr.h"
 #include "tpm2-util.h"
@@ -3168,11 +3170,11 @@ static int context_copy_blocks(Context *context) {
         return 0;
 }
 
-static int do_copy_files(Partition *p, const char *fs) {
+static int do_copy_files(Partition *p, const char *root) {
         int r;
 
         assert(p);
-        assert(fs);
+        assert(root);
 
         STRV_FOREACH_PAIR(source, target, p->copy_files) {
                 _cleanup_close_ int sfd = -1, pfd = -1, tfd = -1;
@@ -3187,7 +3189,7 @@ static int do_copy_files(Partition *p, const char *fs) {
                                 return log_error_errno(r, "Failed to check type of source file '%s': %m", *source);
 
                         /* We are looking at a directory */
-                        tfd = chase_symlinks_and_open(*target, fs, CHASE_PREFIX_ROOT|CHASE_WARN, O_RDONLY|O_DIRECTORY|O_CLOEXEC, NULL);
+                        tfd = chase_symlinks_and_open(*target, root, CHASE_PREFIX_ROOT|CHASE_WARN, O_RDONLY|O_DIRECTORY|O_CLOEXEC, NULL);
                         if (tfd < 0) {
                                 _cleanup_free_ char *dn = NULL, *fn = NULL;
 
@@ -3202,11 +3204,11 @@ static int do_copy_files(Partition *p, const char *fs) {
                                 if (r < 0)
                                         return log_error_errno(r, "Failed to extract directory from '%s': %m", *target);
 
-                                r = mkdir_p_root(fs, dn, UID_INVALID, GID_INVALID, 0755);
+                                r = mkdir_p_root(root, dn, UID_INVALID, GID_INVALID, 0755);
                                 if (r < 0)
                                         return log_error_errno(r, "Failed to create parent directory '%s': %m", dn);
 
-                                pfd = chase_symlinks_and_open(dn, fs, CHASE_PREFIX_ROOT|CHASE_WARN, O_RDONLY|O_DIRECTORY|O_CLOEXEC, NULL);
+                                pfd = chase_symlinks_and_open(dn, root, CHASE_PREFIX_ROOT|CHASE_WARN, O_RDONLY|O_DIRECTORY|O_CLOEXEC, NULL);
                                 if (pfd < 0)
                                         return log_error_errno(pfd, "Failed to open parent directory of target: %m");
 
@@ -3239,11 +3241,11 @@ static int do_copy_files(Partition *p, const char *fs) {
                         if (r < 0)
                                 return log_error_errno(r, "Failed to extract directory from '%s': %m", *target);
 
-                        r = mkdir_p_root(fs, dn, UID_INVALID, GID_INVALID, 0755);
+                        r = mkdir_p_root(root, dn, UID_INVALID, GID_INVALID, 0755);
                         if (r < 0)
                                 return log_error_errno(r, "Failed to create parent directory: %m");
 
-                        pfd = chase_symlinks_and_open(dn, fs, CHASE_PREFIX_ROOT|CHASE_WARN, O_RDONLY|O_DIRECTORY|O_CLOEXEC, NULL);
+                        pfd = chase_symlinks_and_open(dn, root, CHASE_PREFIX_ROOT|CHASE_WARN, O_RDONLY|O_DIRECTORY|O_CLOEXEC, NULL);
                         if (pfd < 0)
                                 return log_error_errno(pfd, "Failed to open parent directory of target: %m");
 
@@ -3264,15 +3266,15 @@ static int do_copy_files(Partition *p, const char *fs) {
         return 0;
 }
 
-static int do_make_directories(Partition *p, const char *fs) {
+static int do_make_directories(Partition *p, const char *root) {
         int r;
 
         assert(p);
-        assert(fs);
+        assert(root);
 
         STRV_FOREACH(d, p->make_directories) {
 
-                r = mkdir_p_root(fs, *d, UID_INVALID, GID_INVALID, 0755);
+                r = mkdir_p_root(root, *d, UID_INVALID, GID_INVALID, 0755);
                 if (r < 0)
                         return log_error_errno(r, "Failed to create directory '%s' in file system: %m", *d);
         }
@@ -3280,12 +3282,67 @@ static int do_make_directories(Partition *p, const char *fs) {
         return 0;
 }
 
-static int partition_populate(Partition *p, const char *node) {
+static int partition_populate_directory(Partition *p, char **ret_root, char **ret_tmp_root) {
+        _cleanup_(rm_rf_physical_and_freep) char *root = NULL;
+        int r;
+
+        assert(ret_root);
+        assert(ret_tmp_root);
+
+        /* When generating squashfs, we need the source tree to be available when we generate the squashfs
+         * filesystem. Because we might have multiple source trees, we build a temporary source tree
+         * beforehand where we merge all our inputs. We then use this merged source tree to create the
+         * squashfs filesystem. */
+
+        if (!streq(p->format, "squashfs")) {
+                *ret_root = NULL;
+                *ret_tmp_root = NULL;
+                return 0;
+        }
+
+        /* If we only have a single directory that's meant to become the root directory of the filesystem,
+         * we can shortcut this function and just use that directory as the root directory instead. If we
+         * allocate a temporary directory, it's stored in "ret_tmp_root" to indicate it should be removed.
+         * Otherwise, we return the directory to use in "root" to indicate it should not be removed. */
+
+        if (strv_length(p->copy_files) == 2 && strv_length(p->make_directories) == 0 && streq(p->copy_files[1], "/")) {
+                _cleanup_free_ char *s = NULL;
+
+                s = strdup(p->copy_files[0]);
+                if (!s)
+                        return log_oom();
+
+                *ret_root = TAKE_PTR(s);
+                *ret_tmp_root = NULL;
+                return 0;
+        }
+
+        r = mkdtemp_malloc("/var/tmp/repart-XXXXXX", &root);
+        if (r < 0)
+                return log_error_errno(r, "Failed to create temporary directory: %m");
+
+        r = do_copy_files(p, root);
+        if (r < 0)
+                return r;
+
+        r = do_make_directories(p, root);
+        if (r < 0)
+                return r;
+
+        *ret_root = NULL;
+        *ret_tmp_root = TAKE_PTR(root);
+        return 0;
+}
+
+static int partition_populate_filesystem(Partition *p, const char *node) {
         int r;
 
         assert(p);
         assert(node);
 
+        if (streq(p->format, "squashfs"))
+                return 0;
+
         if (strv_isempty(p->copy_files) && strv_isempty(p->make_directories))
                 return 0;
 
@@ -3340,7 +3397,8 @@ static int context_mkfs(Context *context) {
         LIST_FOREACH(partitions, p, context->partitions) {
                 _cleanup_(sym_crypt_freep) struct crypt_device *cd = NULL;
                 _cleanup_(loop_device_unrefp) LoopDevice *d = NULL;
-                _cleanup_free_ char *encrypted = NULL;
+                _cleanup_(rm_rf_physical_and_freep) char *tmp_root = NULL;
+                _cleanup_free_ char *encrypted = NULL, *root = NULL;
                 _cleanup_close_ int encrypted_dev_fd = -1;
                 const char *fsdev;
                 sd_id128_t fs_uuid;
@@ -3387,7 +3445,16 @@ static int context_mkfs(Context *context) {
                 if (r < 0)
                         return r;
 
-                r = make_filesystem(fsdev, p->format, strempty(p->new_label), fs_uuid, arg_discard);
+                /* Ideally, we populate filesystems using our own code after creating the filesystem to
+                 * ensure consistent handling of chattrs, xattrs and other similar things. However, when
+                 * using squashfs, we can't populate after creating the filesystem because it's read-only, so
+                 * instead we create a temporary root to use as the source tree when generating the squashfs
+                 * filesystem. */
+                r = partition_populate_directory(p, &root, &tmp_root);
+                if (r < 0)
+                        return r;
+
+                r = make_filesystem(fsdev, p->format, strempty(p->new_label), root ?: tmp_root, fs_uuid, arg_discard);
                 if (r < 0) {
                         encrypted_dev_fd = safe_close(encrypted_dev_fd);
                         (void) deactivate_luks(cd, encrypted);
@@ -3401,7 +3468,8 @@ static int context_mkfs(Context *context) {
                         if (flock(encrypted_dev_fd, LOCK_UN) < 0)
                                 return log_error_errno(errno, "Failed to unlock LUKS device: %m");
 
-                r = partition_populate(p, fsdev);
+                /* Now, we can populate all the other filesystems that aren't squashfs. */
+                r = partition_populate_filesystem(p, fsdev);
                 if (r < 0) {
                         encrypted_dev_fd = safe_close(encrypted_dev_fd);
                         (void) deactivate_luks(cd, encrypted);
@@ -5257,7 +5325,6 @@ static int determine_auto_size(Context *c) {
 
 static int run(int argc, char *argv[]) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
         _cleanup_(context_freep) Context* context = NULL;
         _cleanup_free_ char *node = NULL;
@@ -5299,8 +5366,7 @@ static int run(int argc, char *argv[]) {
                                 DISSECT_IMAGE_USR_NO_ROOT |
                                 DISSECT_IMAGE_REQUIRE_ROOT,
                                 &mounted_dir,
-                                &loop_device,
-                                &decrypted_image);
+                                &loop_device);
                 if (r < 0)
                         return r;
 

diff --git a/src/shared/blockdev-util.c b/src/shared/blockdev-util.c
index e5abb524d5ea6c4bf3c77ee265f2fad9a07dd375..4402b7a97c05551a4454bf20c9d1279190ad6588 100644 (file)
--- a/src/shared/blockdev-util.c
+++ b/src/shared/blockdev-util.c
@@ -20,6 +20,55 @@
 #include "missing_magic.h"
 #include "parse-util.h"
 
+int block_device_is_whole_disk(sd_device *dev) {
+        const char *s;
+        int r;
+
+        assert(dev);
+
+        r = sd_device_get_subsystem(dev, &s);
+        if (r < 0)
+                return r;
+
+        if (!streq(s, "block"))
+                return -ENOTBLK;
+
+        r = sd_device_get_devtype(dev, &s);
+        if (r < 0)
+                return r;
+
+        return streq(s, "disk");
+}
+
+int block_device_get_whole_disk(sd_device *dev, sd_device **ret) {
+        int r;
+
+        assert(dev);
+        assert(ret);
+
+        /* Do not unref returned sd_device object. */
+
+        r = block_device_is_whole_disk(dev);
+        if (r < 0)
+                return r;
+        if (r == 0) {
+                r = sd_device_get_parent(dev, &dev);
+                if (r == -ENOENT) /* Already removed? Let's return a recognizable error. */
+                        return -ENODEV;
+                if (r < 0)
+                        return r;
+
+                r = block_device_is_whole_disk(dev);
+                if (r < 0)
+                        return r;
+                if (r == 0)
+                        return -ENXIO;
+        }
+
+        *ret = dev;
+        return 0;
+}
+
 int block_get_whole_disk(dev_t d, dev_t *ret) {
         char p[SYS_BLOCK_PATH_MAX("/partition")];
         _cleanup_free_ char *s = NULL;
@@ -82,7 +131,21 @@ int get_block_device_fd(int fd, dev_t *ret) {
                 return 1;
         }
 
-        r = btrfs_get_block_device_fd(fd, ret);
+        r = fcntl(fd, F_GETFL);
+        if (r < 0)
+                return -errno;
+        if (FLAGS_SET(r, O_PATH) && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode))) {
+                _cleanup_close_ int real_fd = -1;
+
+                /* The fstat() above we can execute on an O_PATH fd. But the btrfs ioctl we cannot. Hence
+                 * acquire a "real" fd first, without the O_PATH flag. */
+
+                real_fd = fd_reopen(fd, O_RDONLY|O_CLOEXEC);
+                if (real_fd < 0)
+                        return real_fd;
+                r = btrfs_get_block_device_fd(real_fd, ret);
+        } else
+                r = btrfs_get_block_device_fd(fd, ret);
         if (r > 0)
                 return 1;
         if (r != -ENOTTY) /* not btrfs */
@@ -518,19 +581,12 @@ int partition_enumerator_new(sd_device *dev, sd_device_enumerator **ret) {
         assert(dev);
         assert(ret);
 
-        r = sd_device_get_subsystem(dev, &s);
-        if (r < 0)
-                return r;
-
-        if (!streq(s, "block"))
-                return -ENOTBLK;
-
-        r = sd_device_get_devtype(dev, &s);
+        /* Refuse invocation on partition block device, insist on "whole" device */
+        r = block_device_is_whole_disk(dev);
         if (r < 0)
                 return r;
-
-        if (!streq(s, "disk")) /* Refuse invocation on partition block device, insist on "whole" device */
-                return -EINVAL;
+        if (r == 0)
+                return -ENXIO; /* return a recognizable error */
 
         r = sd_device_enumerator_new(&e);
         if (r < 0)

diff --git a/src/shared/blockdev-util.h b/src/shared/blockdev-util.h
index 550b2786d2a32e09e81354572279c9572073f131..1f612157fc55dfd5527de07fb8236cc3e219b4f2 100644 (file)
--- a/src/shared/blockdev-util.h
+++ b/src/shared/blockdev-util.h
@@ -14,6 +14,9 @@
 #define xsprintf_sys_block_path(buf, suffix, devno)                     \
         xsprintf(buf, "/sys/dev/block/%u:%u%s", major(devno), minor(devno), strempty(suffix))
 
+int block_device_is_whole_disk(sd_device *dev);
+int block_device_get_whole_disk(sd_device *dev, sd_device **ret);
+
 int block_get_whole_disk(dev_t d, dev_t *ret);
 int block_get_originating(dev_t d, dev_t *ret);
 

diff --git a/src/shared/cryptsetup-util.h b/src/shared/cryptsetup-util.h
index fc80edb4112a5084293e9448229b002d5d9b1594..b1ce07ec8a50c1254ffed06045ee7c5aa54ef486 100644 (file)
--- a/src/shared/cryptsetup-util.h
+++ b/src/shared/cryptsetup-util.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "alloc-util.h"
 #include "json.h"
 #include "macro.h"
 
@@ -69,6 +70,10 @@ int dlopen_cryptsetup(void);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, crypt_free, NULL);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, sym_crypt_free, NULL);
 
+/* Be careful, this works with dlopen_cryptsetup(), that is, it calls sym_crypt_free() instead of crypt_free(). */
+#define crypt_free_and_replace(a, b)                    \
+        free_and_replace_full(a, b, sym_crypt_free)
+
 void cryptsetup_enable_logging(struct crypt_device *cd);
 
 int cryptsetup_set_minimal_pbkdf(struct crypt_device *cd);

diff --git a/src/shared/data-fd-util.c b/src/shared/data-fd-util.c
index 6ae3f115350f9754048fe7e593ce24bd0a269241..b6eb3d9f4185017d4a44dc50733879a9af84e025 100644 (file)
--- a/src/shared/data-fd-util.c
+++ b/src/shared/data-fd-util.c
@@ -298,7 +298,7 @@ int copy_data_fd(int fd) {
                 if (f != 0)
                         return -errno;
 
-                CLOSE_AND_REPLACE(copy_fd, tmp_fd);
+                close_and_replace(copy_fd, tmp_fd);
 
                 remains = mfree(remains);
                 remains_size = 0;

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 241b191c876afe3399ddb2ffe0f99859d52c925b..a7eec9fa11d42dfd18c460f5e5d882f77269cbd2 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -153,6 +153,48 @@ static void check_partition_flags(
 }
 #endif
 
+#if HAVE_BLKID
+static int dissected_image_new(const char *path, DissectedImage **ret) {
+        _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
+        _cleanup_free_ char *name = NULL;
+        int r;
+
+        assert(ret);
+
+        if (path) {
+                _cleanup_free_ char *filename = NULL;
+
+                r = path_extract_filename(path, &filename);
+                if (r < 0)
+                        return r;
+
+                r = raw_strip_suffixes(filename, &name);
+                if (r < 0)
+                        return r;
+
+                if (!image_name_is_valid(name)) {
+                        log_debug("Image name %s is not valid, ignoring.", strna(name));
+                        name = mfree(name);
+                }
+        }
+
+        m = new(DissectedImage, 1);
+        if (!m)
+                return -ENOMEM;
+
+        *m = (DissectedImage) {
+                .has_init_system = -1,
+                .image_name = TAKE_PTR(name),
+        };
+
+        for (PartitionDesignator i = 0; i < _PARTITION_DESIGNATOR_MAX; i++)
+                m->partitions[i] = DISSECTED_PARTITION_NULL;
+
+        *ret = TAKE_PTR(m);
+        return 0;
+}
+#endif
+
 static void dissected_partition_done(DissectedPartition *p) {
         assert(p);
 
@@ -163,10 +205,7 @@ static void dissected_partition_done(DissectedPartition *p) {
         free(p->decrypted_node);
         free(p->mount_options);
 
-        *p = (DissectedPartition) {
-                .partno = -1,
-                .architecture = _ARCHITECTURE_INVALID,
-        };
+        *p = DISSECTED_PARTITION_NULL;
 }
 
 #if HAVE_BLKID
@@ -287,30 +326,9 @@ int dissect_image(
         if (r != 0)
                 return errno_or_else(EIO);
 
-        m = new(DissectedImage, 1);
-        if (!m)
-                return -ENOMEM;
-
-        *m = (DissectedImage) {
-                .has_init_system = -1,
-        };
-
-        if (image_path) {
-                _cleanup_free_ char *extracted_filename = NULL, *name_stripped = NULL;
-
-                r = path_extract_filename(image_path, &extracted_filename);
-                if (r < 0)
-                        return r;
-
-                r = raw_strip_suffixes(extracted_filename, &name_stripped);
-                if (r < 0)
-                        return r;
-
-                if (!image_name_is_valid(name_stripped))
-                        log_debug("Image name %s is not valid, ignoring.", strna(name_stripped));
-                else
-                        m->image_name = TAKE_PTR(name_stripped);
-        }
+        r = dissected_image_new(image_path, &m);
+        if (r < 0)
+                return r;
 
         if ((!(flags & DISSECT_IMAGE_GPT_ONLY) &&
             (flags & DISSECT_IMAGE_GENERIC_ROOT)) ||
@@ -1127,9 +1145,18 @@ DissectedImage* dissected_image_unref(DissectedImage *m) {
         if (!m)
                 return NULL;
 
+        /* First, clear dissected partitions. */
         for (PartitionDesignator i = 0; i < _PARTITION_DESIGNATOR_MAX; i++)
                 dissected_partition_done(m->partitions + i);
 
+        /* Second, free decrypted images. This must be after dissected_partition_done(), as freeing
+         * DecryptedImage may try to deactivate partitions. */
+        decrypted_image_unref(m->decrypted_image);
+
+        /* Third, unref LoopDevice. This must be called after the above two, as freeing LoopDevice may try to
+         * remove existing partitions on the loopback block device. */
+        loop_device_unref(m->loop);
+
         free(m->image_name);
         free(m->hostname);
         strv_free(m->machine_info);
@@ -1559,19 +1586,22 @@ int dissected_image_mount_and_warn(
 }
 
 #if HAVE_LIBCRYPTSETUP
-typedef struct DecryptedPartition {
+struct DecryptedPartition {
         struct crypt_device *device;
         char *name;
         bool relinquished;
-} DecryptedPartition;
+};
+#endif
+
+typedef struct DecryptedPartition DecryptedPartition;
 
 struct DecryptedImage {
+        unsigned n_ref;
         DecryptedPartition *decrypted;
         size_t n_decrypted;
 };
-#endif
 
-DecryptedImage* decrypted_image_unref(DecryptedImage* d) {
+static DecryptedImage* decrypted_image_free(DecryptedImage *d) {
 #if HAVE_LIBCRYPTSETUP
         int r;
 
@@ -1582,7 +1612,8 @@ DecryptedImage* decrypted_image_unref(DecryptedImage* d) {
                 DecryptedPartition *p = d->decrypted + i;
 
                 if (p->device && p->name && !p->relinquished) {
-                        r = sym_crypt_deactivate_by_name(p->device, p->name, 0);
+                        /* Let's deactivate lazily, as the dm volume may be already/still used by other processes. */
+                        r = sym_crypt_deactivate_by_name(p->device, p->name, CRYPT_DEACTIVATE_DEFERRED);
                         if (r < 0)
                                 log_debug_errno(r, "Failed to deactivate encrypted partition %s", p->name);
                 }
@@ -1598,7 +1629,25 @@ DecryptedImage* decrypted_image_unref(DecryptedImage* d) {
         return NULL;
 }
 
+DEFINE_TRIVIAL_REF_UNREF_FUNC(DecryptedImage, decrypted_image, decrypted_image_free);
+
 #if HAVE_LIBCRYPTSETUP
+static int decrypted_image_new(DecryptedImage **ret) {
+        _cleanup_(decrypted_image_unrefp) DecryptedImage *d = NULL;
+
+        assert(ret);
+
+        d = new(DecryptedImage, 1);
+        if (!d)
+                return -ENOMEM;
+
+        *d = (DecryptedImage) {
+                .n_ref = 1,
+        };
+
+        *ret = TAKE_PTR(d);
+        return 0;
+}
 
 static int make_dm_name_and_node(const void *original_node, const char *suffix, char **ret_name, char **ret_node) {
         _cleanup_free_ char *name = NULL, *node = NULL;
@@ -1892,6 +1941,28 @@ static int do_crypt_activate_verity(
                         CRYPT_ACTIVATE_READONLY);
 }
 
+static usec_t verity_timeout(void) {
+        usec_t t = 100 * USEC_PER_MSEC;
+        const char *e;
+        int r;
+
+        /* On slower machines, like non-KVM vm, setting up device may take a long time.
+         * Let's make the timeout configurable. */
+
+        e = getenv("SYSTEMD_DISSECT_VERITY_TIMEOUT_SEC");
+        if (!e)
+                return t;
+
+        r = parse_sec(e, &t);
+        if (r < 0)
+                log_debug_errno(r,
+                                "Failed to parse timeout specified in $SYSTEMD_DISSECT_VERITY_TIMEOUT_SEC, "
+                                "using the default timeout (%s).",
+                                FORMAT_TIMESPAN(t, USEC_PER_MSEC));
+
+        return t;
+}
+
 static int verity_partition(
                 PartitionDesignator designator,
                 DissectedPartition *m,
@@ -1971,15 +2042,14 @@ static int verity_partition(
                  * Improvements in libcrypsetup can ensure this never happens:
                  * https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/96 */
                 if (r == -EINVAL && FLAGS_SET(flags, DISSECT_IMAGE_VERITY_SHARE))
-                        return verity_partition(designator, m, v, verity, flags & ~DISSECT_IMAGE_VERITY_SHARE, d);
-                if (!IN_SET(r,
-                            0,       /* Success */
-                            -EEXIST, /* Volume is already open and ready to be used */
-                            -EBUSY,  /* Volume is being opened but not ready, crypt_init_by_name can fetch details */
-                            -ENODEV  /* Volume is being opened but not ready, crypt_init_by_name would fail, try to open again */))
+                        break;
+                if (r < 0 && !IN_SET(r,
+                                     -EEXIST, /* Volume is already open and ready to be used */
+                                     -EBUSY,  /* Volume is being opened but not ready, crypt_init_by_name can fetch details */
+                                     -ENODEV  /* Volume is being opened but not ready, crypt_init_by_name would fail, try to open again */))
                         return r;
                 if (IN_SET(r, -EEXIST, -EBUSY)) {
-                        struct crypt_device *existing_cd = NULL;
+                        _cleanup_(sym_crypt_freep) struct crypt_device *existing_cd = NULL;
 
                         if (!restore_deferred_remove){
                                 /* To avoid races, disable automatic removal on umount while setting up the new device. Restore it on failure. */
@@ -1987,7 +2057,7 @@ static int verity_partition(
                                 /* If activation returns EBUSY there might be no deferred removal to cancel, that's fine */
                                 if (r < 0 && r != -ENXIO)
                                         return log_debug_errno(r, "Disabling automated deferred removal for verity device %s failed: %m", node);
-                                if (r == 0) {
+                                if (r >= 0) {
                                         restore_deferred_remove = strdup(name);
                                         if (!restore_deferred_remove)
                                                 return -ENOMEM;
@@ -1997,55 +2067,45 @@ static int verity_partition(
                         r = verity_can_reuse(verity, name, &existing_cd);
                         /* Same as above, -EINVAL can randomly happen when it actually means -EEXIST */
                         if (r == -EINVAL && FLAGS_SET(flags, DISSECT_IMAGE_VERITY_SHARE))
-                                return verity_partition(designator, m, v, verity, flags & ~DISSECT_IMAGE_VERITY_SHARE, d);
-                        if (!IN_SET(r, 0, -ENODEV, -ENOENT, -EBUSY))
+                                break;
+                        if (r < 0 && !IN_SET(r, -ENODEV, -ENOENT, -EBUSY))
                                 return log_debug_errno(r, "Checking whether existing verity device %s can be reused failed: %m", node);
-                        if (r == 0) {
-                                usec_t timeout_usec = 100 * USEC_PER_MSEC;
-                                const char *e;
-
-                                /* On slower machines, like non-KVM vm, setting up device may take a long time.
-                                 * Let's make the timeout configurable. */
-                                e = getenv("SYSTEMD_DISSECT_VERITY_TIMEOUT_SEC");
-                                if (e) {
-                                        usec_t t;
-
-                                        r = parse_sec(e, &t);
-                                        if (r < 0)
-                                                log_debug_errno(r,
-                                                                "Failed to parse timeout specified in $SYSTEMD_DISSECT_VERITY_TIMEOUT_SEC, "
-                                                                "using the default timeout (%s).",
-                                                                FORMAT_TIMESPAN(timeout_usec, USEC_PER_MSEC));
-                                        else
-                                                timeout_usec = t;
-                                }
-
+                        if (r >= 0) {
                                 /* devmapper might say that the device exists, but the devlink might not yet have been
                                  * created. Check and wait for the udev event in that case. */
-                                r = device_wait_for_devlink(node, "block", timeout_usec, NULL);
+                                r = device_wait_for_devlink(node, "block", verity_timeout(), NULL);
                                 /* Fallback to activation with a unique device if it's taking too long */
-                                if (r == -ETIMEDOUT)
+                                if (r == -ETIMEDOUT && FLAGS_SET(flags, DISSECT_IMAGE_VERITY_SHARE))
                                         break;
                                 if (r < 0)
                                         return r;
 
-                                if (cd)
-                                        sym_crypt_free(cd);
-                                cd = existing_cd;
+                                crypt_free_and_replace(cd, existing_cd);
                         }
                 }
-                if (r == 0)
-                        break;
+                if (r >= 0)
+                        goto success;
 
                 /* Device is being opened by another process, but it has not finished yet, yield for 2ms */
                 (void) usleep(2 * USEC_PER_MSEC);
         }
 
-        /* An existing verity device was reported by libcryptsetup/libdevmapper, but we can't use it at this time.
-         * Fall back to activating it with a unique device name. */
-        if (r != 0 && FLAGS_SET(flags, DISSECT_IMAGE_VERITY_SHARE))
+        /* All trials failed or a conflicting verity device exists. Let's try to activate with a unique name. */
+        if (FLAGS_SET(flags, DISSECT_IMAGE_VERITY_SHARE)) {
+                /* Before trying to activate with unique name, we need to free crypt_device object.
+                 * Otherwise, we get error from libcryptsetup like the following:
+                 * ------
+                 * systemd[1234]: Cannot use device /dev/loop5 which is in use (already mapped or mounted).
+                 * ------
+                 */
+                sym_crypt_free(cd);
+                cd = NULL;
                 return verity_partition(designator, m, v, verity, flags & ~DISSECT_IMAGE_VERITY_SHARE, d);
+        }
+
+        return log_debug_errno(SYNTHETIC_ERRNO(EBUSY), "All attempts to activate verity device %s failed.", name);
 
+success:
         /* Everything looks good and we'll be able to mount the device, so deferred remove will be re-enabled at that point. */
         restore_deferred_remove = mfree(restore_deferred_remove);
 
@@ -2064,8 +2124,7 @@ int dissected_image_decrypt(
                 DissectedImage *m,
                 const char *passphrase,
                 const VeritySettings *verity,
-                DissectImageFlags flags,
-                DecryptedImage **ret) {
+                DissectImageFlags flags) {
 
 #if HAVE_LIBCRYPTSETUP
         _cleanup_(decrypted_image_unrefp) DecryptedImage *d = NULL;
@@ -2086,15 +2145,13 @@ int dissected_image_decrypt(
         if (verity && verity->root_hash && verity->root_hash_size < sizeof(sd_id128_t))
                 return -EINVAL;
 
-        if (!m->encrypted && !m->verity_ready) {
-                *ret = NULL;
+        if (!m->encrypted && !m->verity_ready)
                 return 0;
-        }
 
 #if HAVE_LIBCRYPTSETUP
-        d = new0(DecryptedImage, 1);
-        if (!d)
-                return -ENOMEM;
+        r = decrypted_image_new(&d);
+        if (r < 0)
+                return r;
 
         for (PartitionDesignator i = 0; i < _PARTITION_DESIGNATOR_MAX; i++) {
                 DissectedPartition *p = m->partitions + i;
@@ -2121,7 +2178,7 @@ int dissected_image_decrypt(
                 }
         }
 
-        *ret = TAKE_PTR(d);
+        m->decrypted_image = TAKE_PTR(d);
 
         return 1;
 #else
@@ -2133,8 +2190,7 @@ int dissected_image_decrypt_interactively(
                 DissectedImage *m,
                 const char *passphrase,
                 const VeritySettings *verity,
-                DissectImageFlags flags,
-                DecryptedImage **ret) {
+                DissectImageFlags flags) {
 
         _cleanup_strv_free_erase_ char **z = NULL;
         int n = 3, r;
@@ -2143,7 +2199,7 @@ int dissected_image_decrypt_interactively(
                 n--;
 
         for (;;) {
-                r = dissected_image_decrypt(m, passphrase, verity, flags, ret);
+                r = dissected_image_decrypt(m, passphrase, verity, flags);
                 if (r >= 0)
                         return r;
                 if (r == -EKEYREJECTED)
@@ -2165,7 +2221,7 @@ int dissected_image_decrypt_interactively(
         }
 }
 
-int decrypted_image_relinquish(DecryptedImage *d) {
+static int decrypted_image_relinquish(DecryptedImage *d) {
         assert(d);
 
         /* Turns on automatic removal after the last use ended for all DM devices of this image, and sets a
@@ -2191,6 +2247,23 @@ int decrypted_image_relinquish(DecryptedImage *d) {
         return 0;
 }
 
+int dissected_image_relinquish(DissectedImage *m) {
+        int r;
+
+        assert(m);
+
+        if (m->decrypted_image) {
+                r = decrypted_image_relinquish(m->decrypted_image);
+                if (r < 0)
+                        return r;
+        }
+
+        if (m->loop)
+                loop_device_relinquish(m->loop);
+
+        return 0;
+}
+
 static char *build_auxiliary_path(const char *image, const char *suffix) {
         const char *e;
         char *n;
@@ -2777,8 +2850,31 @@ finish:
         return r;
 }
 
+int dissect_loop_device(
+                LoopDevice *loop,
+                const VeritySettings *verity,
+                const MountOptions *mount_options,
+                DissectImageFlags flags,
+                DissectedImage **ret) {
+
+        _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
+        int r;
+
+        assert(loop);
+        assert(ret);
+
+        r = dissect_image(loop->fd, loop->node, loop->backing_file ?: loop->node, verity, mount_options, flags, &m);
+        if (r < 0)
+                return r;
+
+        m->loop = loop_device_ref(loop);
+
+        *ret = TAKE_PTR(m);
+        return 0;
+}
+
 int dissect_loop_device_and_warn(
-                const LoopDevice *loop,
+                LoopDevice *loop,
                 const VeritySettings *verity,
                 const MountOptions *mount_options,
                 DissectImageFlags flags,
@@ -2908,12 +3004,10 @@ int mount_image_privately_interactively(
                 const char *image,
                 DissectImageFlags flags,
                 char **ret_directory,
-                LoopDevice **ret_loop_device,
-                DecryptedImage **ret_decrypted_image) {
+                LoopDevice **ret_loop_device) {
 
         _cleanup_(verity_settings_done) VeritySettings verity = VERITY_SETTINGS_DEFAULT;
         _cleanup_(loop_device_unrefp) LoopDevice *d = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(dissected_image_unrefp) DissectedImage *dissected_image = NULL;
         _cleanup_(rmdir_and_freep) char *created_dir = NULL;
         _cleanup_free_ char *temp = NULL;
@@ -2926,7 +3020,6 @@ int mount_image_privately_interactively(
         assert(image);
         assert(ret_directory);
         assert(ret_loop_device);
-        assert(ret_decrypted_image);
 
         r = verity_settings_load(&verity, image, NULL, NULL);
         if (r < 0)
@@ -2953,7 +3046,7 @@ int mount_image_privately_interactively(
         if (r < 0)
                 return r;
 
-        r = dissected_image_decrypt_interactively(dissected_image, NULL, &verity, flags, &decrypted_image);
+        r = dissected_image_decrypt_interactively(dissected_image, NULL, &verity, flags);
         if (r < 0)
                 return r;
 
@@ -2975,17 +3068,12 @@ int mount_image_privately_interactively(
         if (r < 0)
                 return r;
 
-        if (decrypted_image) {
-                r = decrypted_image_relinquish(decrypted_image);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to relinquish DM devices: %m");
-        }
-
-        loop_device_relinquish(d);
+        r = dissected_image_relinquish(dissected_image);
+        if (r < 0)
+                return log_error_errno(r, "Failed to relinquish DM and loopback block devices: %m");
 
         *ret_directory = TAKE_PTR(created_dir);
         *ret_loop_device = TAKE_PTR(d);
-        *ret_decrypted_image = TAKE_PTR(decrypted_image);
 
         return 0;
 }
@@ -3029,7 +3117,6 @@ int verity_dissect_and_mount(
                 const char *required_sysext_scope) {
 
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(dissected_image_unrefp) DissectedImage *dissected_image = NULL;
         _cleanup_(verity_settings_done) VeritySettings verity = VERITY_SETTINGS_DEFAULT;
         DissectImageFlags dissect_image_flags;
@@ -3081,8 +3168,7 @@ int verity_dissect_and_mount(
                         dissected_image,
                         NULL,
                         &verity,
-                        dissect_image_flags,
-                        &decrypted_image);
+                        dissect_image_flags);
         if (r < 0)
                 return log_debug_errno(r, "Failed to decrypt dissected image: %m");
 
@@ -3128,13 +3214,9 @@ int verity_dissect_and_mount(
                         return log_debug_errno(r, "Failed to compare image %s extension-release metadata with the root's os-release: %m", dissected_image->image_name);
         }
 
-        if (decrypted_image) {
-                r = decrypted_image_relinquish(decrypted_image);
-                if (r < 0)
-                        return log_debug_errno(r, "Failed to relinquish decrypted image: %m");
-        }
-
-        loop_device_relinquish(loop_device);
+        r = dissected_image_relinquish(dissected_image);
+        if (r < 0)
+                return log_debug_errno(r, "Failed to relinquish dissected image: %m");
 
         return 0;
 }

diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h
index fe478bde493b0434014f4d6b5af343500d6ab6ec..2a66d7adf9d4f7e3ea9a94585ba5f77b6d3e051f 100644 (file)
--- a/src/shared/dissect-image.h
+++ b/src/shared/dissect-image.h
@@ -33,6 +33,12 @@ struct DissectedPartition {
         uint64_t offset;
 };
 
+#define DISSECTED_PARTITION_NULL                                        \
+        ((DissectedPartition) {                                         \
+                .partno = -1,                                           \
+                .architecture = _ARCHITECTURE_INVALID,                  \
+        })
+
 typedef enum PartitionDesignator {
         PARTITION_ROOT,
         PARTITION_ROOT_SECONDARY,  /* Secondary architecture */
@@ -210,7 +216,9 @@ struct DissectedImage {
         bool verity_sig_ready:1;   /* verity signature logic, fully specified and usable */
         bool single_file_system:1; /* MBR/GPT or single file system */
 
+        LoopDevice *loop;
         DissectedPartition partitions[_PARTITION_DESIGNATOR_MAX];
+        DecryptedImage *decrypted_image;
 
         /* Meta information extracted from /etc/os-release and similar */
         char *image_name;
@@ -261,25 +269,24 @@ int dissect_image(
                 const MountOptions *mount_options,
                 DissectImageFlags flags,
                 DissectedImage **ret);
-static inline int dissect_loop_device(const LoopDevice *loop, const VeritySettings *verity, const MountOptions *mount_options, DissectImageFlags flags, DissectedImage **ret) {
-        assert(loop);
-        return dissect_image(loop->fd, loop->node, loop->backing_file ?: loop->node, verity, mount_options, flags, ret);
-}
-int dissect_loop_device_and_warn(const LoopDevice *loop, const VeritySettings *verity, const MountOptions *mount_options, DissectImageFlags flags, DissectedImage **ret);
+int dissect_loop_device(LoopDevice *loop, const VeritySettings *verity, const MountOptions *mount_options, DissectImageFlags flags, DissectedImage **ret);
+int dissect_loop_device_and_warn(LoopDevice *loop, const VeritySettings *verity, const MountOptions *mount_options, DissectImageFlags flags, DissectedImage **ret);
 
 DissectedImage* dissected_image_unref(DissectedImage *m);
 DEFINE_TRIVIAL_CLEANUP_FUNC(DissectedImage*, dissected_image_unref);
 
-int dissected_image_decrypt(DissectedImage *m, const char *passphrase, const VeritySettings *verity, DissectImageFlags flags, DecryptedImage **ret);
-int dissected_image_decrypt_interactively(DissectedImage *m, const char *passphrase, const VeritySettings *verity, DissectImageFlags flags, DecryptedImage **ret);
+int dissected_image_decrypt(DissectedImage *m, const char *passphrase, const VeritySettings *verity, DissectImageFlags flags);
+int dissected_image_decrypt_interactively(DissectedImage *m, const char *passphrase, const VeritySettings *verity, DissectImageFlags flags);
 int dissected_image_mount(DissectedImage *m, const char *dest, uid_t uid_shift, uid_t uid_range, DissectImageFlags flags);
 int dissected_image_mount_and_warn(DissectedImage *m, const char *where, uid_t uid_shift, uid_t uid_range, DissectImageFlags flags);
 
 int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_flags);
 
+DecryptedImage* decrypted_image_ref(DecryptedImage *p);
 DecryptedImage* decrypted_image_unref(DecryptedImage *p);
 DEFINE_TRIVIAL_CLEANUP_FUNC(DecryptedImage*, decrypted_image_unref);
-int decrypted_image_relinquish(DecryptedImage *d);
+
+int dissected_image_relinquish(DissectedImage *m);
 
 const char* partition_designator_to_string(PartitionDesignator d) _const_;
 PartitionDesignator partition_designator_from_string(const char *name) _pure_;
@@ -293,6 +300,6 @@ bool dissected_image_verity_candidate(const DissectedImage *image, PartitionDesi
 bool dissected_image_verity_ready(const DissectedImage *image, PartitionDesignator d);
 bool dissected_image_verity_sig_ready(const DissectedImage *image, PartitionDesignator d);
 
-int mount_image_privately_interactively(const char *path, DissectImageFlags flags, char **ret_directory, LoopDevice **ret_loop_device, DecryptedImage **ret_decrypted_image);
+int mount_image_privately_interactively(const char *path, DissectImageFlags flags, char **ret_directory, LoopDevice **ret_loop_device);
 
 int verity_dissect_and_mount(int src_fd, const char *src, const char *dest, const MountOptions *options, const char *required_host_os_release_id, const char *required_host_os_release_version_id, const char *required_host_os_release_sysext_level, const char *required_sysext_scope);

diff --git a/src/shared/find-esp.c b/src/shared/find-esp.c
index 889ba8c46b8f9f768bb432bf6e946eae1177b490..dfe0574aba6b16010662ade9fc0842b61320e43f 100644 (file)
--- a/src/shared/find-esp.c
+++ b/src/shared/find-esp.c
@@ -8,11 +8,13 @@
 
 #include "alloc-util.h"
 #include "blkid-util.h"
+#include "btrfs-util.h"
 #include "chase-symlinks.h"
 #include "device-util.h"
 #include "devnum-util.h"
 #include "env-util.h"
 #include "errno-util.h"
+#include "fd-util.h"
 #include "find-esp.h"
 #include "gpt.h"
 #include "parse-util.h"
@@ -235,70 +237,104 @@ static int verify_fsroot_dir(
                 bool unprivileged_mode,
                 dev_t *ret_dev) {
 
-        struct stat st, st2;
-        const char *t2, *trigger;
+        _cleanup_close_ int fd = -1;
+        STRUCT_NEW_STATX_DEFINE(sxa);
+        STRUCT_NEW_STATX_DEFINE(sxb);
         int r;
 
+        /* Checks if the specified directory is at the root of its file system, and returns device
+         * major/minor of the device, if it is. */
+
         assert(path);
-        assert(ret_dev);
+
+        /* We are using O_PATH here, since that way we can operate on directory inodes we cannot look into,
+         * which is quite likely if we run unprivileged */
+        fd = open(path, O_CLOEXEC|O_DIRECTORY|O_PATH);
+        if (fd < 0)
+                return log_full_errno((searching && errno == ENOENT) ||
+                                      (unprivileged_mode && ERRNO_IS_PRIVILEGE(errno)) ? LOG_DEBUG : LOG_ERR, errno,
+                                      "Failed to open directory \"%s\": %m", path);
 
         /* So, the ESP and XBOOTLDR partition are commonly located on an autofs mount. stat() on the
          * directory won't trigger it, if it is not mounted yet. Let's hence explicitly trigger it here,
          * before stat()ing */
-        trigger = strjoina(path, "/trigger"); /* Filename doesn't matter... */
-        (void) access(trigger, F_OK);
+        (void) faccessat(fd, "trigger", F_OK, AT_SYMLINK_NOFOLLOW); /* Filename doesn't matter... */
 
-        if (stat(path, &st) < 0)
-                return log_full_errno((searching && errno == ENOENT) ||
-                                      (unprivileged_mode && errno == EACCES) ? LOG_DEBUG : LOG_ERR, errno,
+        r = statx_fallback(fd, "", AT_EMPTY_PATH, STATX_TYPE|STATX_INO|STATX_MNT_ID, &sxa.sx);
+        if (r < 0)
+                return log_full_errno((unprivileged_mode && ERRNO_IS_PRIVILEGE(r)) ? LOG_DEBUG : LOG_ERR, r,
                                       "Failed to determine block device node of \"%s\": %m", path);
 
-        if (major(st.st_dev) == 0)
-                return log_full_errno(searching ? LOG_DEBUG : LOG_ERR,
-                                      SYNTHETIC_ERRNO(searching ? EADDRNOTAVAIL : ENODEV),
-                                      "Block device node of \"%s\" is invalid.", path);
-
-        if (path_equal(path, "/")) {
-                /* Let's assume that the root directory of the OS is always the root of its file system
-                 * (which technically doesn't have to be the case, but it's close enough, and it's not easy
-                 * to be fully correct for it, since we can't look further up than the root dir easily.) */
-                if (ret_dev)
-                        *ret_dev = st.st_dev;
-
-                return 0;
-        }
+        assert(S_ISDIR(sxa.sx.stx_mode)); /* We used O_DIRECTORY above, when opening, so this must hold */
 
-        t2 = strjoina(path, "/..");
-        if (stat(t2, &st2) < 0) {
-                if (errno != EACCES)
-                        r = -errno;
-                else {
-                        _cleanup_free_ char *parent = NULL;
+        if (FLAGS_SET(sxa.sx.stx_attributes_mask, STATX_ATTR_MOUNT_ROOT)) {
 
-                        /* If going via ".." didn't work due to EACCESS, then let's determine the parent path
-                         * directly instead. It's not as good, due to symlinks and such, but we can't do
-                         * anything better here. */
+                /* If we have STATX_ATTR_MOUNT_ROOT, we are happy, that's all we need. We operate under the
+                 * assumption that a top of a mount point is also the top of the file system. (Which of
+                 * course is strictly speaking not always true...) */
 
-                        r = path_extract_directory(path, &parent);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to extract parent path from '%s': %m", path);
+                if (!FLAGS_SET(sxa.sx.stx_attributes, STATX_ATTR_MOUNT_ROOT))
+                        return log_full_errno(searching ? LOG_DEBUG : LOG_ERR,
+                                              SYNTHETIC_ERRNO(searching ? EADDRNOTAVAIL : ENODEV),
+                                              "Directory \"%s\" is not the root of the file system.", path);
 
-                        r = RET_NERRNO(stat(parent, &st2));
-                }
+                goto success;
+        }
 
+        /* Now let's look at the parent */
+        r = statx_fallback(fd, "..", 0, STATX_TYPE|STATX_INO|STATX_MNT_ID, &sxb.sx);
+        if (r < 0 && ERRNO_IS_PRIVILEGE(r)) {
+                _cleanup_free_ char *parent = NULL;
+
+                /* If going via ".." didn't work due to EACCESS, then let's determine the parent path
+                 * directly instead. It's not as good, due to symlinks and such, but we can't do anything
+                 * better here.
+                 *
+                 * (In case you wonder where this fallback is useful: consider a classic Fedora setup with
+                 * /boot/ being an ext4 partition and /boot/efi/ being the VFAT ESP. The latter is mounted
+                 * inaccessible for regular users via the dmask= mount option. In that case as unprivileged
+                 * user we can stat() /boot/efi/, and we can stat()/enumerate /boot/. But we cannot look into
+                 * /boot/efi/, and in particular not use /boot/efi/../ – hence this work-around.) */
+
+                if (path_equal(path, "/"))
+                        goto success;
+
+                r = path_extract_directory(path, &parent);
                 if (r < 0)
-                        return log_full_errno(unprivileged_mode && r == -EACCES ? LOG_DEBUG : LOG_ERR, r,
-                                              "Failed to determine block device node of parent of \"%s\": %m", path);
+                        return log_error_errno(r, "Failed to extract parent path from '%s': %m", path);
+
+                r = statx_fallback(AT_FDCWD, parent, AT_SYMLINK_NOFOLLOW, STATX_TYPE|STATX_INO|STATX_MNT_ID, &sxb.sx);
         }
+        if (r < 0)
+                return log_full_errno(unprivileged_mode && ERRNO_IS_PRIVILEGE(r) ? LOG_DEBUG : LOG_ERR, r,
+                                      "Failed to determine block device node of parent of \"%s\": %m", path);
+
+        if (statx_inode_same(&sxa.sx, &sxb.sx)) /* for the root dir inode nr for both inodes will be the same */
+                goto success;
 
-        if (st.st_dev == st2.st_dev)
+        if (statx_mount_same(&sxa.nsx, &sxb.nsx))
                 return log_full_errno(searching ? LOG_DEBUG : LOG_ERR,
                                       SYNTHETIC_ERRNO(searching ? EADDRNOTAVAIL : ENODEV),
                                       "Directory \"%s\" is not the root of the file system.", path);
 
-        if (ret_dev)
-                *ret_dev = st.st_dev;
+success:
+        if (!ret_dev)
+                return 0;
+
+        if (sxa.sx.stx_dev_major == 0) { /* Hmm, maybe a btrfs device, and the caller asked for the backing device? Then let's try to get it. */
+                _cleanup_close_ int real_fd = -1;
+
+                /* The statx() above we can execute on an O_PATH fd. But the btrfs ioctl we cannot. Hence
+                 * acquire a "real" fd first, without the O_PATH flag. */
+
+                real_fd = fd_reopen(fd, O_DIRECTORY|O_CLOEXEC);
+                if (real_fd < 0)
+                        return real_fd;
 
+                return btrfs_get_block_device_fd(real_fd, ret_dev);
+        }
+
+        *ret_dev = makedev(sxa.sx.stx_dev_major, sxa.sx.stx_dev_minor);
         return 0;
 }
 
@@ -313,7 +349,7 @@ static int verify_esp(
 
         bool relax_checks, searching = FLAGS_SET(flags, VERIFY_ESP_SEARCHING),
              unprivileged_mode = FLAGS_SET(flags, VERIFY_ESP_UNPRIVILEGED_MODE);
-        dev_t devid;
+        dev_t devid = 0;
         int r;
 
         assert(p);
@@ -325,7 +361,9 @@ static int verify_esp(
          *  -EACESS        → if 'unprivileged_mode' is set, and we have trouble accessing the thing
          */
 
-        relax_checks = getenv_bool("SYSTEMD_RELAX_ESP_CHECKS") > 0 || FLAGS_SET(flags, VERIFY_ESP_RELAX_CHECKS);
+        relax_checks =
+                getenv_bool("SYSTEMD_RELAX_ESP_CHECKS") > 0 ||
+                FLAGS_SET(flags, VERIFY_ESP_RELAX_CHECKS);
 
         /* Non-root user can only check the status, so if an error occurred in the following, it does not cause any
          * issues. Let's also, silence the error messages. */
@@ -345,13 +383,17 @@ static int verify_esp(
                                               "File system \"%s\" is not a FAT EFI System Partition (ESP) file system.", p);
         }
 
-        r = verify_fsroot_dir(p, searching, unprivileged_mode, &devid);
+        relax_checks =
+                relax_checks ||
+                detect_container() > 0;
+
+        r = verify_fsroot_dir(p, searching, unprivileged_mode, relax_checks ? NULL : &devid);
         if (r < 0)
                 return r;
 
         /* In a container we don't have access to block devices, skip this part of the verification, we trust
          * the container manager set everything up correctly on its own. */
-        if (detect_container() > 0 || relax_checks)
+        if (relax_checks)
                 goto finish;
 
         /* If we are unprivileged we ask udev for the metadata about the partition. If we are privileged we
@@ -479,7 +521,7 @@ int find_esp_and_warn(
                                flags | VERIFY_ESP_SEARCHING);
                 if (r >= 0)
                         goto found;
-                if (!IN_SET(r, -ENOENT, -EADDRNOTAVAIL)) /* This one is not it */
+                if (!IN_SET(r, -ENOENT, -EADDRNOTAVAIL, -ENOTDIR)) /* This one is not it */
                         return r;
 
                 p = mfree(p);
@@ -654,18 +696,20 @@ static int verify_xbootldr(
                 dev_t *ret_devid) {
 
         bool relax_checks;
-        dev_t devid;
+        dev_t devid = 0;
         int r;
 
         assert(p);
 
-        relax_checks = getenv_bool("SYSTEMD_RELAX_XBOOTLDR_CHECKS") > 0;
+        relax_checks =
+                getenv_bool("SYSTEMD_RELAX_XBOOTLDR_CHECKS") > 0 ||
+                detect_container() > 0;
 
-        r = verify_fsroot_dir(p, searching, unprivileged_mode, &devid);
+        r = verify_fsroot_dir(p, searching, unprivileged_mode, relax_checks ? NULL : &devid);
         if (r < 0)
                 return r;
 
-        if (detect_container() > 0 || relax_checks)
+        if (relax_checks)
                 goto finish;
 
         if (unprivileged_mode)
@@ -757,10 +801,10 @@ int find_xbootldr_and_warn(
                                        root ? " under directory " : "",
                                        strempty(root));
 
-        r = verify_xbootldr(p, true, unprivileged_mode, ret_uuid, ret_devid);
+        r = verify_xbootldr(p, /* searching= */ true, unprivileged_mode, ret_uuid, ret_devid);
         if (r >= 0)
                 goto found;
-        if (!IN_SET(r, -ENOENT, -EADDRNOTAVAIL)) /* This one is not it */
+        if (!IN_SET(r, -ENOENT, -EADDRNOTAVAIL, -ENOTDIR)) /* This one is not it */
                 return r;
 
         return -ENOKEY;

diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index d4e66cb6a4957bfacb3f3b6ad7a6a400fd204b57..47bc90b9fc3209bc78a4b218502a43077a024a44 100644 (file)
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -1464,7 +1464,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
                 else
                         ret = format_timestamp_relative(p, FORMAT_TIMESTAMP_RELATIVE_MAX, d->timestamp);
                 if (!ret)
-                        return "n/a";
+                        return "-";
 
                 d->formatted = TAKE_PTR(p);
                 break;
@@ -1480,7 +1480,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
 
                 if (!format_timespan(p, FORMAT_TIMESPAN_MAX, d->timespan,
                                      d->type == TABLE_TIMESPAN ? 0 : USEC_PER_MSEC))
-                        return "n/a";
+                        return "-";
 
                 d->formatted = TAKE_PTR(p);
                 break;
@@ -1494,7 +1494,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
                         return NULL;
 
                 if (!format_bytes(p, FORMAT_BYTES_MAX, d->size))
-                        return "n/a";
+                        return "-";
 
                 d->formatted = TAKE_PTR(p);
                 break;
@@ -1509,7 +1509,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
                         return NULL;
 
                 if (!format_bytes_full(p, FORMAT_BYTES_MAX, d->size, 0))
-                        return "n/a";
+                        return "-";
 
                 n = strlen(p);
                 strscpy(p + n, FORMAT_BYTES_MAX + 2 - n, "bps");
@@ -1710,7 +1710,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
                 char *p;
 
                 if (!uid_is_valid(d->uid))
-                        return "n/a";
+                        return "-";
 
                 p = new(char, DECIMAL_STR_WIDTH(d->uid) + 1);
                 if (!p)
@@ -1725,7 +1725,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
                 char *p;
 
                 if (!gid_is_valid(d->gid))
-                        return "n/a";
+                        return "-";
 
                 p = new(char, DECIMAL_STR_WIDTH(d->gid) + 1);
                 if (!p)
@@ -1740,7 +1740,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
                 char *p;
 
                 if (!pid_is_valid(d->pid))
-                        return "n/a";
+                        return "-";
 
                 p = new(char, DECIMAL_STR_WIDTH(d->pid) + 1);
                 if (!p)
@@ -1757,7 +1757,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
 
                 suffix = signal_to_string(d->int_val);
                 if (!suffix)
-                        return "n/a";
+                        return "-";
 
                 p = strjoin("SIG", suffix);
                 if (!p)
@@ -1771,7 +1771,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
                 char *p;
 
                 if (d->mode == MODE_INVALID)
-                        return "n/a";
+                        return "-";
 
                 p = new(char, 4 + 1);
                 if (!p)

diff --git a/src/shared/label.c b/src/shared/label.c
index dde93e1ddeb27122ed63b1f015fe7ae79c8ac639..d00158a2585e67b285a2c4f28197e8bf811c62a4 100644 (file)
--- a/src/shared/label.c
+++ b/src/shared/label.c
@@ -61,7 +61,7 @@ int symlink_label(const char *old_path, const char *new_path) {
         return mac_smack_fix(new_path, 0);
 }
 
-int symlink_atomic_label(const char *from, const char *to) {
+int symlink_atomic_full_label(const char *from, const char *to, bool make_relative) {
         int r;
 
         assert(from);
@@ -71,7 +71,7 @@ int symlink_atomic_label(const char *from, const char *to) {
         if (r < 0)
                 return r;
 
-        r = symlink_atomic(from, to);
+        r = symlink_atomic_full(from, to, make_relative);
         mac_selinux_create_file_clear();
 
         if (r < 0)

diff --git a/src/shared/label.h b/src/shared/label.h
index 88aa47b7b88730992b5e452da590d2ad78dadb01..2f899e2bddc88ce0a21f0560874dd3eb8171f7b4 100644 (file)
--- a/src/shared/label.h
+++ b/src/shared/label.h
@@ -17,7 +17,10 @@ static inline int label_fix(const char *path, LabelFixFlags flags) {
 }
 
 int symlink_label(const char *old_path, const char *new_path);
-int symlink_atomic_label(const char *from, const char *to);
+int symlink_atomic_full_label(const char *from, const char *to, bool make_relative);
+static inline int symlink_atomic_label(const char *from, const char *to) {
+        return symlink_atomic_full_label(from, to, false);
+}
 int mknod_label(const char *pathname, mode_t mode, dev_t dev);
 
 int btrfs_subvol_make_label(const char *path);

diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index 49f4b2bf6efaf704d18d1251d02ec4f9776aaec9..54251f0fb72e63929e66c71c58cf674e8232c4c1 100644 (file)
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -369,6 +369,7 @@ static int loop_configure(
                 return -ENOMEM;
 
         *d = (LoopDevice) {
+                .n_ref = 1,
                 .fd = TAKE_FD(loop_with_fd),
                 .lock_fd = TAKE_FD(lock_fd),
                 .node = TAKE_PTR(node),
@@ -624,7 +625,7 @@ int loop_device_make_by_path(
         return loop_device_make_internal(path, fd, open_flags, 0, 0, loop_flags, lock_op, ret);
 }
 
-LoopDevice* loop_device_unref(LoopDevice *d) {
+static LoopDevice* loop_device_free(LoopDevice *d) {
         _cleanup_close_ int control = -1;
         int r;
 
@@ -696,6 +697,8 @@ LoopDevice* loop_device_unref(LoopDevice *d) {
         return mfree(d);
 }
 
+DEFINE_TRIVIAL_REF_UNREF_FUNC(LoopDevice, loop_device, loop_device_free);
+
 void loop_device_relinquish(LoopDevice *d) {
         assert(d);
 
@@ -796,6 +799,7 @@ int loop_device_open_full(
                 return -ENOMEM;
 
         *d = (LoopDevice) {
+                .n_ref = 1,
                 .fd = TAKE_FD(fd),
                 .lock_fd = TAKE_FD(lock_fd),
                 .nr = nr,

diff --git a/src/shared/loop-util.h b/src/shared/loop-util.h
index cb0183ba07ae7c5ae7f212ea3cc47450eddbd50a..756041adaab9b9ff88a6ec6f2e8874c8684a8d6f 100644 (file)
--- a/src/shared/loop-util.h
+++ b/src/shared/loop-util.h
@@ -11,6 +11,7 @@ typedef struct LoopDevice LoopDevice;
 /* Some helpers for setting up loopback block devices */
 
 struct LoopDevice {
+        unsigned n_ref;
         int fd;
         int lock_fd;
         int nr;   /* The loopback device index (i.e. 4 for /dev/loop4); if this object encapsulates a non-loopback block device, set to -1 */
@@ -34,6 +35,7 @@ static inline int loop_device_open(const char *loop_path, int open_flags, int lo
         return loop_device_open_full(loop_path, -1, open_flags, lock_op, ret);
 }
 
+LoopDevice* loop_device_ref(LoopDevice *d);
 LoopDevice* loop_device_unref(LoopDevice *d);
 DEFINE_TRIVIAL_CLEANUP_FUNC(LoopDevice*, loop_device_unref);
 

diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index accd64f9e89f9f6e008418f4f76fdb76960b57ab..4c31045a867fa9313a4f5fbf1b6df197e3967142 100644 (file)
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -90,6 +90,7 @@ int make_filesystem(
                 const char *node,
                 const char *fstype,
                 const char *label,
+                const char *root,
                 sd_id128_t uuid,
                 bool discard) {
 
@@ -102,12 +103,28 @@ int make_filesystem(
         assert(label);
 
         if (streq(fstype, "swap")) {
+                if (root)
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                               "A swap filesystem can't be populated, refusing");
                 r = find_executable("mkswap", &mkfs);
                 if (r == -ENOENT)
                         return log_error_errno(SYNTHETIC_ERRNO(EPROTONOSUPPORT), "mkswap binary not available.");
                 if (r < 0)
                         return log_error_errno(r, "Failed to determine whether mkswap binary exists: %m");
+        } else if (streq(fstype, "squashfs")) {
+                if (!root)
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                               "Cannot generate squashfs filesystems without a source tree.");
+
+                r = find_executable("mksquashfs", &mkfs);
+                if (r == -ENOENT)
+                        return log_error_errno(SYNTHETIC_ERRNO(EPROTONOSUPPORT), "mksquashfs binary not available.");
+                if (r < 0)
+                        return log_error_errno(r, "Failed to determine whether mksquashfs binary exists: %m");
         } else {
+                if (root)
+                        return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
+                                               "Populating with source tree is only supported for squashfs");
                 r = mkfs_exists(fstype);
                 if (r < 0)
                         return log_error_errno(r, "Failed to determine whether mkfs binary for %s exists: %m", fstype);
@@ -225,6 +242,13 @@ int make_filesystem(
                                       "-U", vol_id,
                                       node, NULL);
 
+                else if (streq(fstype, "squashfs"))
+
+                        (void) execlp(mkfs, mkfs,
+                                      root, node,
+                                      "-quiet",
+                                      "-noappend",
+                                      NULL);
                 else
                         /* Generic fallback for all other file systems */
                         (void) execlp(mkfs, mkfs, node, NULL);

diff --git a/src/shared/mkfs-util.h b/src/shared/mkfs-util.h
index 7647afbfc70f1eba696364c154f1931d394ddaba..7cff11634955efaa761be4bab09f57974d7cc58f 100644 (file)
--- a/src/shared/mkfs-util.h
+++ b/src/shared/mkfs-util.h
@@ -7,4 +7,4 @@
 
 int mkfs_exists(const char *fstype);
 
-int make_filesystem(const char *node, const char *fstype, const char *label, sd_id128_t uuid, bool discard);
+int make_filesystem(const char *node, const char *fstype, const char *label, const char *root, sd_id128_t uuid, bool discard);

diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index 487d258ca99773ded7af82ce758ce435e2ea8856..a7af7528d7fcc54b4e580f3c8c81165bcb37b55f 100644 (file)
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -2048,13 +2048,13 @@ const char *tpm2_pcr_bank_to_string(uint16_t bank) {
 }
 
 int tpm2_pcr_bank_from_string(const char *bank) {
-        if (streq_ptr(bank, "sha1"))
+        if (strcaseeq_ptr(bank, "sha1"))
                 return TPM2_ALG_SHA1;
-        if (streq_ptr(bank, "sha256"))
+        if (strcaseeq_ptr(bank, "sha256"))
                 return TPM2_ALG_SHA256;
-        if (streq_ptr(bank, "sha384"))
+        if (strcaseeq_ptr(bank, "sha384"))
                 return TPM2_ALG_SHA384;
-        if (streq_ptr(bank, "sha512"))
+        if (strcaseeq_ptr(bank, "sha512"))
                 return TPM2_ALG_SHA512;
         return -EINVAL;
 }
@@ -2068,9 +2068,9 @@ const char *tpm2_primary_alg_to_string(uint16_t alg) {
 }
 
 int tpm2_primary_alg_from_string(const char *alg) {
-        if (streq_ptr(alg, "ecc"))
+        if (strcaseeq_ptr(alg, "ecc"))
                 return TPM2_ALG_ECC;
-        if (streq_ptr(alg, "rsa"))
+        if (strcaseeq_ptr(alg, "rsa"))
                 return TPM2_ALG_RSA;
         return -EINVAL;
 }

diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index 690493a698dd01d61ab57190d5a376906cdf19fb..cb44e96dae98c3584b0e96780c04f9f229dd68e4 100644 (file)
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -18,9 +18,9 @@
 #include "watchdog.h"
 
 static int watchdog_fd = -1;
-static char *watchdog_device;
-static usec_t watchdog_timeout; /* 0 → close device and USEC_INFINITY → don't change timeout */
-static usec_t watchdog_pretimeout; /* 0 → disable pretimeout and USEC_INFINITY → don't change pretimeout */
+static char *watchdog_device = NULL;
+static usec_t watchdog_timeout = 0; /* 0 → close device and USEC_INFINITY → don't change timeout */
+static usec_t watchdog_pretimeout = 0; /* 0 → disable pretimeout and USEC_INFINITY → don't change pretimeout */
 static usec_t watchdog_last_ping = USEC_INFINITY;
 static bool watchdog_supports_pretimeout = false; /* Depends on kernel state that might change at runtime */
 static char *watchdog_pretimeout_governor = NULL;
@@ -119,12 +119,6 @@ static int watchdog_set_enable(bool enable) {
         return 0;
 }
 
-usec_t watchdog_get_timeout(void) {
-        if (watchdog_timeout == USEC_INFINITY)
-                return 0;
-        return watchdog_timeout;
-}
-
 static int watchdog_read_timeout(void) {
         int sec = 0;
 
@@ -156,12 +150,6 @@ static int watchdog_set_timeout(void) {
         return 0;
 }
 
-usec_t watchdog_get_pretimeout(void) {
-        if (watchdog_pretimeout == USEC_INFINITY)
-                return 0;
-        return watchdog_pretimeout;
-}
-
 static int watchdog_read_pretimeout(void) {
         int sec = 0;
 
@@ -314,7 +302,7 @@ static int update_timeout(void) {
 
 static int open_watchdog(void) {
         struct watchdog_info ident;
-        const char *fn;
+        char **try_order;
         int r;
 
         if (watchdog_fd >= 0)
@@ -324,16 +312,25 @@ static int open_watchdog(void) {
          * has the benefit that we can easily find the matching directory in sysfs from it, as the relevant
          * sysfs attributes can only be found via /sys/dev/char/<major>:<minor> if the new-style device
          * major/minor is used, not the old-style. */
-        fn = !watchdog_device || path_equal(watchdog_device, "/dev/watchdog") ?
-                "/dev/watchdog0" : watchdog_device;
+        try_order = !watchdog_device || PATH_IN_SET(watchdog_device, "/dev/watchdog", "/dev/watchdog0") ?
+                STRV_MAKE("/dev/watchdog0", "/dev/watchdog") : STRV_MAKE(watchdog_device);
 
-        r = free_and_strdup(&watchdog_device, fn);
-        if (r < 0)
-                return log_oom_debug();
+        STRV_FOREACH(wd, try_order) {
+                watchdog_fd = open(*wd, O_WRONLY|O_CLOEXEC);
+                if (watchdog_fd >= 0) {
+                        r = free_and_strdup(&watchdog_device, *wd);
+                        if (r < 0)
+                                return log_oom_debug();
+
+                        break;
+                }
+
+                if (errno != ENOENT)
+                        return log_debug_errno(errno, "Failed to open watchdog device %s: %m", *wd);
+        }
 
-        watchdog_fd = open(watchdog_device, O_WRONLY|O_CLOEXEC);
         if (watchdog_fd < 0)
-                return log_debug_errno(errno, "Failed to open watchdog device %s, ignoring: %m", watchdog_device);
+                return log_debug_errno(SYNTHETIC_ERRNO(ENOENT), "Failed to open watchdog device %s: %m", watchdog_device ?: "auto");
 
         if (ioctl(watchdog_fd, WDIOC_GETSUPPORT, &ident) < 0)
                 log_debug_errno(errno, "Hardware watchdog %s does not support WDIOC_GETSUPPORT ioctl, ignoring: %m", watchdog_device);

diff --git a/src/shared/watchdog.h b/src/shared/watchdog.h
index 1242fbc4d9ea3221b93937d5a6527e1e5f403753..a0a80efc9762081d5df73b3f059edd63f1a21710 100644 (file)
--- a/src/shared/watchdog.h
+++ b/src/shared/watchdog.h
@@ -7,8 +7,6 @@
 #include "util.h"
 
 const char *watchdog_get_device(void);
-usec_t watchdog_get_timeout(void);
-usec_t watchdog_get_pretimeout(void);
 usec_t watchdog_get_last_ping(clockid_t clock);
 
 int watchdog_set_device(const char *path);

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index e45fa61640c90f8fc371019c8c6ba6d73d15c6cd..e0f1fa7f17e3641db983cfd7330f5b015d710a3b 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -514,7 +514,6 @@ static int merge_subprocess(Hashmap *images, const char *workspace) {
                 case IMAGE_BLOCK: {
                         _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
                         _cleanup_(loop_device_unrefp) LoopDevice *d = NULL;
-                        _cleanup_(decrypted_image_unrefp) DecryptedImage *di = NULL;
                         _cleanup_(verity_settings_done) VeritySettings verity_settings = VERITY_SETTINGS_DEFAULT;
                         DissectImageFlags flags =
                                 DISSECT_IMAGE_READ_ONLY |
@@ -558,8 +557,7 @@ static int merge_subprocess(Hashmap *images, const char *workspace) {
                         r = dissected_image_decrypt_interactively(
                                         m, NULL,
                                         &verity_settings,
-                                        flags,
-                                        &di);
+                                        flags);
                         if (r < 0)
                                 return r;
 
@@ -572,13 +570,9 @@ static int merge_subprocess(Hashmap *images, const char *workspace) {
                         if (r < 0)
                                 return r;
 
-                        if (di) {
-                                r = decrypted_image_relinquish(di);
-                                if (r < 0)
-                                        return log_error_errno(r, "Failed to relinquish DM devices: %m");
-                        }
-
-                        loop_device_relinquish(d);
+                        r = dissected_image_relinquish(m);
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to relinquish DM and loopback block devices: %m");
                         break;
                 }
                 default:

diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index d75097de27aeefe3288ce2f2d89fb3fd7ac3637d..efe1036ce34ab314c6109c34bc02cca313fc0fac 100644 (file)
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -13,7 +13,6 @@ _systemd_headers = [
         'sd-journal.h',
         'sd-login.h',
         'sd-messages.h',
-        'sd-netlink.h',
         'sd-path.h',
 ]
 
@@ -34,6 +33,7 @@ _not_installed_headers = [
         'sd-lldp-tx.h',
         'sd-lldp.h',
         'sd-ndisc.h',
+        'sd-netlink.h',
         'sd-network.h',
         'sd-radv.h',
         'sd-resolve.h',

diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 7dcfac126189f26897d3cb79a17e1a55dd1bc5f4..c24ae532dd9c37483e503eaf7cf3dd9f0dea53a8 100644 (file)
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -855,17 +855,14 @@ static int reboot_now(void) {
 static int process_image(
                 bool ro,
                 char **ret_mounted_dir,
-                LoopDevice **ret_loop_device,
-                DecryptedImage **ret_decrypted_image) {
+                LoopDevice **ret_loop_device) {
 
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
         int r;
 
         assert(ret_mounted_dir);
         assert(ret_loop_device);
-        assert(ret_decrypted_image);
 
         if (!arg_image)
                 return 0;
@@ -883,8 +880,7 @@ static int process_image(
                         DISSECT_IMAGE_GENERIC_ROOT |
                         DISSECT_IMAGE_REQUIRE_ROOT,
                         &mounted_dir,
-                        &loop_device,
-                        &decrypted_image);
+                        &loop_device);
         if (r < 0)
                 return r;
 
@@ -894,14 +890,12 @@ static int process_image(
 
         *ret_mounted_dir = TAKE_PTR(mounted_dir);
         *ret_loop_device = TAKE_PTR(loop_device);
-        *ret_decrypted_image = TAKE_PTR(decrypted_image);
 
         return 0;
 }
 
 static int verb_list(int argc, char **argv, void *userdata) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
         _cleanup_(context_freep) Context* context = NULL;
         const char *version;
@@ -910,7 +904,7 @@ static int verb_list(int argc, char **argv, void *userdata) {
         assert(argc <= 2);
         version = argc >= 2 ? argv[1] : NULL;
 
-        r = process_image(/* ro= */ true, &mounted_dir, &loop_device, &decrypted_image);
+        r = process_image(/* ro= */ true, &mounted_dir, &loop_device);
         if (r < 0)
                 return r;
 
@@ -926,14 +920,13 @@ static int verb_list(int argc, char **argv, void *userdata) {
 
 static int verb_check_new(int argc, char **argv, void *userdata) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
         _cleanup_(context_freep) Context* context = NULL;
         int r;
 
         assert(argc <= 1);
 
-        r = process_image(/* ro= */ true, &mounted_dir, &loop_device, &decrypted_image);
+        r = process_image(/* ro= */ true, &mounted_dir, &loop_device);
         if (r < 0)
                 return r;
 
@@ -952,14 +945,13 @@ static int verb_check_new(int argc, char **argv, void *userdata) {
 
 static int verb_vacuum(int argc, char **argv, void *userdata) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
         _cleanup_(context_freep) Context* context = NULL;
         int r;
 
         assert(argc <= 1);
 
-        r = process_image(/* ro= */ false, &mounted_dir, &loop_device, &decrypted_image);
+        r = process_image(/* ro= */ false, &mounted_dir, &loop_device);
         if (r < 0)
                 return r;
 
@@ -972,7 +964,6 @@ static int verb_vacuum(int argc, char **argv, void *userdata) {
 
 static int verb_update(int argc, char **argv, void *userdata) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
         _cleanup_(context_freep) Context* context = NULL;
         _cleanup_free_ char *booted_version = NULL;
@@ -993,7 +984,7 @@ static int verb_update(int argc, char **argv, void *userdata) {
                         return log_error_errno(SYNTHETIC_ERRNO(ENODATA), "/etc/os-release lacks IMAGE_VERSION field.");
         }
 
-        r = process_image(/* ro= */ false, &mounted_dir, &loop_device, &decrypted_image);
+        r = process_image(/* ro= */ false, &mounted_dir, &loop_device);
         if (r < 0)
                 return r;
 
@@ -1096,7 +1087,6 @@ static int component_name_valid(const char *c) {
 
 static int verb_components(int argc, char **argv, void *userdata) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
         _cleanup_(set_freep) Set *names = NULL;
         _cleanup_free_ char **z = NULL; /* We use simple free() rather than strv_free() here, since set_free() will free the strings for us */
@@ -1106,7 +1096,7 @@ static int verb_components(int argc, char **argv, void *userdata) {
 
         assert(argc <= 1);
 
-        r = process_image(/* ro= */ false, &mounted_dir, &loop_device, &decrypted_image);
+        r = process_image(/* ro= */ false, &mounted_dir, &loop_device);
         if (r < 0)
                 return r;
 

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 491e4a0ea284d6a16b69a370bbc92a30969c1b2b..08b005e6bed0b80b25d10e8b911e4f7667121a99 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -107,7 +107,6 @@ static Set *database_users = NULL, *database_groups = NULL;
 
 static uid_t search_uid = UID_INVALID;
 static UidRange *uid_range = NULL;
-static size_t n_uid_range = 0;
 
 static UGIDAllocationRange login_defs = {};
 static bool login_defs_need_warning = false;
@@ -123,7 +122,7 @@ STATIC_DESTRUCTOR_REGISTER(database_users, set_free_freep);
 STATIC_DESTRUCTOR_REGISTER(database_by_gid, hashmap_freep);
 STATIC_DESTRUCTOR_REGISTER(database_by_groupname, hashmap_freep);
 STATIC_DESTRUCTOR_REGISTER(database_groups, set_free_freep);
-STATIC_DESTRUCTOR_REGISTER(uid_range, freep);
+STATIC_DESTRUCTOR_REGISTER(uid_range, uid_range_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_image, freep);
 
@@ -1113,7 +1112,7 @@ static int add_user(Item *i) {
 
                 if (read_id_from_file(i, &c, NULL) > 0) {
 
-                        if (c <= 0 || !uid_range_contains(uid_range, n_uid_range, c))
+                        if (c <= 0 || !uid_range_contains(uid_range, c))
                                 log_debug("User ID " UID_FMT " of file not suitable for %s.", c, i->name);
                         else {
                                 r = uid_is_ok(c, i->name, true);
@@ -1144,7 +1143,7 @@ static int add_user(Item *i) {
                 maybe_emit_login_defs_warning();
 
                 for (;;) {
-                        r = uid_range_next_lower(uid_range, n_uid_range, &search_uid);
+                        r = uid_range_next_lower(uid_range, &search_uid);
                         if (r < 0)
                                 return log_error_errno(r, "No free user ID available for %s.", i->name);
 
@@ -1297,7 +1296,7 @@ static int add_group(Item *i) {
 
                 if (read_id_from_file(i, NULL, &c) > 0) {
 
-                        if (c <= 0 || !uid_range_contains(uid_range, n_uid_range, c))
+                        if (c <= 0 || !uid_range_contains(uid_range, c))
                                 log_debug("Group ID " GID_FMT " of file not suitable for %s.", c, i->name);
                         else {
                                 r = gid_is_ok(c, true);
@@ -1318,7 +1317,7 @@ static int add_group(Item *i) {
 
                 for (;;) {
                         /* We look for new GIDs in the UID pool! */
-                        r = uid_range_next_lower(uid_range, n_uid_range, &search_uid);
+                        r = uid_range_next_lower(uid_range, &search_uid);
                         if (r < 0)
                                 return log_error_errno(r, "No free group ID available for %s.", i->name);
 
@@ -1668,7 +1667,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                                           action[0],
                                           description ? "GECOS" : home ? "home directory" : "login shell");
 
-                r = uid_range_add_str(&uid_range, &n_uid_range, resolved_id);
+                r = uid_range_add_str(&uid_range, resolved_id);
                 if (r < 0)
                         return log_syntax(NULL, LOG_ERR, fname, line, SYNTHETIC_ERRNO(EINVAL),
                                           "Invalid UID range %s.", resolved_id);
@@ -2082,7 +2081,6 @@ static int read_credential_lines(void) {
 static int run(int argc, char *argv[]) {
 #ifndef STANDALONE
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *unlink_dir = NULL;
 #endif
         _cleanup_close_ int lock = -1;
@@ -2117,8 +2115,7 @@ static int run(int argc, char *argv[]) {
                                 DISSECT_IMAGE_FSCK |
                                 DISSECT_IMAGE_GROWFS,
                                 &unlink_dir,
-                                &loop_device,
-                                &decrypted_image);
+                                &loop_device);
                 if (r < 0)
                         return r;
 
@@ -2169,7 +2166,7 @@ static int run(int argc, char *argv[]) {
                 uid_t begin = login_defs.system_alloc_uid_min,
                       end = MIN3((uid_t) SYSTEM_UID_MAX, login_defs.system_uid_max, login_defs.system_gid_max);
                 if (begin < end) {
-                        r = uid_range_add(&uid_range, &n_uid_range, begin, end - begin + 1);
+                        r = uid_range_add(&uid_range, begin, end - begin + 1);
                         if (r < 0)
                                 return log_oom();
                 }

diff --git a/src/test/test-blockdev-util.c b/src/test/test-blockdev-util.c
index d6ac6da29912ade0ca1750ab4ba3e69deac7da69..4ccb7796073e43910b19d40e46a1d08c79cbd366 100644 (file)
--- a/src/test/test-blockdev-util.c
+++ b/src/test/test-blockdev-util.c
@@ -8,12 +8,12 @@ static void test_path_is_encrypted_one(const char *p, int expect) {
         int r;
 
         r = path_is_encrypted(p);
-        if (r == -ENOENT || ERRNO_IS_PRIVILEGE(r)) /* This might fail, if btrfs is used and we run in a
-                           * container. In that case we cannot resolve the device node paths that
-                           * BTRFS_IOC_DEV_INFO returns, because the device nodes are unlikely to exist in
-                           * the container. But if we can't stat() them we cannot determine the dev_t of
-                           * them, and thus cannot figure out if they are enrypted. Hence let's just ignore
-                           * ENOENT here. Also skip the test if we lack privileges. */
+        if (r == -ENOENT || (r < 0 && ERRNO_IS_PRIVILEGE(r)))
+                /* This might fail, if btrfs is used and we run in a container. In that case we cannot
+                 * resolve the device node paths that BTRFS_IOC_DEV_INFO returns, because the device nodes
+                 * are unlikely to exist in the container. But if we can't stat() them we cannot determine
+                 * the dev_t of them, and thus cannot figure out if they are enrypted. Hence let's just
+                 * ignore ENOENT here. Also skip the test if we lack privileges. */
                 return;
         assert_se(r >= 0);
 
@@ -23,8 +23,8 @@ static void test_path_is_encrypted_one(const char *p, int expect) {
 }
 
 TEST(path_is_encrypted) {
-        int booted = sd_booted(); /* If this is run in build environments such as koji, /dev might be a
-                                   * reguar fs. Don't assume too much if not running under systemd. */
+        int booted = sd_booted(); /* If this is run in build environments such as koji, /dev/ might be a
+                                   * regular fs. Don't assume too much if not running under systemd. */
 
         log_info("/* %s (sd_booted=%d) */", __func__, booted);
 

diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c
index bba8ff91bf62e7a9f437a8dd0611b6e8774227f2..4adae5b786bc351e7fc320555e94e102141e1bba 100644 (file)
--- a/src/test/test-loop-block.c
+++ b/src/test/test-loop-block.c
@@ -234,16 +234,16 @@ static int run(int argc, char *argv[]) {
         assert_se(dissected->partitions[PARTITION_HOME].node);
 
         assert_se(sd_id128_randomize(&id) >= 0);
-        assert_se(make_filesystem(dissected->partitions[PARTITION_ESP].node, "vfat", "EFI", id, true) >= 0);
+        assert_se(make_filesystem(dissected->partitions[PARTITION_ESP].node, "vfat", "EFI", NULL, id, true) >= 0);
 
         assert_se(sd_id128_randomize(&id) >= 0);
-        assert_se(make_filesystem(dissected->partitions[PARTITION_XBOOTLDR].node, "vfat", "xbootldr", id, true) >= 0);
+        assert_se(make_filesystem(dissected->partitions[PARTITION_XBOOTLDR].node, "vfat", "xbootldr", NULL, id, true) >= 0);
 
         assert_se(sd_id128_randomize(&id) >= 0);
-        assert_se(make_filesystem(dissected->partitions[PARTITION_ROOT].node, "ext4", "root", id, true) >= 0);
+        assert_se(make_filesystem(dissected->partitions[PARTITION_ROOT].node, "ext4", "root", NULL, id, true) >= 0);
 
         assert_se(sd_id128_randomize(&id) >= 0);
-        assert_se(make_filesystem(dissected->partitions[PARTITION_HOME].node, "ext4", "home", id, true) >= 0);
+        assert_se(make_filesystem(dissected->partitions[PARTITION_HOME].node, "ext4", "home", NULL, id, true) >= 0);
 
         dissected = dissected_image_unref(dissected);
         assert_se(dissect_loop_device(loop, NULL, NULL, 0, &dissected) >= 0);

diff --git a/src/test/test-mkdir.c b/src/test/test-mkdir.c
index c715d5f09648345b4339ad4273fdb98904689d43..2ea7257609afdc02ffbe857118683607882e3768 100644 (file)
--- a/src/test/test-mkdir.c
+++ b/src/test/test-mkdir.c
@@ -2,29 +2,120 @@
 
 #include <unistd.h>
 
+#include "fs-util.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "rm-rf.h"
+#include "stat-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
+#include "user-util.h"
 
-TEST(mkdir_p) {
+TEST(mkdir_p_safe) {
         _cleanup_(rm_rf_physical_and_freep) char *tmp = NULL;
-        _cleanup_free_ char *p = NULL;
+        _cleanup_free_ char *p = NULL, *q = NULL;
 
         assert_se(mkdtemp_malloc("/tmp/test-mkdir-XXXXXX", &tmp) >= 0);
 
-        assert_se(p = path_join(tmp, "run"));
+        assert_se(p = path_join(tmp, "run/aaa/bbb"));
         assert_se(mkdir_p(p, 0755) >= 0);
+        assert_se(is_dir(p, false) > 0);
+        assert_se(is_dir(p, true) > 0);
+
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "run/ccc/ddd"));
+        assert_se(mkdir_p_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
+        assert_se(is_dir(p, false) > 0);
+        assert_se(is_dir(p, true) > 0);
 
         p = mfree(p);
         assert_se(p = path_join(tmp, "var/run"));
-        assert_se(mkdir_parents(p, 0755) >= 0);
+        assert_se(mkdir_parents_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
         assert_se(symlink("../run", p) >= 0);
+        assert_se(is_dir(p, false) == 0);
+        assert_se(is_dir(p, true) > 0);
 
         p = mfree(p);
         assert_se(p = path_join(tmp, "var/run/hoge/foo/baz"));
-        assert_se(mkdir_p(p, 0755) >= 0);
+        assert_se(mkdir_p_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
+        assert_se(is_dir(p, false) > 0);
+        assert_se(is_dir(p, true) > 0);
+
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "not-exists"));
+        assert_se(q = path_join(p, "aaa"));
+        assert_se(mkdir_p_safe(p, q, 0755, UID_INVALID, GID_INVALID, 0) == -ENOENT);
+
+        p = mfree(p);
+        q = mfree(q);
+        assert_se(p = path_join(tmp, "regular-file"));
+        assert_se(q = path_join(p, "aaa"));
+        assert_se(touch(p) >= 0);
+        assert_se(mkdir_p_safe(p, q, 0755, UID_INVALID, GID_INVALID, 0) == -ENOTDIR);
+
+        p = mfree(p);
+        q = mfree(q);
+        assert_se(p = path_join(tmp, "symlink"));
+        assert_se(q = path_join(p, "hoge/foo"));
+        assert_se(symlink("aaa", p) >= 0);
+        assert_se(mkdir_p_safe(tmp, q, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
+        assert_se(is_dir(q, false) > 0);
+        assert_se(is_dir(q, true) > 0);
+        q = mfree(q);
+        assert_se(q = path_join(tmp, "aaa/hoge/foo"));
+        assert_se(is_dir(q, false) > 0);
+        assert_se(is_dir(q, true) > 0);
+
+        assert_se(mkdir_p_safe(tmp, "/tmp/test-mkdir-outside", 0755, UID_INVALID, GID_INVALID, 0) == -ENOTDIR);
+}
+
+TEST(mkdir_p_root) {
+        _cleanup_(rm_rf_physical_and_freep) char *tmp = NULL;
+        _cleanup_free_ char *p = NULL;
+
+        assert_se(mkdtemp_malloc("/tmp/test-mkdir-XXXXXX", &tmp) >= 0);
+
+        assert_se(p = path_join(tmp, "run/aaa/bbb"));
+        assert_se(mkdir_p_root(tmp, "/run/aaa/bbb", UID_INVALID, GID_INVALID, 0755) >= 0);
+        assert_se(is_dir(p, false) > 0);
+        assert_se(is_dir(p, true) > 0);
+
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "var/run"));
+        assert_se(mkdir_parents_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
+        assert_se(symlink("../run", p) >= 0);
+        assert_se(is_dir(p, false) == 0);
+        assert_se(is_dir(p, true) > 0);
+
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "var/run/hoge/foo/baz"));
+        assert_se(mkdir_p_root(tmp, "/var/run/hoge/foo/baz", UID_INVALID, GID_INVALID, 0755) >= 0);
+        assert_se(is_dir(p, false) > 0);
+        assert_se(is_dir(p, true) > 0);
+
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "not-exists"));
+        assert_se(mkdir_p_root(p, "/aaa", UID_INVALID, GID_INVALID, 0755) == -ENOENT);
+
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "regular-file"));
+        assert_se(touch(p) >= 0);
+        assert_se(mkdir_p_root(p, "/aaa", UID_INVALID, GID_INVALID, 0755) == -ENOTDIR);
+
+        /* FIXME: The tests below do not work.
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "symlink"));
+        assert_se(symlink("aaa", p) >= 0);
+        assert_se(mkdir_p_root(tmp, "/symlink/hoge/foo", UID_INVALID, GID_INVALID, 0755) >= 0);
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "symlink/hoge/foo"));
+        assert_se(is_dir(p, false) > 0);
+        assert_se(is_dir(p, true) > 0);
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "aaa/hoge/foo"));
+        assert_se(is_dir(p, false) > 0);
+        assert_se(is_dir(p, true) > 0);
+        */
 }
 
 DEFINE_TEST_MAIN(LOG_DEBUG);

diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c
index be8530bdd857a55626884c8e5e600aead4c39864..ce8b8e4bcafb3425b45ac6ffc0dde73a2144c61e 100644 (file)
--- a/src/test/test-uid-range.c
+++ b/src/test/test-uid-range.c
@@ -15,105 +15,104 @@
 #include "virt.h"
 
 TEST(uid_range) {
-        _cleanup_free_ UidRange *p = NULL;
-        size_t n = 0;
+        _cleanup_(uid_range_freep) UidRange *p = NULL;
         uid_t search;
 
-        assert_se(uid_range_covers(p, n, 0, 0));
-        assert_se(!uid_range_covers(p, n, 0, 1));
-        assert_se(!uid_range_covers(p, n, 100, UINT32_MAX));
-
-        assert_se(uid_range_add_str(&p, &n, "500-999") >= 0);
-        assert_se(n == 1);
-        assert_se(p[0].start == 500);
-        assert_se(p[0].nr == 500);
-
-        assert_se(!uid_range_contains(p, n, 499));
-        assert_se(uid_range_contains(p, n, 500));
-        assert_se(uid_range_contains(p, n, 999));
-        assert_se(!uid_range_contains(p, n, 1000));
-
-        assert_se(!uid_range_covers(p, n, 100, 150));
-        assert_se(!uid_range_covers(p, n, 400, 200));
-        assert_se(!uid_range_covers(p, n, 499, 1));
-        assert_se(uid_range_covers(p, n, 500, 1));
-        assert_se(uid_range_covers(p, n, 501, 10));
-        assert_se(uid_range_covers(p, n, 999, 1));
-        assert_se(!uid_range_covers(p, n, 999, 2));
-        assert_se(!uid_range_covers(p, n, 1000, 1));
-        assert_se(!uid_range_covers(p, n, 1000, 100));
-        assert_se(!uid_range_covers(p, n, 1001, 100));
+        assert_se(uid_range_covers(p, 0, 0));
+        assert_se(!uid_range_covers(p, 0, 1));
+        assert_se(!uid_range_covers(p, 100, UINT32_MAX));
+
+        assert_se(uid_range_add_str(&p, "500-999") >= 0);
+        assert_se(p);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 500);
+        assert_se(p->entries[0].nr == 500);
+
+        assert_se(!uid_range_contains(p, 499));
+        assert_se(uid_range_contains(p, 500));
+        assert_se(uid_range_contains(p, 999));
+        assert_se(!uid_range_contains(p, 1000));
+
+        assert_se(!uid_range_covers(p, 100, 150));
+        assert_se(!uid_range_covers(p, 400, 200));
+        assert_se(!uid_range_covers(p, 499, 1));
+        assert_se(uid_range_covers(p, 500, 1));
+        assert_se(uid_range_covers(p, 501, 10));
+        assert_se(uid_range_covers(p, 999, 1));
+        assert_se(!uid_range_covers(p, 999, 2));
+        assert_se(!uid_range_covers(p, 1000, 1));
+        assert_se(!uid_range_covers(p, 1000, 100));
+        assert_se(!uid_range_covers(p, 1001, 100));
 
         search = UID_INVALID;
-        assert_se(uid_range_next_lower(p, n, &search));
+        assert_se(uid_range_next_lower(p, &search));
         assert_se(search == 999);
-        assert_se(uid_range_next_lower(p, n, &search));
+        assert_se(uid_range_next_lower(p, &search));
         assert_se(search == 998);
         search = 501;
-        assert_se(uid_range_next_lower(p, n, &search));
+        assert_se(uid_range_next_lower(p, &search));
         assert_se(search == 500);
-        assert_se(uid_range_next_lower(p, n, &search) == -EBUSY);
-
-        assert_se(uid_range_add_str(&p, &n, "1000") >= 0);
-        assert_se(n == 1);
-        assert_se(p[0].start == 500);
-        assert_se(p[0].nr == 501);
-
-        assert_se(uid_range_add_str(&p, &n, "30-40") >= 0);
-        assert_se(n == 2);
-        assert_se(p[0].start == 30);
-        assert_se(p[0].nr == 11);
-        assert_se(p[1].start == 500);
-        assert_se(p[1].nr == 501);
-
-        assert_se(uid_range_add_str(&p, &n, "60-70") >= 0);
-        assert_se(n == 3);
-        assert_se(p[0].start == 30);
-        assert_se(p[0].nr == 11);
-        assert_se(p[1].start == 60);
-        assert_se(p[1].nr == 11);
-        assert_se(p[2].start == 500);
-        assert_se(p[2].nr == 501);
-
-        assert_se(uid_range_add_str(&p, &n, "20-2000") >= 0);
-        assert_se(n == 1);
-        assert_se(p[0].start == 20);
-        assert_se(p[0].nr == 1981);
-
-        assert_se(uid_range_add_str(&p, &n, "2002") >= 0);
-        assert_se(n == 2);
-        assert_se(p[0].start == 20);
-        assert_se(p[0].nr == 1981);
-        assert_se(p[1].start == 2002);
-        assert_se(p[1].nr == 1);
-
-        assert_se(uid_range_add_str(&p, &n, "2001") >= 0);
-        assert_se(n == 1);
-        assert_se(p[0].start == 20);
-        assert_se(p[0].nr == 1983);
+        assert_se(uid_range_next_lower(p, &search) == -EBUSY);
+
+        assert_se(uid_range_add_str(&p, "1000") >= 0);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 500);
+        assert_se(p->entries[0].nr == 501);
+
+        assert_se(uid_range_add_str(&p, "30-40") >= 0);
+        assert_se(p->n_entries == 2);
+        assert_se(p->entries[0].start == 30);
+        assert_se(p->entries[0].nr == 11);
+        assert_se(p->entries[1].start == 500);
+        assert_se(p->entries[1].nr == 501);
+
+        assert_se(uid_range_add_str(&p, "60-70") >= 0);
+        assert_se(p->n_entries == 3);
+        assert_se(p->entries[0].start == 30);
+        assert_se(p->entries[0].nr == 11);
+        assert_se(p->entries[1].start == 60);
+        assert_se(p->entries[1].nr == 11);
+        assert_se(p->entries[2].start == 500);
+        assert_se(p->entries[2].nr == 501);
+
+        assert_se(uid_range_add_str(&p, "20-2000") >= 0);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 20);
+        assert_se(p->entries[0].nr == 1981);
+
+        assert_se(uid_range_add_str(&p, "2002") >= 0);
+        assert_se(p->n_entries == 2);
+        assert_se(p->entries[0].start == 20);
+        assert_se(p->entries[0].nr == 1981);
+        assert_se(p->entries[1].start == 2002);
+        assert_se(p->entries[1].nr == 1);
+
+        assert_se(uid_range_add_str(&p, "2001") >= 0);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 20);
+        assert_se(p->entries[0].nr == 1983);
 }
 
 TEST(load_userns) {
+        _cleanup_(uid_range_freep) UidRange *p = NULL;
         _cleanup_(unlink_and_freep) char *fn = NULL;
-        _cleanup_free_ UidRange *p = NULL;
         _cleanup_fclose_ FILE *f = NULL;
-        size_t n = 0;
         int r;
 
-        r = uid_range_load_userns(&p, &n, NULL);
-        if (ERRNO_IS_NOT_SUPPORTED(r))
+        r = uid_range_load_userns(&p, NULL);
+        if (r < 0 && ERRNO_IS_NOT_SUPPORTED(r))
                 return;
 
         assert_se(r >= 0);
-        assert_se(uid_range_contains(p, n, getuid()));
+        assert_se(uid_range_contains(p, getuid()));
 
         r = running_in_userns();
         if (r == 0) {
-                assert_se(n == 1);
-                assert_se(p[0].start == 0);
-                assert_se(p[0].nr == UINT32_MAX);
+                assert_se(p->n_entries == 1);
+                assert_se(p->entries[0].start == 0);
+                assert_se(p->entries[0].nr == UINT32_MAX);
 
-                assert_se(uid_range_covers(p, n, 0, UINT32_MAX));
+                assert_se(uid_range_covers(p, 0, UINT32_MAX));
         }
 
         assert_se(fopen_temporary(NULL, &f, &fn) >= 0);
@@ -121,19 +120,57 @@ TEST(load_userns) {
               "100 0 20\n", f);
         assert_se(fflush_and_check(f) >= 0);
 
-        p = mfree(p);
-        n = 0;
+        p = uid_range_free(p);
 
-        assert_se(uid_range_load_userns(&p, &n, fn) >= 0);
+        assert_se(uid_range_load_userns(&p, fn) >= 0);
 
-        assert_se(uid_range_contains(p, n, 0));
-        assert_se(uid_range_contains(p, n, 19));
-        assert_se(!uid_range_contains(p, n, 20));
+        assert_se(uid_range_contains(p, 0));
+        assert_se(uid_range_contains(p, 19));
+        assert_se(!uid_range_contains(p, 20));
 
-        assert_se(!uid_range_contains(p, n, 99));
-        assert_se(uid_range_contains(p, n, 100));
-        assert_se(uid_range_contains(p, n, 119));
-        assert_se(!uid_range_contains(p, n, 120));
+        assert_se(!uid_range_contains(p, 99));
+        assert_se(uid_range_contains(p, 100));
+        assert_se(uid_range_contains(p, 119));
+        assert_se(!uid_range_contains(p, 120));
+}
+
+TEST(uid_range_coalesce) {
+        _cleanup_(uid_range_freep) UidRange *p = NULL;
+
+        for (size_t i = 0; i < 10; i++) {
+                assert_se(uid_range_add_internal(&p, i * 10, 10, /* coalesce = */ false) >= 0);
+                assert_se(uid_range_add_internal(&p, i * 10 + 5, 10, /* coalesce = */ false) >= 0);
+        }
+
+        assert_se(uid_range_add_internal(&p, 100, 1, /* coalesce = */ true) >= 0);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 0);
+        assert_se(p->entries[0].nr == 105);
+
+        p = uid_range_free(p);
+
+        for (size_t i = 0; i < 10; i++) {
+                assert_se(uid_range_add_internal(&p, (10 - i) * 10, 10, /* coalesce = */ false) >= 0);
+                assert_se(uid_range_add_internal(&p, (10 - i) * 10 + 5, 10, /* coalesce = */ false) >= 0);
+        }
+
+        assert_se(uid_range_add_internal(&p, 100, 1, /* coalesce = */ true) >= 0);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 10);
+        assert_se(p->entries[0].nr == 105);
+
+        p = uid_range_free(p);
+
+        for (size_t i = 0; i < 10; i++) {
+                assert_se(uid_range_add_internal(&p, i * 10, 10, /* coalesce = */ false) >= 0);
+                assert_se(uid_range_add_internal(&p, i * 10 + 5, 10, /* coalesce = */ false) >= 0);
+                assert_se(uid_range_add_internal(&p, (10 - i) * 10, 10, /* coalesce = */ false) >= 0);
+                assert_se(uid_range_add_internal(&p, (10 - i) * 10 + 5, 10, /* coalesce = */ false) >= 0);
+        }
+        assert_se(uid_range_add_internal(&p, 100, 1, /* coalesce = */ true) >= 0);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 0);
+        assert_se(p->entries[0].nr == 115);
 }
 
 DEFINE_TEST_MAIN(LOG_DEBUG);

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 93b29e2edbeba25cf248131e9104742d70bb5ed6..7e99921db92dff0ae357d33b1965f23c8ea04c57 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -205,9 +205,6 @@ STATIC_DESTRUCTOR_REGISTER(arg_exclude_prefixes, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_image, freep);
 
-static int specifier_machine_id_safe(char specifier, const void *data, const char *root, const void *userdata, char **ret);
-static int specifier_directory(char specifier, const void *data, const char *root, const void *userdata, char **ret);
-
 static int specifier_machine_id_safe(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
         int r;
 
@@ -283,7 +280,7 @@ static int log_unresolvable_specifier(const char *filename, unsigned line) {
                    notified ? LOG_DEBUG : LOG_NOTICE,
                    filename, line, 0,
                    "Failed to resolve specifier: %s, skipping",
-                   arg_user ? "Required $XDG_... variable not defined" : "uninitialized /etc detected");
+                   arg_user ? "Required $XDG_... variable not defined" : "uninitialized /etc/ detected");
 
         if (!notified)
                 log_notice("All rules containing unresolvable specifiers will be skipped.");
@@ -2187,7 +2184,7 @@ static int mkdir_parents_rm_if_wrong_type(mode_t child_mode, const char *path) {
                         return log_error_errno(r, "Failed to stat \"%s\" at \"%s\": %m", t, strnull(parent_name));
                 }
 
-                CLOSE_AND_REPLACE(parent_fd, next_fd);
+                close_and_replace(parent_fd, next_fd);
         }
 }
 
@@ -3841,7 +3838,6 @@ DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(item_array_hash_ops, char, string_
 static int run(int argc, char *argv[]) {
 #ifndef STANDALONE
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
-        _cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *unlink_dir = NULL;
 #endif
         _cleanup_strv_free_ char **config_dirs = NULL;
@@ -3925,8 +3921,7 @@ static int run(int argc, char *argv[]) {
                                 DISSECT_IMAGE_FSCK |
                                 DISSECT_IMAGE_GROWFS,
                                 &unlink_dir,
-                                &loop_device,
-                                &decrypted_image);
+                                &loop_device);
                 if (r < 0)
                         return r;
 

diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 1fc27f4b642794ee78e911ade716ea9692520a07..f451c0d0e15a8b49d5833de9ac7a8ccb1873bac5 100644 (file)
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -439,7 +439,7 @@ int main(int argc, char *argv[]) {
                 return 1;
         }
 
-        fd = open(node, O_RDONLY|O_NONBLOCK|O_CLOEXEC);
+        fd = open(node, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
         if (fd < 0) {
                 log_error("unable to open '%s'", node);
                 return 1;

diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
index 2d758c4082f105b4ad9ade30e8d83a9d5ebad844..5945dcbbaec304405b7bd4e6e234e7fac7636e72 100644 (file)
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -743,7 +743,7 @@ static int open_drive(Context *c) {
         assert(c->fd < 0);
 
         for (int cnt = 0;; cnt++) {
-                fd = open(arg_node, O_RDONLY|O_NONBLOCK|O_CLOEXEC);
+                fd = open(arg_node, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
                 if (fd >= 0)
                         break;
                 if (++cnt >= 20 || errno != EBUSY)

diff --git a/src/udev/fido_id/fido_id.c b/src/udev/fido_id/fido_id.c
index a9f5f8f8a64a0a6c934216a13deac260506b7aac..58a282781809ca44442d2d894cbad6cd3c62ee8b 100644 (file)
--- a/src/udev/fido_id/fido_id.c
+++ b/src/udev/fido_id/fido_id.c
@@ -67,7 +67,7 @@ static int run(int argc, char **argv) {
         if (!desc_path)
                 return log_oom();
 
-        fd = open(desc_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
+        fd = open(desc_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC | O_NOCTTY);
         if (fd < 0)
                 return log_device_error_errno(hid_device, errno,
                                               "Failed to open report descriptor at '%s': %m", desc_path);

diff --git a/src/udev/mtd_probe/mtd_probe.c b/src/udev/mtd_probe/mtd_probe.c
index df1f1c173a31f67d0c5669b9ce4a446b12bf0394..d5fb64f1948a31f16718c61b1227b3a3fbb474b6 100644 (file)
--- a/src/udev/mtd_probe/mtd_probe.c
+++ b/src/udev/mtd_probe/mtd_probe.c
@@ -41,7 +41,7 @@ int main(int argc, char** argv) {
                 return EXIT_FAILURE;
         }
 
-        mtd_fd = open(argv[1], O_RDONLY|O_CLOEXEC);
+        mtd_fd = open(argv[1], O_RDONLY|O_CLOEXEC|O_NOCTTY);
         if (mtd_fd < 0) {
                 log_error_errno(errno, "Failed to open: %m");
                 return EXIT_FAILURE;

diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index 60e2b40c27b7400f3fe7ab5eaff158c74b6020ca..f1ce8601bd8257dabe32ba8600268425ddb663e4 100644 (file)
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -751,7 +751,7 @@ int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname) {
         struct stat statbuf;
         int err = 0;
 
-        fd = open(devname, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
+        fd = open(devname, O_RDONLY | O_NONBLOCK | O_CLOEXEC | O_NOCTTY);
         if (fd < 0) {
                 log_debug_errno(errno, "scsi_id: cannot open %s: %m", devname);
                 return 1;
@@ -795,7 +795,7 @@ int scsi_get_serial(struct scsi_id_device *dev_scsi, const char *devname,
         for (cnt = 20; cnt > 0; cnt--) {
                 struct timespec duration;
 
-                fd = open(devname, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
+                fd = open(devname, O_RDONLY | O_NONBLOCK | O_CLOEXEC | O_NOCTTY);
                 if (fd >= 0 || errno != EBUSY)
                         break;
                 duration.tv_sec = 0;

diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index 435cac44ed585ae69e2722ace7614f67acda1e32..92ea43eef0590201d463fe27920916bb4d2f1a05 100644 (file)
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -310,7 +310,7 @@ static int builtin_blkid(sd_device *dev, sd_netlink **rtnl, int argc, char *argv
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to get device name: %m");
 
-        fd = sd_device_open(dev, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
+        fd = sd_device_open(dev, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
         if (fd < 0) {
                 bool ignore = ERRNO_IS_DEVICE_ABSENT(fd);
                 log_device_debug_errno(dev, fd, "Failed to open block device %s%s: %m",

diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index f9d4f1dd4ef4b56481780fa9580beb2a784e0513..8cd627807f9667e5d7aaea07652a0a9a6b72d0b0 100644 (file)
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -21,7 +21,7 @@ static int builtin_btrfs(sd_device *dev, sd_netlink **rtnl, int argc, char *argv
         if (argc != 3 || !streq(argv[1], "ready"))
                 return log_device_error_errno(dev, SYNTHETIC_ERRNO(EINVAL), "Invalid arguments");
 
-        fd = open("/dev/btrfs-control", O_RDWR|O_CLOEXEC);
+        fd = open("/dev/btrfs-control", O_RDWR|O_CLOEXEC|O_NOCTTY);
         if (fd < 0) {
                 if (ERRNO_IS_DEVICE_ABSENT(errno)) {
                         /* Driver not installed? Then we aren't ready. This is useful in initrds that lack

diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index 6da8ad85bb0308b0b0e3a2be26baac7c9567eaa1..07421202483e4aeb50b84aeafb8ee38f22c6f8ae 100644 (file)
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -50,7 +50,7 @@ static void extract_info(sd_device *dev, bool test) {
         struct input_absinfo xabsinfo = {}, yabsinfo = {};
         _cleanup_close_ int fd = -1;
 
-        fd = sd_device_open(dev, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
+        fd = sd_device_open(dev, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
         if (fd < 0)
                 return;
 

diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index 4749cb4cf28b97f617550ebb8c578c5ef69e9b6e..4acbc87b9676af02b509052498335ac7c868ad9d 100644 (file)
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -24,6 +24,7 @@
 
 #include "alloc-util.h"
 #include "chase-symlinks.h"
+#include "device-private.h"
 #include "device-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
@@ -98,7 +99,7 @@ static sd_device *skip_virtio(sd_device *dev) {
 
 static int get_virtfn_info(sd_device *pcidev, sd_device **ret_physfn_pcidev, char **ret_suffix) {
         _cleanup_(sd_device_unrefp) sd_device *physfn_pcidev = NULL;
-        const char *physfn_syspath, *syspath;
+        const char *syspath;
         _cleanup_closedir_ DIR *dir = NULL;
         int r;
 
@@ -115,15 +116,11 @@ static int get_virtfn_info(sd_device *pcidev, sd_device **ret_physfn_pcidev, cha
         if (r < 0)
                 return r;
 
-        r = sd_device_get_syspath(physfn_pcidev, &physfn_syspath);
+        /* Find the virtual function number by finding the right virtfn link. */
+        r = device_opendir(physfn_pcidev, NULL, &dir);
         if (r < 0)
                 return r;
 
-        /* Find the virtual function number by finding the right virtfn link. */
-        dir = opendir(physfn_syspath);
-        if (!dir)
-                return -errno;
-
         FOREACH_DIRENT_ALL(de, dir, break) {
                 _cleanup_(sd_device_unrefp) sd_device *virtfn_pcidev = NULL;
                 const char *n, *s;
@@ -229,23 +226,29 @@ static int dev_pci_onboard(sd_device *dev, const LinkInfo *info, NetNames *names
 }
 
 /* read the 256 bytes PCI configuration space to check the multi-function bit */
-static bool is_pci_multifunction(sd_device *dev) {
-        _cleanup_close_ int fd = -1;
+static int is_pci_multifunction(sd_device *dev) {
+        _cleanup_free_ uint8_t *config = NULL;
         const char *filename, *syspath;
-        uint8_t config[64];
+        size_t len;
+        int r;
 
-        if (sd_device_get_syspath(dev, &syspath) < 0)
-                return false;
+        r = sd_device_get_syspath(dev, &syspath);
+        if (r < 0)
+                return r;
 
         filename = strjoina(syspath, "/config");
-        fd = open(filename, O_RDONLY | O_CLOEXEC);
-        if (fd < 0)
-                return false;
-        if (read(fd, &config, sizeof(config)) != sizeof(config))
-                return false;
+        r = read_virtual_file(filename, PCI_HEADER_TYPE + 1, (char **) &config, &len);
+        if (r < 0)
+                return r;
+        if (len < PCI_HEADER_TYPE + 1)
+                return -EINVAL;
+
+#ifndef PCI_HEADER_TYPE_MULTIFUNC
+#define PCI_HEADER_TYPE_MULTIFUNC 0x80
+#endif
 
         /* bit 0-6 header type, bit 7 multi/single function device */
-        return config[PCI_HEADER_TYPE] & 0x80;
+        return config[PCI_HEADER_TYPE] & PCI_HEADER_TYPE_MULTIFUNC;
 }
 
 static bool is_pci_ari_enabled(sd_device *dev) {
@@ -279,9 +282,9 @@ static bool is_pci_bridge(sd_device *dev) {
         return b;
 }
 
-static int parse_hotplug_slot_from_function_id(sd_device *dev, const char *slots, uint32_t *ret) {
+static int parse_hotplug_slot_from_function_id(sd_device *dev, int slots_dirfd, uint32_t *ret) {
         uint64_t function_id;
-        char path[PATH_MAX];
+        char filename[NAME_MAX+1];
         const char *attr;
         int r;
 
@@ -294,7 +297,7 @@ static int parse_hotplug_slot_from_function_id(sd_device *dev, const char *slots
          * between PCI function and its hotplug slot. */
 
         assert(dev);
-        assert(slots);
+        assert(slots_dirfd >= 0);
         assert(ret);
 
         if (!naming_scheme_has(NAMING_SLOT_FUNCTION_ID))
@@ -312,27 +315,27 @@ static int parse_hotplug_slot_from_function_id(sd_device *dev, const char *slots
                                               "Invalid function id (0x%"PRIx64"), ignoring.",
                                               function_id);
 
-        if (!snprintf_ok(path, sizeof path, "%s/%08"PRIx64, slots, function_id))
+        if (!snprintf_ok(filename, sizeof(filename), "%08"PRIx64, function_id))
                 return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ENAMETOOLONG),
                                               "PCI slot path is too long, ignoring.");
 
-        if (access(path, F_OK) < 0)
-                return log_device_debug_errno(dev, errno, "Cannot access %s, ignoring: %m", path);
+        if (faccessat(slots_dirfd, filename, F_OK, 0) < 0)
+                return log_device_debug_errno(dev, errno, "Cannot access %s under pci slots, ignoring: %m", filename);
 
         *ret = (uint32_t) function_id;
         return 1;
 }
 
 static int dev_pci_slot(sd_device *dev, const LinkInfo *info, NetNames *names) {
-        const char *sysname, *attr, *syspath;
+        const char *sysname, *attr;
         _cleanup_(sd_device_unrefp) sd_device *pci = NULL;
         _cleanup_closedir_ DIR *dir = NULL;
         unsigned domain, bus, slot, func;
         sd_device *hotplug_slot_dev;
         unsigned long dev_port = 0;
         uint32_t hotplug_slot = 0;
-        char slots[PATH_MAX], *s;
         size_t l;
+        char *s;
         int r;
 
         assert(dev);
@@ -384,7 +387,7 @@ static int dev_pci_slot(sd_device *dev, const LinkInfo *info, NetNames *names) {
         if (domain > 0)
                 l = strpcpyf(&s, l, "P%u", domain);
         l = strpcpyf(&s, l, "p%us%u", bus, slot);
-        if (func > 0 || is_pci_multifunction(names->pcidev))
+        if (func > 0 || is_pci_multifunction(names->pcidev) > 0)
                 l = strpcpyf(&s, l, "f%u", func);
         if (!isempty(info->phys_port_name))
                 /* kernel provided front panel port name for multi-port PCI device */
@@ -403,21 +406,13 @@ static int dev_pci_slot(sd_device *dev, const LinkInfo *info, NetNames *names) {
         if (r < 0)
                 return log_debug_errno(r, "sd_device_new_from_subsystem_sysname() failed: %m");
 
-        r = sd_device_get_syspath(pci, &syspath);
+        r = device_opendir(pci, "slots", &dir);
         if (r < 0)
-                return log_device_debug_errno(pci, r, "sd_device_get_syspath() failed: %m");
-
-        if (!snprintf_ok(slots, sizeof slots, "%s/slots", syspath))
-                return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ENAMETOOLONG),
-                                              "Cannot access %s/slots: %m", syspath);
-
-        dir = opendir(slots);
-        if (!dir)
-                return log_device_debug_errno(dev, errno, "Cannot access %s: %m", slots);
+                return log_device_debug_errno(dev, r, "Cannot access 'slots' subdirectory: %m");
 
         hotplug_slot_dev = names->pcidev;
         while (hotplug_slot_dev) {
-                r = parse_hotplug_slot_from_function_id(hotplug_slot_dev, slots, &hotplug_slot);
+                r = parse_hotplug_slot_from_function_id(hotplug_slot_dev, dirfd(dir), &hotplug_slot);
                 if (r < 0)
                         return 0;
                 if (r > 0) {
@@ -430,8 +425,8 @@ static int dev_pci_slot(sd_device *dev, const LinkInfo *info, NetNames *names) {
                         return log_device_debug_errno(hotplug_slot_dev, r, "Failed to get sysname: %m");
 
                 FOREACH_DIRENT_ALL(de, dir, break) {
-                        _cleanup_free_ char *address = NULL;
-                        char str[PATH_MAX];
+                        _cleanup_free_ char *path = NULL;
+                        const char *address;
                         uint32_t i;
 
                         if (dot_or_dot_dot(de->d_name))
@@ -441,30 +436,37 @@ static int dev_pci_slot(sd_device *dev, const LinkInfo *info, NetNames *names) {
                         if (r < 0 || i <= 0)
                                 continue;
 
+                        path = path_join("slots", de->d_name, "address");
+                        if (!path)
+                                return -ENOMEM;
+
+                        if (sd_device_get_sysattr_value(pci, path, &address) < 0)
+                                continue;
+
                         /* match slot address with device by stripping the function */
-                        if (snprintf_ok(str, sizeof str, "%s/%s/address", slots, de->d_name) &&
-                            read_one_line_file(str, &address) >= 0 &&
-                            startswith(sysname, address)) {
-                                hotplug_slot = i;
-
-                                /* We found the match between PCI device and slot. However, we won't use the
-                                 * slot index if the device is a PCI bridge, because it can have other child
-                                 * devices that will try to claim the same index and that would create name
-                                 * collision. */
-                                if (naming_scheme_has(NAMING_BRIDGE_NO_SLOT) && is_pci_bridge(hotplug_slot_dev)) {
-                                        if (naming_scheme_has(NAMING_BRIDGE_MULTIFUNCTION_SLOT) && !is_pci_multifunction(names->pcidev)) {
-                                                log_device_debug(dev, "Not using slot information because the PCI device associated with the hotplug slot is a bridge and the PCI device has single function.");
-                                                return 0;
-                                        }
-
-                                        if (!naming_scheme_has(NAMING_BRIDGE_MULTIFUNCTION_SLOT)) {
-                                                log_device_debug(dev, "Not using slot information because the PCI device is a bridge.");
-                                                return 0;
-                                        }
+                        if (!startswith(sysname, address))
+                                continue;
+
+                        hotplug_slot = i;
+
+                        /* We found the match between PCI device and slot. However, we won't use the slot
+                         * index if the device is a PCI bridge, because it can have other child devices that
+                         * will try to claim the same index and that would create name collision. */
+                        if (naming_scheme_has(NAMING_BRIDGE_NO_SLOT) && is_pci_bridge(hotplug_slot_dev)) {
+                                if (naming_scheme_has(NAMING_BRIDGE_MULTIFUNCTION_SLOT) && is_pci_multifunction(names->pcidev) <= 0) {
+                                        log_device_debug(dev,
+                                                         "Not using slot information because the PCI device associated with "
+                                                         "the hotplug slot is a bridge and the PCI device has a single function.");
+                                        return 0;
                                 }
 
-                                break;
+                                if (!naming_scheme_has(NAMING_BRIDGE_MULTIFUNCTION_SLOT)) {
+                                        log_device_debug(dev, "Not using slot information because the PCI device is a bridge.");
+                                        return 0;
+                                }
                         }
+
+                        break;
                 }
                 if (hotplug_slot > 0)
                         break;
@@ -479,7 +481,7 @@ static int dev_pci_slot(sd_device *dev, const LinkInfo *info, NetNames *names) {
                 if (domain > 0)
                         l = strpcpyf(&s, l, "P%u", domain);
                 l = strpcpyf(&s, l, "s%"PRIu32, hotplug_slot);
-                if (func > 0 || is_pci_multifunction(names->pcidev))
+                if (func > 0 || is_pci_multifunction(names->pcidev) > 0)
                         l = strpcpyf(&s, l, "f%u", func);
                 if (!isempty(info->phys_port_name))
                         l = strpcpyf(&s, l, "n%s", info->phys_port_name);

diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index eb326612555abb8035821bfbd2389f8a2c4b078e..d94718f468022e706262dddf26d956d9401c0b37 100644 (file)
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -158,7 +158,7 @@ static int dev_if_packed_info(sd_device *dev, char *ifs_str, size_t len) {
                 return r;
 
         filename = strjoina(syspath, "/descriptors");
-        fd = open(filename, O_RDONLY|O_CLOEXEC);
+        fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOCTTY);
         if (fd < 0)
                 return log_device_debug_errno(dev, errno, "Failed to open \"%s\": %m", filename);
 

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 7bff3115439a1706a45b9428610d5139b0f6b193..d4622b2f9d827b99a17ba779c147928bbeb2ce81 100644 (file)
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -1163,6 +1163,7 @@ void udev_event_process_inotify_watch(UdevEvent *event, int inotify_fd) {
                 return;
 
         r = udev_watch_begin(inotify_fd, dev);
-        if (r < 0)
-                log_device_warning_errno(dev, r, "Failed to add inotify watch, ignoring: %m");
+        if (r < 0) /* The device may be already removed, downgrade log level in that case. */
+                log_device_full_errno(dev, r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r,
+                                      "Failed to add inotify watch, ignoring: %m");
 }

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 4e7dca06de0d86819c7edf4ad9f8237ffc95e497..9e34ea6b01f4ffbe50aed3931aa660164f46ba9d 100644 (file)
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -14,6 +14,7 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "hexdecoct.h"
+#include "label.h"
 #include "mkdir-label.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -69,8 +70,6 @@ int udev_node_cleanup(void) {
 }
 
 static int node_symlink(sd_device *dev, const char *devnode, const char *slink) {
-        _cleanup_free_ char *target = NULL;
-        const char *id, *slink_tmp;
         struct stat st;
         int r;
 
@@ -91,35 +90,89 @@ static int node_symlink(sd_device *dev, const char *devnode, const char *slink)
         } else if (errno != ENOENT)
                 return log_device_debug_errno(dev, errno, "Failed to lstat() '%s': %m", slink);
 
-        /* use relative link */
-        r = path_make_relative_parent(slink, devnode, &target);
+        r = mkdir_parents_label(slink, 0755);
         if (r < 0)
-                return log_device_debug_errno(dev, r, "Failed to get relative path from '%s' to '%s': %m", slink, devnode);
+                return log_device_debug_errno(dev, r, "Failed to create parent directory of '%s': %m", slink);
 
-        r = device_get_device_id(dev, &id);
+        /* use relative link */
+        r = symlink_atomic_full_label(devnode, slink, /* make_relative = */ true);
         if (r < 0)
-                return log_device_debug_errno(dev, r, "Failed to get device id: %m");
+                return log_device_debug_errno(dev, r, "Failed to create symlink '%s' to '%s': %m", slink, devnode);
 
-        slink_tmp = strjoina(slink, ".tmp-", id);
-        (void) unlink(slink_tmp);
+        log_device_debug(dev, "Successfully created symlink '%s' to '%s'", slink, devnode);
+        return 0;
+}
 
-        r = mkdir_parents_label(slink_tmp, 0755);
-        if (r < 0)
-                return log_device_debug_errno(dev, r, "Failed to create parent directory of '%s': %m", slink_tmp);
+static int stack_directory_read_one(int dirfd, const char *id, bool is_symlink, char **devnode, int *priority) {
+        int tmp_prio, r;
 
-        mac_selinux_create_file_prepare(slink_tmp, S_IFLNK);
-        r = RET_NERRNO(symlink(target, slink_tmp));
-        mac_selinux_create_file_clear();
-        if (r < 0)
-                return log_device_debug_errno(dev, r, "Failed to create symlink '%s' to '%s': %m", slink_tmp, target);
+        assert(dirfd >= 0);
+        assert(id);
+        assert(devnode);
+        assert(priority);
 
-        if (rename(slink_tmp, slink) < 0) {
-                r = log_device_debug_errno(dev, errno, "Failed to rename '%s' to '%s': %m", slink_tmp, slink);
-                (void) unlink(slink_tmp);
-                return r;
+        if (is_symlink) {
+                _cleanup_free_ char *buf = NULL;
+                char *colon;
+
+                /* New format. The devnode and priority can be obtained from symlink. */
+
+                r = readlinkat_malloc(dirfd, id, &buf);
+                if (r < 0)
+                        return r;
+
+                colon = strchr(buf, ':');
+                if (!colon || colon == buf)
+                        return -EINVAL;
+
+                *colon = '\0';
+
+                /* Of course, this check is racy, but it is not necessary to be perfect. Even if the device
+                 * node will be removed after this check, we will receive 'remove' uevent, and the invalid
+                 * symlink will be removed during processing the event. The check is just for shortening the
+                 * timespan that the symlink points to a non-existing device node. */
+                if (access(colon + 1, F_OK) < 0)
+                        return -errno;
+
+                r = safe_atoi(buf, &tmp_prio);
+                if (r < 0)
+                        return r;
+
+                if (*devnode && tmp_prio <= *priority)
+                        return 0; /* Unchanged */
+
+                r = free_and_strdup(devnode, colon + 1);
+                if (r < 0)
+                        return r;
+
+        } else {
+                _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
+                const char *val;
+
+                /* Old format. The devnode and priority must be obtained from uevent and udev database. */
+
+                r = sd_device_new_from_device_id(&dev, id);
+                if (r < 0)
+                        return r;
+
+                r = device_get_devlink_priority(dev, &tmp_prio);
+                if (r < 0)
+                        return r;
+
+                if (*devnode && tmp_prio <= *priority)
+                        return 0; /* Unchanged */
+
+                r = sd_device_get_devname(dev, &val);
+                if (r < 0)
+                        return r;
+
+                r = free_and_strdup(devnode, val);
+                if (r < 0)
+                        return r;
         }
 
-        return 0;
+        *priority = tmp_prio;
+        return 1; /* Updated */
 }
 
 static int stack_directory_find_prioritized_devnode(sd_device *dev, const char *dirname, bool add, char **ret) {
@@ -160,8 +213,6 @@ static int stack_directory_find_prioritized_devnode(sd_device *dev, const char *
                 return r;
 
         FOREACH_DIRENT_ALL(de, dir, break) {
-                int tmp_prio;
-
                 if (de->d_name[0] == '.')
                         continue;
 
@@ -169,61 +220,14 @@ static int stack_directory_find_prioritized_devnode(sd_device *dev, const char *
                 if (streq(de->d_name, id))
                         continue;
 
-                if (de->d_type == DT_LNK) {
-                        _cleanup_free_ char *buf = NULL;
-                        char *colon;
-
-                        /* New format. The devnode and priority can be obtained from symlink. */
-
-                        r = readlinkat_malloc(dirfd(dir), de->d_name, &buf);
-                        if (r < 0) {
-                                log_device_debug_errno(dev, r, "Failed to read symlink %s, ignoring: %m", de->d_name);
-                                continue;
-                        }
-
-                        colon = strchr(buf, ':');
-                        if (!colon || colon == buf)
-                                continue;
-
-                        *colon = '\0';
-
-                        if (safe_atoi(buf, &tmp_prio) < 0)
-                                continue;
-
-                        if (devnode && tmp_prio <= priority)
-                                continue;
-
-                        r = free_and_strdup(&devnode, colon + 1);
-                        if (r < 0)
-                                return r;
-
-                } else if (de->d_type == DT_REG) {
-                        _cleanup_(sd_device_unrefp) sd_device *tmp_dev = NULL;
-                        const char *val;
-
-                        /* Old format. The devnode and priority must be obtained from uevent and
-                         * udev database files. */
-
-                        if (sd_device_new_from_device_id(&tmp_dev, de->d_name) < 0)
-                                continue;
-
-                        if (device_get_devlink_priority(tmp_dev, &tmp_prio) < 0)
-                                continue;
-
-                        if (devnode && tmp_prio <= priority)
-                                continue;
-
-                        if (sd_device_get_devname(tmp_dev, &val) < 0)
-                                continue;
-
-                        r = free_and_strdup(&devnode, val);
-                        if (r < 0)
-                                return r;
-
-                } else
+                if (!IN_SET(de->d_type, DT_LNK, DT_REG))
                         continue;
 
-                priority = tmp_prio;
+                r = stack_directory_read_one(dirfd(dir), de->d_name, /* is_symlink = */ de->d_type == DT_LNK, &devnode, &priority);
+                if (r < 0) {
+                        log_debug_errno(r, "Failed to read '%s/%s', ignoring: %m", dirname, de->d_name);
+                        continue;
+                }
         }
 
         *ret = TAKE_PTR(devnode);

diff --git a/src/udev/udevadm-lock.c b/src/udev/udevadm-lock.c
index a3be2336afeea6a270e64e55cf6196c5cafde822..35e9999c015e9577b2955c3e3348e709f3e432ca 100644 (file)
--- a/src/udev/udevadm-lock.c
+++ b/src/udev/udevadm-lock.c
@@ -180,7 +180,7 @@ static int lock_device(
         struct stat st;
         int r;
 
-        fd = open(path, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
+        fd = open(path, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
         if (fd < 0)
                 return log_error_errno(errno, "Failed to open '%s': %m", path);
 

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 8451313f551abaecdf36143873aa83511583674f..3e0c02893e48a12f90c41e6a8579ed8743fb8838 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -473,13 +473,6 @@ static int device_get_whole_disk(sd_device *dev, sd_device **ret_device, const c
         if (device_for_action(dev, SD_DEVICE_REMOVE))
                 goto irrelevant;
 
-        r = sd_device_get_subsystem(dev, &val);
-        if (r < 0)
-                return log_device_debug_errno(dev, r, "Failed to get subsystem: %m");
-
-        if (!streq(val, "block"))
-                goto irrelevant;
-
         r = sd_device_get_sysname(dev, &val);
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to get sysname: %m");
@@ -493,20 +486,15 @@ static int device_get_whole_disk(sd_device *dev, sd_device **ret_device, const c
         if (STARTSWITH_SET(val, "dm-", "md", "drbd"))
                 goto irrelevant;
 
-        r = sd_device_get_devtype(dev, &val);
-        if (r < 0 && r != -ENOENT)
-                return log_device_debug_errno(dev, r, "Failed to get devtype: %m");
-        if (r >= 0 && streq(val, "partition")) {
-                r = sd_device_get_parent(dev, &dev);
-                if (r == -ENOENT) /* The device may be already removed. */
-                        goto irrelevant;
-                if (r < 0)
-                        return log_device_debug_errno(dev, r, "Failed to get parent device: %m");
-        }
+        r = block_device_get_whole_disk(dev, &dev);
+        if (IN_SET(r,
+                   -ENOTBLK, /* The device is not a block device. */
+                   -ENODEV   /* The whole disk device was not found, it may already be removed. */))
+                goto irrelevant;
+        if (r < 0)
+                return log_device_debug_errno(dev, r, "Failed to get whole disk device: %m");
 
         r = sd_device_get_devname(dev, &val);
-        if (r == -ENOENT)
-                goto irrelevant;
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to get devname: %m");
 
@@ -544,7 +532,7 @@ static int worker_lock_whole_disk(sd_device *dev, int *ret_fd) {
         if (r == 0)
                 goto nolock;
 
-        fd = sd_device_open(dev_whole_disk, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
+        fd = sd_device_open(dev_whole_disk, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
         if (fd < 0) {
                 bool ignore = ERRNO_IS_DEVICE_ABSENT(fd);
 
@@ -599,7 +587,7 @@ static int worker_mark_block_device_read_only(sd_device *dev) {
         if (STARTSWITH_SET(val, "dm-", "md", "drbd", "loop", "nbd", "zram"))
                 return 0;
 
-        fd = sd_device_open(dev, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
+        fd = sd_device_open(dev, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
         if (fd < 0)
                 return log_device_debug_errno(dev, fd, "Failed to open '%s', ignoring: %m", val);
 
@@ -1374,52 +1362,44 @@ static int synthesize_change_one(sd_device *dev, sd_device *target) {
 }
 
 static int synthesize_change(sd_device *dev) {
-        const char *subsystem, *sysname, *devtype;
-        int r;
+        _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
+        bool part_table_read;
+        const char *sysname;
+        sd_device *d;
+        int r, k;
 
-        r = sd_device_get_subsystem(dev, &subsystem);
+        r = sd_device_get_sysname(dev, &sysname);
         if (r < 0)
                 return r;
 
-        r = sd_device_get_devtype(dev, &devtype);
+        if (startswith(sysname, "dm-") || block_device_is_whole_disk(dev) <= 0)
+                return synthesize_change_one(dev, dev);
+
+        r = blockdev_reread_partition_table(dev);
         if (r < 0)
-                return r;
+                log_device_debug_errno(dev, r, "Failed to re-read partition table, ignoring: %m");
+        part_table_read = r >= 0;
 
-        r = sd_device_get_sysname(dev, &sysname);
+        /* search for partitions */
+        r = partition_enumerator_new(dev, &e);
         if (r < 0)
                 return r;
 
-        if (streq_ptr(subsystem, "block") &&
-            streq_ptr(devtype, "disk") &&
-            !startswith(sysname, "dm-")) {
-                _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
-                bool part_table_read;
-                sd_device *d;
-
-                r = blockdev_reread_partition_table(dev);
-                if (r < 0)
-                        log_device_debug_errno(dev, r, "Failed to re-read partition table, ignoring: %m");
-                part_table_read = r >= 0;
-
-                /* search for partitions */
-                r = partition_enumerator_new(dev, &e);
-                if (r < 0)
-                        return r;
-
-                /* We have partitions and re-read the table, the kernel already sent out a "change"
-                 * event for the disk, and "remove/add" for all partitions. */
-                if (part_table_read && sd_device_enumerator_get_device_first(e))
-                        return 0;
+        /* We have partitions and re-read the table, the kernel already sent out a "change"
+         * event for the disk, and "remove/add" for all partitions. */
+        if (part_table_read && sd_device_enumerator_get_device_first(e))
+                return 0;
 
-                /* We have partitions but re-reading the partition table did not work, synthesize
-                 * "change" for the disk and all partitions. */
-                (void) synthesize_change_one(dev, dev);
-                FOREACH_DEVICE(e, d)
-                        (void) synthesize_change_one(dev, d);
-        } else
-                (void) synthesize_change_one(dev, dev);
+        /* We have partitions but re-reading the partition table did not work, synthesize
+         * "change" for the disk and all partitions. */
+        r = synthesize_change_one(dev, dev);
+        FOREACH_DEVICE(e, d) {
+                k = synthesize_change_one(dev, d);
+                if (k < 0 && r >= 0)
+                        r = k;
+        }
 
-        return 0;
+        return r;
 }
 
 static int on_inotify(sd_event_source *s, int fd, uint32_t revents, void *userdata) {

diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index 1930fb916b3f85cc7da8c23e27ce07504f27c31d..5e9bce3bae35321f6a2f8a3ad42f95dc001f680e 100644 (file)
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -168,20 +168,15 @@ static const struct {
         },
 };
 
-static int table_add_uid_boundaries(
-                Table *table,
-                const UidRange *p,
-                size_t n) {
+static int table_add_uid_boundaries(Table *table, const UidRange *p) {
         int r;
 
         assert(table);
-        assert(p || n == 0);
 
         for (size_t i = 0; i < ELEMENTSOF(uid_range_table); i++) {
                 _cleanup_free_ char *name = NULL, *comment = NULL;
 
-                if (n > 0 &&
-                    !uid_range_covers(p, n, uid_range_table[i].first, uid_range_table[i].last - uid_range_table[i].first + 1))
+                if (!uid_range_covers(p, uid_range_table[i].first, uid_range_table[i].last - uid_range_table[i].first + 1))
                         continue;
 
                 name = strjoin(special_glyph(SPECIAL_GLYPH_ARROW_DOWN),
@@ -277,9 +272,9 @@ static int add_unavailable_uid(Table *table, uid_t start, uid_t end) {
                 return table_log_add_error(r);
 
         free(name);
-        name = strjoin(special_glyph(SPECIAL_GLYPH_ARROW_DOWN),
+        name = strjoin(special_glyph(SPECIAL_GLYPH_ARROW_UP),
                        " end unavailable users ",
-                       special_glyph(SPECIAL_GLYPH_ARROW_DOWN));
+                       special_glyph(SPECIAL_GLYPH_ARROW_UP));
         if (!name)
                 return log_oom();
 
@@ -306,31 +301,31 @@ static int add_unavailable_uid(Table *table, uid_t start, uid_t end) {
 static int table_add_uid_map(
                 Table *table,
                 const UidRange *p,
-                size_t n,
                 int (*add_unavailable)(Table *t, uid_t start, uid_t end)) {
 
         uid_t focus = 0;
         int n_added = 0, r;
 
         assert(table);
-        assert(p || n == 0);
         assert(add_unavailable);
 
-        for (size_t i = 0; i < n; i++) {
-                if (focus < p[i].start) {
-                        r = add_unavailable(table, focus, p[i].start-1);
+        for (size_t i = 0; p && i < p->n_entries; i++) {
+                UidRangeEntry *x = p->entries + i;
+
+                if (focus < x->start) {
+                        r = add_unavailable(table, focus, x->start-1);
                         if (r < 0)
                                 return r;
 
                         n_added += r;
                 }
 
-                if (p[i].start > UINT32_MAX - p[i].nr) { /* overflow check */
+                if (x->start > UINT32_MAX - x->nr) { /* overflow check */
                         focus = UINT32_MAX;
                         break;
                 }
 
-                focus = p[i].start + p[i].nr;
+                focus = x->start + x->nr;
         }
 
         if (focus < UINT32_MAX-1) {
@@ -429,19 +424,18 @@ static int display_user(int argc, char *argv[], void *userdata) {
         }
 
         if (table) {
-                _cleanup_free_ UidRange *uid_range = NULL;
+                _cleanup_(uid_range_freep) UidRange *uid_range = NULL;
                 int boundary_lines, uid_map_lines;
-                size_t n_uid_range = 0;
 
-                r = uid_range_load_userns(&uid_range, &n_uid_range, "/proc/self/uid_map");
+                r = uid_range_load_userns(&uid_range, "/proc/self/uid_map");
                 if (r < 0)
                         log_debug_errno(r, "Failed to load /proc/self/uid_map, ignoring: %m");
 
-                boundary_lines = table_add_uid_boundaries(table, uid_range, n_uid_range);
+                boundary_lines = table_add_uid_boundaries(table, uid_range);
                 if (boundary_lines < 0)
                         return boundary_lines;
 
-                uid_map_lines = table_add_uid_map(table, uid_range, n_uid_range, add_unavailable_uid);
+                uid_map_lines = table_add_uid_map(table, uid_range, add_unavailable_uid);
                 if (uid_map_lines < 0)
                         return uid_map_lines;
 
@@ -531,20 +525,15 @@ static int show_group(GroupRecord *gr, Table *table) {
         return 0;
 }
 
-static int table_add_gid_boundaries(
-                Table *table,
-                const UidRange *p,
-                size_t n) {
+static int table_add_gid_boundaries(Table *table, const UidRange *p) {
         int r;
 
         assert(table);
-        assert(p || n == 0);
 
         for (size_t i = 0; i < ELEMENTSOF(uid_range_table); i++) {
                 _cleanup_free_ char *name = NULL, *comment = NULL;
 
-                if (n > 0 &&
-                    !uid_range_covers(p, n, uid_range_table[i].first, uid_range_table[i].last))
+                if (!uid_range_covers(p, uid_range_table[i].first, uid_range_table[i].last))
                         continue;
 
                 name = strjoin(special_glyph(SPECIAL_GLYPH_ARROW_DOWN),
@@ -631,9 +620,9 @@ static int add_unavailable_gid(Table *table, uid_t start, uid_t end) {
                 return table_log_add_error(r);
 
         free(name);
-        name = strjoin(special_glyph(SPECIAL_GLYPH_ARROW_DOWN),
+        name = strjoin(special_glyph(SPECIAL_GLYPH_ARROW_UP),
                        " end unavailable groups ",
-                       special_glyph(SPECIAL_GLYPH_ARROW_DOWN));
+                       special_glyph(SPECIAL_GLYPH_ARROW_UP));
         if (!name)
                 return log_oom();
 
@@ -738,19 +727,18 @@ static int display_group(int argc, char *argv[], void *userdata) {
         }
 
         if (table) {
-                _cleanup_free_ UidRange *gid_range = NULL;
+                _cleanup_(uid_range_freep) UidRange *gid_range = NULL;
                 int boundary_lines, gid_map_lines;
-                size_t n_gid_range = 0;
 
-                r = uid_range_load_userns(&gid_range, &n_gid_range, "/proc/self/gid_map");
+                r = uid_range_load_userns(&gid_range, "/proc/self/gid_map");
                 if (r < 0)
                         log_debug_errno(r, "Failed to load /proc/self/gid_map, ignoring: %m");
 
-                boundary_lines = table_add_gid_boundaries(table, gid_range, n_gid_range);
+                boundary_lines = table_add_gid_boundaries(table, gid_range);
                 if (boundary_lines < 0)
                         return boundary_lines;
 
-                gid_map_lines = table_add_uid_map(table, gid_range, n_gid_range, add_unavailable_gid);
+                gid_map_lines = table_add_uid_map(table, gid_range, add_unavailable_gid);
                 if (gid_map_lines < 0)
                         return gid_map_lines;
 

diff --git a/test/TEST-36-NUMAPOLICY/test.sh b/test/TEST-36-NUMAPOLICY/test.sh
index a0bfd4079ab816428488cec6daa580fafd3a0e0f..5c39b7c6d8b9a28b52a4eab2d07ff02e18a729c0 100755 (executable)
--- a/test/TEST-36-NUMAPOLICY/test.sh
+++ b/test/TEST-36-NUMAPOLICY/test.sh
@@ -9,9 +9,9 @@ TEST_NO_NSPAWN=1
 . "${TEST_BASE_DIR:?}/test-functions"
 
 if qemu_min_version "5.2.0"; then
-    QEMU_OPTIONS="-object memory-backend-ram,id=mem0,size=${QEMU_MEM:-768M} -numa node,memdev=mem0,nodeid=0"
+    QEMU_OPTIONS+=" -object memory-backend-ram,id=mem0,size=${QEMU_MEM:-768M} -numa node,memdev=mem0,nodeid=0"
 else
-    QEMU_OPTIONS="-numa node,nodeid=0"
+    QEMU_OPTIONS+=" -numa node,nodeid=0"
 fi
 
 do_test "$@"

diff --git a/test/TEST-53-ISSUE-16347/test.sh b/test/TEST-53-ISSUE-16347/test.sh
index 7f44c66bffb37a95313b5b569e2d3da64c3e0831..6d4821d2c1cc97668cf58ee2b72085d747e5d766 100755 (executable)
--- a/test/TEST-53-ISSUE-16347/test.sh
+++ b/test/TEST-53-ISSUE-16347/test.sh
@@ -5,7 +5,7 @@ set -e
 TEST_DESCRIPTION="test timer units when initial clock is ahead"
 TEST_NO_NSPAWN=1
 
-QEMU_OPTIONS="-rtc base=$(date -u +%Y-%m-%dT%H:%M:%S -d '+3 days')"
+QEMU_OPTIONS+=" -rtc base=$(date -u +%Y-%m-%dT%H:%M:%S -d '+3 days')"
 
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"

diff --git a/test/TEST-64-UDEV-STORAGE/test.sh b/test/TEST-64-UDEV-STORAGE/test.sh
index 6eed43cc25c4f8163f0e7a315e3da03ed630e053..26d729449871534622eac76e35cb469b33d2ce60 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/test.sh
+++ b/test/TEST-64-UDEV-STORAGE/test.sh
@@ -312,19 +312,23 @@ EOF
 # Test case for issue https://github.com/systemd/systemd/issues/19946
 testcase_simultaneous_events() {
     local qemu_opts=("-device virtio-scsi-pci,id=scsi")
-    local partdisk="${TESTDIR:?}/simultaneousevents.img"
+    local diskpath i
 
-    dd if=/dev/zero of="$partdisk" bs=1M count=110
-    qemu_opts+=(
-        "-device scsi-hd,drive=drive1,serial=deadbeeftest"
-        "-drive format=raw,cache=unsafe,file=$partdisk,if=none,id=drive1"
-    )
+    for i in {0..9}; do
+        diskpath="${TESTDIR:?}/simultaneousevents${i}.img"
+
+        dd if=/dev/zero of="$diskpath" bs=1M count=32
+        qemu_opts+=(
+            "-device scsi-hd,drive=drive$i,serial=deadbeeftest$i"
+            "-drive format=raw,cache=unsafe,file=$diskpath,if=none,id=drive$i"
+        )
+    done
 
     KERNEL_APPEND="systemd.setenv=TEST_FUNCTION_NAME=${FUNCNAME[0]} ${USER_KERNEL_APPEND:-}"
     QEMU_OPTIONS="${qemu_opts[*]} ${USER_QEMU_OPTIONS:-}"
     test_run_one "${1:?}" || return $?
 
-    rm -f "$partdisk"
+    rm -f "$diskpath"
 }
 
 testcase_lvm_basic() {

diff --git a/test/units/testsuite-17.08.sh b/test/units/testsuite-17.08.sh
new file mode 100755 (executable)
index 0000000..f740b33
--- /dev/null
+++ b/test/units/testsuite-17.08.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+set -ex
+set -o pipefail
+
+# shellcheck source=test/units/assert.sh
+. "$(dirname "$0")"/assert.sh
+
+# This is a test for issue #24518.
+
+mkdir -p /run/udev/rules.d/
+cat >/run/udev/rules.d/50-testsuite.rules <<EOF
+SUBSYSTEM=="mem", KERNEL=="null", OPTIONS="log_level=debug", TAG+="systemd"
+SUBSYSTEM=="mem", KERNEL=="null", ACTION=="add",    SYMLINK+="test/symlink-to-null-on-add",    ENV{SYSTEMD_ALIAS}+="/sys/test/alias-to-null-on-add"
+SUBSYSTEM=="mem", KERNEL=="null", ACTION=="change", SYMLINK+="test/symlink-to-null-on-change", ENV{SYSTEMD_ALIAS}+="/sys/test/alias-to-null-on-change"
+EOF
+
+udevadm control --reload
+
+udevadm trigger --settle --action add /dev/null
+for ((i = 0; i < 20; i++)); do
+    ((i == 0)) || sleep .5
+
+    (
+        systemctl -q is-active /dev/test/symlink-to-null-on-add
+        ! systemctl -q is-active /dev/test/symlink-to-null-on-change
+        systemctl -q is-active /sys/test/alias-to-null-on-add
+        ! systemctl -q is-active /sys/test/alias-to-null-on-change
+    ) && break
+done
+assert_rc 0 systemctl -q is-active /dev/test/symlink-to-null-on-add
+assert_rc 3 systemctl -q is-active /dev/test/symlink-to-null-on-change
+assert_rc 0 systemctl -q is-active /sys/test/alias-to-null-on-add
+assert_rc 3 systemctl -q is-active /sys/test/alias-to-null-on-change
+
+udevadm trigger --settle --action change /dev/null
+for ((i = 0; i < 20; i++)); do
+    ((i == 0)) || sleep .5
+
+    (
+        ! systemctl -q is-active /dev/test/symlink-to-null-on-add
+        systemctl -q is-active /dev/test/symlink-to-null-on-change
+        ! systemctl -q is-active /sys/test/alias-to-null-on-add
+        systemctl -q is-active /sys/test/alias-to-null-on-change
+    ) && break
+done
+assert_rc 3 systemctl -q is-active /dev/test/symlink-to-null-on-add
+assert_rc 0 systemctl -q is-active /dev/test/symlink-to-null-on-change
+assert_rc 3 systemctl -q is-active /sys/test/alias-to-null-on-add
+assert_rc 0 systemctl -q is-active /sys/test/alias-to-null-on-change
+
+udevadm trigger --settle --action add /dev/null
+for ((i = 0; i < 20; i++)); do
+    ((i == 0)) || sleep .5
+
+    (
+        systemctl -q is-active /dev/test/symlink-to-null-on-add
+        ! systemctl -q is-active /dev/test/symlink-to-null-on-change
+        systemctl -q is-active /sys/test/alias-to-null-on-add
+        ! systemctl -q is-active /sys/test/alias-to-null-on-change
+    ) && break
+done
+assert_rc 0 systemctl -q is-active /dev/test/symlink-to-null-on-add
+assert_rc 3 systemctl -q is-active /dev/test/symlink-to-null-on-change
+assert_rc 0 systemctl -q is-active /sys/test/alias-to-null-on-add
+assert_rc 3 systemctl -q is-active /sys/test/alias-to-null-on-change
+
+# cleanup
+rm -f /run/udev/rules.d/50-testsuite.rules
+udevadm control --reload
+
+exit 0

diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh
index db39149eb2762317a7445b26051925992f659da3..f39383abc5d2132904454c940fbbb46273c1bbba 100755 (executable)
--- a/test/units/testsuite-50.sh
+++ b/test/units/testsuite-50.sh
@@ -7,13 +7,17 @@ set -o pipefail
 
 export SYSTEMD_LOG_LEVEL=debug
 
-cleanup()
-{
+cleanup() {(
+    set +ex
+
     if [ -z "${image_dir}" ]; then
         return
     fi
+    umount "${image_dir}/app0"
+    umount "${image_dir}/app1"
+    umount "${image_dir}/app-nodistro"
     rm -rf "${image_dir}"
-}
+)}
 
 udevadm control --log-level=debug
 
@@ -297,7 +301,14 @@ Type=notify
 RemainAfterExit=yes
 MountAPIVFS=yes
 PrivateTmp=yes
-ExecStart=/bin/sh -c 'systemd-notify --ready; while ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do sleep 0.1; done; mount | grep -e "/dev/mapper/${roothash}-verity" -e "/dev/mapper/loop[0-9]*-verity" | grep -q -F "nosuid"'
+ExecStart=/bin/sh -c ' \\
+    systemd-notify --ready; \\
+    while [[ ! -f /tmp/img/usr/lib/os-release ]] || ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do \\
+        sleep 0.1; \\
+    done; \\
+    mount; \\
+    mount | grep -F "on /tmp/img type squashfs" | grep -q -F "nosuid"; \\
+'
 EOF
 systemctl start testservice-50d.service
 

diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
index 4ddea69c51cbaf71f882e578f20fe967f0a1f18a..1bf894fa326ab764c6f6d84e7a8ba6e1d3bb98a8 100755 (executable)
--- a/test/units/testsuite-64.sh
+++ b/test/units/testsuite-64.sh
@@ -83,6 +83,93 @@ helper_check_udev_watch() {(
     done < <(find /run/udev/watch -type l)
 )}
 
+check_device_unit() {(
+    set +x
+
+    local log_level link links path syspath unit
+
+    log_level="${1?}"
+    path="${2?}"
+    unit=$(systemd-escape --path --suffix=device "$path")
+
+    syspath=$(systemctl show --value --property SysFSPath "$unit" 2>/dev/null)
+    if [[ -z "$syspath" ]]; then
+        [[ "$log_level" == 1 ]] && echo >&2 "ERROR: $unit not found."
+        return 1
+    fi
+
+    if [[ ! -L "$path" ]]; then
+        if [[ ! -d "$syspath" ]]; then
+            [[ "$log_level" == 1 ]] && echo >&2 "ERROR: $unit exists for $syspath but it does not exist."
+            return 1
+        fi
+        return 0
+    fi
+
+    if [[ ! -b "$path" && ! -c "$path" ]]; then
+        [[ "$log_level" == 1 ]] && echo >&2 "ERROR: invalid file type $path"
+        return 1
+    fi
+
+    read -r -a links < <(udevadm info -q symlink "$syspath" 2>/dev/null)
+    for link in "${links[@]}"; do
+        if [[ "/dev/$link" == "$path" ]]; then # DEVLINKS= given by -q symlink are relative to /dev
+            return 0
+        fi
+    done
+
+    read -r -a links < <(udevadm info "$syspath" | sed -ne '/SYSTEMD_ALIAS=/ { s/^E: SYSTEMD_ALIAS=//; p }' 2>/dev/null)
+    for link in "${links[@]}"; do
+        if [[ "$link" == "$path" ]]; then # SYSTEMD_ALIAS= are absolute
+            return 0
+        fi
+    done
+
+    [[ "$log_level" == 1 ]] && echo >&2 "ERROR: $unit exists for $syspath but it does not have the corresponding DEVLINKS or SYSTEMD_ALIAS."
+    return 1
+)}
+
+check_device_units() {(
+    set +x
+
+    local log_level path paths
+
+    log_level="${1?}"
+    shift
+    paths=("$@")
+
+    for path in "${paths[@]}"; do
+        if ! check_device_unit "$log_level" "$path"; then
+           return 1
+        fi
+    done
+
+    while read -r unit _; do
+        path=$(systemd-escape --path --unescape "$unit")
+        if ! check_device_unit "$log_level" "$path"; then
+           return 1
+        fi
+    done < <(systemctl list-units --all --type=device --no-legend dev-* | awk '{ print $1 }' | sed -e 's/\.device$//')
+
+    return 0
+)}
+
+helper_check_device_units() {(
+    set +x
+
+    local i
+
+    for ((i = 0; i < 20; i++)); do
+        (( i == 0 )) || sleep .5
+
+        if check_device_units 0 "$@"; then
+            return 0
+        fi
+    done
+
+    check_device_units 1 "$@"
+)}
+
 testcase_megasas2_basic() {
     lsblk -S
     [[ "$(lsblk --scsi --noheadings | wc -l)" -ge 128 ]]
@@ -160,6 +247,7 @@ EOF
         "/dev/disk/by-uuid/deadbeef-dead-dead-beef-111111111111"
     )
     udevadm wait --settle --timeout=30 "${part_links[@]}"
+    helper_check_device_units "${part_links[@]}"
 
     # Choose a random symlink to the failover data partition each time, for
     # a better coverage
@@ -191,6 +279,7 @@ EOF
 
         # Make sure all symlinks are still valid
         udevadm wait --settle --timeout=30 "${part_links[@]}"
+        helper_check_device_units "${part_links[@]}"
     done
 
     multipath -l "$path"
@@ -203,32 +292,49 @@ EOF
 }
 
 testcase_simultaneous_events() {
-    local blockdev iterations num_part part partscript timeout
-
-    blockdev="$(readlink -f /dev/disk/by-id/scsi-*_deadbeeftest)"
-    partscript="$(mktemp)"
-
-    if [[ ! -b "$blockdev" ]]; then
-        echo "ERROR: failed to find the test SCSI block device"
-        return 1
-    fi
+    local disk expected i iterations link num_part part partscript rule target timeout
+    local -a devices symlinks
 
     if [[ -n "${ASAN_OPTIONS:-}" ]] || [[ "$(systemd-detect-virt -v)" == "qemu" ]]; then
-        num_part=10
+        num_part=2
         iterations=10
         timeout=240
     else
-        num_part=50
+        num_part=10
         iterations=100
         timeout=30
     fi
 
+    for disk in {0..9}; do
+        link="/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_deadbeeftest${disk}"
+        target="$(readlink -f "$link")"
+        if [[ ! -b "$target" ]]; then
+            echo "ERROR: failed to find the test SCSI block device $link"
+            return 1
+        fi
+
+        devices+=("$target")
+    done
+
+    for ((part = 1; part <= num_part; part++)); do
+        symlinks+=(
+            "/dev/disk/by-partlabel/test${part}"
+        )
+    done
+
+    partscript="$(mktemp)"
+
     cat >"$partscript" <<EOF
-$(for ((i = 1; i <= num_part; i++)); do printf 'name="test%d", size=2M\n' "$i"; done)
+$(for ((part = 1; part <= num_part; part++)); do printf 'name="test%d", size=2M\n' "$part"; done)
+EOF
+
+    rule=/run/udev/rules.d/50-test.rules
+    mkdir -p "${rule%/*}"
+    cat >"$rule" <<EOF
+SUBSYSTEM=="block", KERNEL=="${devices[4]##*/}*|${devices[5]##*/}*", OPTIONS="link_priority=10"
 EOF
 
-    # Initial partition table
-    udevadm lock --device="$blockdev" sfdisk -q -X gpt "$blockdev" <"$partscript"
+    udevadm control --reload
 
     # Delete the partitions, immediately recreate them, wait for udev to settle
     # down, and then check if we have any dangling symlinks in /dev/disk/. Rinse
@@ -237,17 +343,43 @@ EOF
     # On unpatched udev versions the delete-recreate cycle may trigger a race
     # leading to dead symlinks in /dev/disk/
     for ((i = 1; i <= iterations; i++)); do
-        udevadm lock --device="$blockdev" sfdisk -q --delete "$blockdev"
-        udevadm lock --device="$blockdev" sfdisk -q -X gpt "$blockdev" <"$partscript"
+        for disk in {0..9}; do
+            if ((disk % 2 == i % 2)); then
+                udevadm lock --device="${devices[$disk]}" sfdisk -q --delete "${devices[$disk]}" &
+            else
+                udevadm lock --device="${devices[$disk]}" sfdisk -q -X gpt "${devices[$disk]}" <"$partscript" &
+            fi
+        done
 
-        if ((i % 10 == 0)); then
-            udevadm wait --settle --timeout="$timeout" "$blockdev"
+        # Wait for the above sfdisk commands to be finished.
+        for disk in {0..9}; do
+            udevadm lock --device="${devices[$disk]}" true
+        done
+
+        if ((i % 10 <= 1)); then
+            udevadm wait --settle --timeout="$timeout" "${devices[@]}" "${symlinks[@]}"
             helper_check_device_symlinks
             helper_check_udev_watch
+            for ((part = 1; part <= num_part; part++)); do
+                link="/dev/disk/by-partlabel/test${part}"
+                target="$(readlink -f "$link")"
+                if ((i % 2 == 0)); then
+                    expected="${devices[5]}$part"
+                else
+                    expected="${devices[4]}$part"
+                fi
+                if [[ "$target" != "$expected" ]]; then
+                    echo >&2 "ERROR: symlink '/dev/disk/by-partlabel/test${part}' points to '$target' but '$expected' was expected"
+                    return 1
+                fi
+            done
         fi
     done
 
-    rm -f "$partscript"
+    helper_check_device_units
+    rm -f "$rule" "$partscript"
+
+    udevadm control --reload
 }
 
 testcase_lvm_basic() {
@@ -275,16 +407,35 @@ testcase_lvm_basic() {
     mkfs.ext4 -L mylvpart1 "/dev/$vgroup/mypart1"
     udevadm wait --settle --timeout="$timeout" "/dev/disk/by-label/mylvpart1"
     helper_check_device_symlinks "/dev/disk" "/dev/$vgroup"
+    helper_check_device_units
+
+    # Rename partitions (see issue #24518)
+    lvm lvrename "/dev/$vgroup/mypart1" renamed1
+    lvm lvrename "/dev/$vgroup/mypart2" renamed2
+    udevadm wait --settle --timeout="$timeout" --removed "/dev/$vgroup/mypart1" "/dev/$vgroup/mypart2"
+    udevadm wait --settle --timeout="$timeout" "/dev/$vgroup/renamed1" "/dev/$vgroup/renamed2"
+    helper_check_device_symlinks "/dev/disk" "/dev/$vgroup"
+    helper_check_device_units
+
+    # Rename them back
+    lvm lvrename "/dev/$vgroup/renamed1" mypart1
+    lvm lvrename "/dev/$vgroup/renamed2" mypart2
+    udevadm wait --settle --timeout="$timeout" --removed "/dev/$vgroup/renamed1" "/dev/$vgroup/renamed2"
+    udevadm wait --settle --timeout="$timeout" "/dev/$vgroup/mypart1" "/dev/$vgroup/mypart2"
+    helper_check_device_symlinks "/dev/disk" "/dev/$vgroup"
+    helper_check_device_units
 
     # Disable the VG and check symlinks...
     lvm vgchange -an "$vgroup"
     udevadm wait --settle --timeout="$timeout" --removed "/dev/$vgroup" "/dev/disk/by-label/mylvpart1"
     helper_check_device_symlinks "/dev/disk"
+    helper_check_device_units
 
     # reenable the VG and check the symlinks again if all LVs are properly activated
     lvm vgchange -ay "$vgroup"
     udevadm wait --settle --timeout="$timeout" "/dev/$vgroup/mypart1" "/dev/$vgroup/mypart2" "/dev/disk/by-label/mylvpart1"
     helper_check_device_symlinks "/dev/disk" "/dev/$vgroup"
+    helper_check_device_units
 
     # Same as above, but now with more "stress"
     [[ -n "${ASAN_OPTIONS:-}" ]] && iterations=10 || iterations=50
@@ -295,6 +446,7 @@ testcase_lvm_basic() {
         if ((i % 5 == 0)); then
             udevadm wait --settle --timeout="$timeout" "/dev/$vgroup/mypart1" "/dev/$vgroup/mypart2" "/dev/disk/by-label/mylvpart1"
             helper_check_device_symlinks "/dev/disk" "/dev/$vgroup"
+            helper_check_device_units
         fi
     done
 
@@ -303,6 +455,7 @@ testcase_lvm_basic() {
     udevadm wait --settle --timeout="$timeout" --removed "/dev/$vgroup/mypart1"
     udevadm wait --timeout=0 "/dev/$vgroup/mypart2"
     helper_check_device_symlinks "/dev/disk" "/dev/$vgroup"
+    helper_check_device_units
 
     # Create & remove LVs in a loop, i.e. with more "stress"
     [[ -n "${ASAN_OPTIONS:-}" ]] && iterations=8 || iterations=16
@@ -322,6 +475,7 @@ testcase_lvm_basic() {
                 udevadm wait --settle --timeout="$timeout" --removed "/dev/$vgroup/looppart$part"
             done
             helper_check_device_symlinks "/dev/disk" "/dev/$vgroup"
+            helper_check_device_units
         fi
     done
 }
@@ -341,6 +495,7 @@ testcase_btrfs_basic() {
     udevadm wait --settle --timeout=30 "${devices[0]}" "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
+    helper_check_device_units
 
     echo "Multiple devices: using partitions, data: single, metadata: raid1"
     uuid="deadbeef-dead-dead-beef-000000000001"
@@ -358,6 +513,7 @@ EOF
     udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
+    helper_check_device_units
     wipefs -a -f "${devices[0]}"
     udevadm wait --settle --timeout=30 --removed /dev/disk/by-partlabel/diskpart{1..4}
 
@@ -373,6 +529,7 @@ EOF
     udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
+    helper_check_device_units
 
     echo "Multiple devices: using LUKS encrypted disks, data: raid1, metadata: raid1, mixed mode"
     uuid="deadbeef-dead-dead-beef-000000000003"
@@ -399,6 +556,7 @@ EOF
         systemctl start "systemd-cryptsetup@encbtrfs$i"
     done
     helper_check_device_symlinks
+    helper_check_device_units
     # Check if we have all necessary DM devices
     ls -l /dev/mapper/encbtrfs{0..3}
     # Create a multi-device btrfs filesystem on the LUKS devices
@@ -411,6 +569,7 @@ EOF
     udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
+    helper_check_device_units
     # Mount it and write some data to it we can compare later
     mount -t btrfs /dev/mapper/encbtrfs0 "$mpoint"
     echo "hello there" >"$mpoint/test"
@@ -419,6 +578,7 @@ EOF
     systemctl stop systemd-cryptsetup@encbtrfs{0..3}
     udevadm wait --settle --timeout=30 --removed "/dev/disk/by-uuid/$uuid"
     helper_check_device_symlinks
+    helper_check_device_units
     # Add the mount point to /etc/fstab and check if the device can be put together
     # automagically. The source device is the DM name of the first LUKS device
     # (from /etc/crypttab). We have to specify all LUKS devices manually, as
@@ -435,6 +595,7 @@ EOF
     udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
+    helper_check_device_units
     grep "hello there" "$mpoint/test"
     # Cleanup
     systemctl stop "${mpoint##*/}.mount"
@@ -483,6 +644,7 @@ testcase_iscsi_lvm() {
     iscsiadm --mode node --targetname "$target_name" --portal "$target_ip:$target_port" --login
     udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
     helper_check_device_symlinks
+    helper_check_device_units
     # Cleanup
     iscsiadm --mode node --targetname "$target_name" --portal "$target_ip:$target_port" --logout
     tgtadm --lld iscsi --op delete --mode target --tid=1
@@ -518,6 +680,7 @@ testcase_iscsi_lvm() {
     iscsiadm --mode node --targetname "$target_name" --portal "$target_ip:$target_port" --login
     udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
     helper_check_device_symlinks
+    helper_check_device_units
     # Add all iSCSI devices into a LVM volume group, create two logical volumes,
     # and check if necessary symlinks exist (and are valid)
     lvm pvcreate -y "${expected_symlinks[@]}"
@@ -532,6 +695,7 @@ testcase_iscsi_lvm() {
     mkfs.ext4 -L mylvpart1 "/dev/$vgroup/mypart1"
     udevadm wait --settle --timeout=30 "/dev/disk/by-label/mylvpart1"
     helper_check_device_symlinks "/dev/disk" "/dev/$vgroup"
+    helper_check_device_units
     # Disconnect the iSCSI devices and check all the symlinks
     iscsiadm --mode node --targetname "$target_name" --portal "$target_ip:$target_port" --logout
     # "Reset" the DM state, since we yanked the backing storage from under the LVM,
@@ -540,11 +704,13 @@ testcase_iscsi_lvm() {
     # The LVM and iSCSI related symlinks should be gone
     udevadm wait --settle --timeout=30 --removed "/dev/$vgroup" "/dev/disk/by-label/mylvpart1" "${expected_symlinks[@]}"
     helper_check_device_symlinks "/dev/disk"
+    helper_check_device_units
     # Reconnect the iSCSI devices and check if everything get detected correctly
     iscsiadm --mode discoverydb --type sendtargets --portal "$target_ip" --discover
     iscsiadm --mode node --targetname "$target_name" --portal "$target_ip:$target_port" --login
     udevadm wait --settle --timeout=30 "${expected_symlinks[@]}" "/dev/$vgroup/mypart1" "/dev/$vgroup/mypart2" "/dev/disk/by-label/mylvpart1"
     helper_check_device_symlinks "/dev/disk" "/dev/$vgroup"
+    helper_check_device_units
     # Cleanup
     iscsiadm --mode node --targetname "$target_name" --portal "$target_ip:$target_port" --logout
     tgtadm --lld iscsi --op delete --mode target --tid=2
@@ -645,6 +811,7 @@ testcase_mdadm_basic() {
         udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
     done
     helper_check_device_symlinks
+    helper_check_device_units
     # Cleanup
     mdadm -v --stop "$raid_dev"
     udevadm wait --settle --timeout=30 --removed "${expected_symlinks[@]}"
@@ -673,9 +840,11 @@ testcase_mdadm_basic() {
         udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
     done
     helper_check_device_symlinks
+    helper_check_device_units
     # Cleanup
     mdadm -v --stop "$raid_dev"
     udevadm wait --settle --timeout=30 --removed "${expected_symlinks[@]}"
+    helper_check_device_units
 
     echo "Mirror + parity raid (RAID 10) + multiple partitions"
     raid_name="mdmirpar"
@@ -721,10 +890,12 @@ EOF
         udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
     done
     helper_check_device_symlinks
+    helper_check_device_units
     # Cleanup
     mdadm -v --stop "$raid_dev"
     # Check if all expected symlinks were removed after the cleanup
     udevadm wait --settle --timeout=30 --removed "${expected_symlinks[@]}"
+    helper_check_device_units
 }
 
 testcase_mdadm_lvm() {
@@ -769,15 +940,18 @@ testcase_mdadm_lvm() {
     mdadm -v --stop "$raid_dev"
     udevadm wait --settle --timeout=30 --removed "${expected_symlinks[@]}"
     helper_check_device_symlinks
+    helper_check_device_units
     # Reassemble it and check if all required symlinks exist
     mdadm --assemble "$raid_dev" --name "$raid_name" -v
     udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
     helper_check_device_symlinks
+    helper_check_device_units
     # Cleanup
     lvm vgchange -an "$vgroup"
     mdadm -v --stop "$raid_dev"
     # Check if all expected symlinks were removed after the cleanup
     udevadm wait --settle --timeout=30 --removed "${expected_symlinks[@]}"
+    helper_check_device_units
 }
 
 : >/failed

diff --git a/units/initrd-switch-root.service b/units/initrd-switch-root.service
index e3d692671126068fdbead9bb18cbea997706c57e..b19b7bbc21e5d49ad78eda40b01db7527b17b123 100644 (file)
--- a/units/initrd-switch-root.service
+++ b/units/initrd-switch-root.service
@@ -9,11 +9,14 @@
 
 [Unit]
 Description=Switch Root
-DefaultDependencies=no
+
 AssertPathExists=/etc/initrd-release
+
+DefaultDependencies=no
+Wants=initrd-switch-root.target
+AllowIsolate=yes
 OnFailure=emergency.target
 OnFailureJobMode=replace-irreversibly
-AllowIsolate=yes
 
 [Service]
 Type=oneshot

diff --git a/units/ldconfig.service b/units/ldconfig.service
index 33824d4d4f28e2348a25210fd85a3dffa6548ce8..53c6d4ecb16c92d9f5775832103f10746de58876 100644 (file)
--- a/units/ldconfig.service
+++ b/units/ldconfig.service
@@ -10,13 +10,16 @@
 [Unit]
 Description=Rebuild Dynamic Linker Cache
 Documentation=man:ldconfig(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=local-fs.target
-Before=sysinit.target shutdown.target systemd-update-done.service
+
 ConditionNeedsUpdate=|/etc
 ConditionFileNotEmpty=|!/etc/ld.so.cache
 
+DefaultDependencies=no
+After=local-fs.target
+Before=sysinit.target systemd-update-done.service
+Conflicts=shutdown.target initrd-switch-root.target
+Before=shutdown.target initrd-switch-root.target
+
 [Service]
 Type=oneshot
 RemainAfterExit=yes

diff --git a/units/sysinit.target b/units/sysinit.target
index eed3d16b458519b1ef6ecc99d24d4795538dc1b9..5187605a3c43c578a71ab62cb435cdc73d2f4ef6 100644 (file)
--- a/units/sysinit.target
+++ b/units/sysinit.target
@@ -10,6 +10,8 @@
 [Unit]
 Description=System Initialization
 Documentation=man:systemd.special(7)
-Conflicts=emergency.service emergency.target
+
 Wants=local-fs.target swap.target
-After=local-fs.target swap.target emergency.service emergency.target
+After=local-fs.target swap.target
+Conflicts=emergency.service emergency.target
+Before=emergency.service emergency.target

diff --git a/units/system-update-cleanup.service b/units/system-update-cleanup.service
index d0878dcb0bbd93d8896dbfd5651acc78f43bac33..5a5dd725a13df74fce2af99d6b312759f04c6149 100644 (file)
--- a/units/system-update-cleanup.service
+++ b/units/system-update-cleanup.service
@@ -32,4 +32,4 @@ ConditionPathIsSymbolicLink=|/system-update
 
 [Service]
 Type=oneshot
-ExecStart=/bin/rm -fv /system-update
+ExecStart=rm -fv /system-update

diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path
index 7b849230237bb376ec77721f088fd36fb218621f..5277db9a8de291c87a6e19083edf3a4625aa28b1 100644 (file)
--- a/units/systemd-ask-password-console.path
+++ b/units/systemd-ask-password-console.path
@@ -10,11 +10,16 @@
 [Unit]
 Description=Dispatch Password Requests to Console Directory Watch
 Documentation=man:systemd-ask-password-console.path(8)
+
+ConditionPathExists=!/run/plymouth/pid
+
 DefaultDependencies=no
-Conflicts=shutdown.target emergency.service
 After=plymouth-start.service
-Before=paths.target shutdown.target cryptsetup.target
-ConditionPathExists=!/run/plymouth/pid
+Before=paths.target cryptsetup.target
+Conflicts=emergency.service
+Before=emergency.service
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Path]
 DirectoryNotEmpty=/run/systemd/ask-password

diff --git a/units/systemd-ask-password-console.service b/units/systemd-ask-password-console.service
index d31f3fa70f02d7c73b9994332b85981ef4e4699a..afd0f0baad78467d3dbf1272df63b1cb4441e8d5 100644 (file)
--- a/units/systemd-ask-password-console.service
+++ b/units/systemd-ask-password-console.service
@@ -10,11 +10,15 @@
 [Unit]
 Description=Dispatch Password Requests to Console
 Documentation=man:systemd-ask-password-console.service(8)
+
+ConditionPathExists=!/run/plymouth/pid
+
 DefaultDependencies=no
-Conflicts=shutdown.target emergency.service
 After=plymouth-start.service systemd-vconsole-setup.service
-Before=shutdown.target
-ConditionPathExists=!/run/plymouth/pid
+Conflicts=emergency.service
+Before=emergency.service
+Conflicts=shutdown.target initrd-switch-root.target
+Before=shutdown.target initrd-switch-root.target
 
 [Service]
 ExecStart=systemd-tty-ask-password-agent --watch --console

diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path
index 13e1dae672c25956dd93e09e7a2850f52b448687..161562a8bdc6780ad284fde1503c22155e178d17 100644 (file)
--- a/units/systemd-ask-password-wall.path
+++ b/units/systemd-ask-password-wall.path
@@ -10,9 +10,13 @@
 [Unit]
 Description=Forward Password Requests to Wall Directory Watch
 Documentation=man:systemd-ask-password-wall.path(8)
+
 DefaultDependencies=no
-Conflicts=shutdown.target emergency.service
-Before=paths.target shutdown.target cryptsetup.target
+Before=paths.target cryptsetup.target
+Conflicts=emergency.service
+Before=emergency.service
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Path]
 DirectoryNotEmpty=/run/systemd/ask-password

diff --git a/units/systemd-boot-system-token.service b/units/systemd-boot-system-token.service
index 55f05ec8d899706f81e73762a9344d54d54827ad..662a1fda04ba4fcf7c77acc99da5852181f737c6 100644 (file)
--- a/units/systemd-boot-system-token.service
+++ b/units/systemd-boot-system-token.service
@@ -10,10 +10,11 @@
 [Unit]
 Description=Store a System Token in an EFI Variable
 Documentation=man:systemd-boot-system-token.service(8)
+
 DefaultDependencies=no
-Conflicts=shutdown.target
 After=local-fs.target systemd-random-seed.service
-Before=shutdown.target
+Conflicts=shutdown.target initrd-switch-root.target
+Before=shutdown.target initrd-switch-root.target
 
 # Don't run this in a VM environment, because there EFI variables are not
 # actually stored in NVRAM, independent of regular storage.

diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
index e92f436dfdfb1809da8df0a797957c46c2755ca0..d3f8abd9e4c63c8a54c65b8a276d3de394d967d0 100644 (file)
--- a/units/systemd-machined.service.in
+++ b/units/systemd-machined.service.in
@@ -18,7 +18,7 @@ RequiresMountsFor=/var/lib/machines
 
 [Service]
 BusName=org.freedesktop.machine1
-CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD
+CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_LINUX_IMMUTABLE
 ExecStart={{ROOTLIBEXECDIR}}/systemd-machined
 IPAddressDeny=any
 LockPersonality=yes

diff --git a/units/systemd-network-generator.service.in b/units/systemd-network-generator.service.in
index 6c65efa20e838c81313c88654ae1d579c4e820c4..2b79ca6b8a898b29711d5b3b1979cfa72f25baee 100644 (file)
--- a/units/systemd-network-generator.service.in
+++ b/units/systemd-network-generator.service.in
@@ -10,9 +10,12 @@
 [Unit]
 Description=Generate network units from Kernel command line
 Documentation=man:systemd-network-generator.service(8)
+
 DefaultDependencies=no
 Before=network-pre.target systemd-udevd.service
 Wants=network-pre.target
+Conflicts=shutdown.target initrd-switch-root.target
+Before=shutdown.target initrd-switch-root.target
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-sysext.service b/units/systemd-sysext.service
index 35b5edca1dc82af0f2462c2aceb8e1d070d149ce..254de2b623b35c3ae9fcf154be72eec0f9513a6a 100644 (file)
--- a/units/systemd-sysext.service
+++ b/units/systemd-sysext.service
@@ -10,10 +10,7 @@
 [Unit]
 Description=Merge System Extension Images into /usr/ and /opt/
 Documentation=man:systemd-sysext.service(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=local-fs.target
-Before=sysinit.target shutdown.target systemd-tmpfiles.service
+
 ConditionCapability=CAP_SYS_ADMIN
 ConditionDirectoryNotEmpty=|/etc/extensions
 ConditionDirectoryNotEmpty=|/run/extensions
@@ -21,6 +18,12 @@ ConditionDirectoryNotEmpty=|/var/lib/extensions
 ConditionDirectoryNotEmpty=|/usr/local/lib/extensions
 ConditionDirectoryNotEmpty=|/usr/lib/extensions
 
+DefaultDependencies=no
+After=local-fs.target
+Before=sysinit.target systemd-tmpfiles.service
+Conflicts=shutdown.target initrd-switch-root.target
+Before=shutdown.target initrd-switch-root.target
+
 [Service]
 Type=oneshot
 RemainAfterExit=yes

diff --git a/units/systemd-sysusers.service b/units/systemd-sysusers.service
index 91132dafa98d8d24f64f55f7215dbc086027fe85..0eb40294b2123b668e9ee68e956f13b19671ed7b 100644 (file)
--- a/units/systemd-sysusers.service
+++ b/units/systemd-sysusers.service
@@ -10,10 +10,13 @@
 [Unit]
 Description=Create System Users
 Documentation=man:sysusers.d(5) man:systemd-sysusers.service(8)
+
 DefaultDependencies=no
-Conflicts=shutdown.target
 After=systemd-remount-fs.service
-Before=sysinit.target shutdown.target systemd-update-done.service
+Before=sysinit.target systemd-update-done.service
+Conflicts=shutdown.target initrd-switch-root.target
+Before=shutdown.target initrd-switch-root.target
+
 ConditionNeedsUpdate=|/etc
 ConditionCredential=|sysusers.extra
 

diff --git a/units/systemd-tmpfiles-clean.service b/units/systemd-tmpfiles-clean.service
index 6ae4e74ddd07db22867678dc336cb3290ccaa0d0..4163aef729b75a12633f70cc10246b2609877cb0 100644 (file)
--- a/units/systemd-tmpfiles-clean.service
+++ b/units/systemd-tmpfiles-clean.service
@@ -10,10 +10,11 @@
 [Unit]
 Description=Cleanup of Temporary Directories
 Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+
 DefaultDependencies=no
-Conflicts=shutdown.target initrd-switch-root.service
 After=local-fs.target time-set.target
-Before=shutdown.target
+Conflicts=shutdown.target initrd-switch-root.target
+Before=shutdown.target initrd-switch-root.target
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-tmpfiles-setup-dev.service b/units/systemd-tmpfiles-setup-dev.service
index ad0e54fcc418e7370db0456d0ebf9f50e150a2ee..c65539aa79770104143506dc0de014b73b58e186 100644 (file)
--- a/units/systemd-tmpfiles-setup-dev.service
+++ b/units/systemd-tmpfiles-setup-dev.service
@@ -10,10 +10,12 @@
 [Unit]
 Description=Create Static Device Nodes in /dev
 Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+
 DefaultDependencies=no
-Conflicts=shutdown.target
 After=systemd-sysusers.service
-Before=sysinit.target local-fs-pre.target systemd-udevd.service shutdown.target
+Before=sysinit.target local-fs-pre.target systemd-udevd.service
+Conflicts=shutdown.target initrd-switch-root.target
+Before=shutdown.target initrd-switch-root.target
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service
index fc6a4a0e0be2b03f02791600f439d7a5314a4270..7e11eb941445ab539a38212fb3ea2d317c23bd27 100644 (file)
--- a/units/systemd-tmpfiles-setup.service
+++ b/units/systemd-tmpfiles-setup.service
@@ -10,10 +10,12 @@
 [Unit]
 Description=Create Volatile Files and Directories
 Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+
 DefaultDependencies=no
-Conflicts=shutdown.target initrd-switch-root.service
 After=local-fs.target systemd-sysusers.service systemd-journald.service
-Before=sysinit.target shutdown.target
+Before=sysinit.target
+Conflicts=shutdown.target initrd-switch-root.target
+Before=shutdown.target initrd-switch-root.target
 RefuseManualStop=yes
 
 [Service]