New upstream version 244.2

diff --git a/README b/README
index 8dbf94b49cd4b35e906f46b31bab3b3a5877f6f8..b2c8d28411f623ea4cdb5fa5416add16db8eeb43 100644 (file)
--- a/README
+++ b/README
@@ -174,7 +174,9 @@ REQUIREMENTS:
         dependencies:
 
         util-linux >= v2.27.1 required
-        dbus >= 1.11.0 (strictly speaking optional, but recommended)
+        dbus >= 1.4.0 (strictly speaking optional, but recommended)
+                NOTE: If using dbus < 1.9.18, you should override the default
+                policy directory (--with-dbuspolicydir=/etc/dbus-1/system.d).
         dracut (optional)
         polkit (optional)
 

diff --git a/TODO b/TODO
index e9aad6146a2be1a15eae1f95d0ea3269532c837c..c2ee593ef77a0365f07a686d3020931f33977fd8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -218,7 +218,7 @@ Features:
 
 * the a-posteriori stopping of units bound to units that disappeared logic
   should be reworked: there should be a queue of units, and we should only
-  enqeue stop jobs from a defer event that processes queue instead of
+  enqueue stop jobs from a defer event that processes queue instead of
   right-away when we find a unit that is bound to one that doesn't exist
   anymore. (similar to how the stop-unneeded queue has been reworked the same
   way)
@@ -1050,6 +1050,7 @@ Features:
   - introduce mix of BindTo and Requisite
   - add a concept of RemainAfterExit= to scope units
   - Allow multiple ExecStart= for all Type= settings, so that we can cover rescue.service nicely
+  - add verification of [Install] section to systemd-analyze verify
 
 * udev-link-config:
    - Make sure ID_PATH is always exported and complete for

diff --git a/hwdb.d/20-OUI.hwdb b/hwdb.d/20-OUI.hwdb
index c1e974ad4583a8d75a5cd1b11c4a6590d0e01101..8e3e879a398288d69d4c5a7a244827126ecad4d3 100644 (file)
--- a/hwdb.d/20-OUI.hwdb
+++ b/hwdb.d/20-OUI.hwdb
@@ -7272,7 +7272,7 @@ OUI:000990*
  ID_OUI_FROM_DATABASE=ACKSYS Communications & systems
 
 OUI:000991*
- ID_OUI_FROM_DATABASE=GE Fanuc Automation Manufacturing, Inc.
+ ID_OUI_FROM_DATABASE=Intelligent Platforms, LLC.
 
 OUI:000992*
  ID_OUI_FROM_DATABASE=InterEpoch Technology,INC.
@@ -7641,7 +7641,7 @@ OUI:000A0C*
  ID_OUI_FROM_DATABASE=Scientific Research Corporation
 
 OUI:000A0D*
- ID_OUI_FROM_DATABASE=FCI Deutschland GmbH
+ ID_OUI_FROM_DATABASE=Amphenol
 
 OUI:000A0E*
  ID_OUI_FROM_DATABASE=Invivo Research Inc.
@@ -11403,7 +11403,7 @@ OUI:000EF2*
  ID_OUI_FROM_DATABASE=Infinico Corporation
 
 OUI:000EF3*
- ID_OUI_FROM_DATABASE=Smarthome
+ ID_OUI_FROM_DATABASE=Smartlabs, Inc.
 
 OUI:000EF4*
  ID_OUI_FROM_DATABASE=Kasda Networks Inc
@@ -14010,7 +14010,7 @@ OUI:001257*
  ID_OUI_FROM_DATABASE=LeapComm Communication Technologies Inc.
 
 OUI:001258*
- ID_OUI_FROM_DATABASE=Activis Polska
+ ID_OUI_FROM_DATABASE=TechVoIP Sp z o.o.
 
 OUI:001259*
  ID_OUI_FROM_DATABASE=THERMO ELECTRON KARLSRUHE
@@ -19479,7 +19479,7 @@ OUI:001976*
  ID_OUI_FROM_DATABASE=Xipher Technologies, LLC
 
 OUI:001977*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:001978*
  ID_OUI_FROM_DATABASE=Datum Systems, Inc.
@@ -21057,7 +21057,7 @@ OUI:001B84*
  ID_OUI_FROM_DATABASE=Scan Engineering Telecom
 
 OUI:001B85*
- ID_OUI_FROM_DATABASE=MAN Diesel SE
+ ID_OUI_FROM_DATABASE=MAN Energy Solutions
 
 OUI:001B86*
  ID_OUI_FROM_DATABASE=Bosch Access Systems GmbH
@@ -30030,7 +30030,7 @@ OUI:002673*
  ID_OUI_FROM_DATABASE=RICOH COMPANY,LTD.
 
 OUI:002674*
- ID_OUI_FROM_DATABASE=Electronic Solutions, Inc.
+ ID_OUI_FROM_DATABASE=Hunter Douglas
 
 OUI:002675*
  ID_OUI_FROM_DATABASE=Aztech Electronics Pte Ltd
@@ -33110,6 +33110,9 @@ OUI:005D03*
 OUI:005D73*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:005E0C*
+ ID_OUI_FROM_DATABASE=HMD Global Oy
+
 OUI:005F86*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -33893,6 +33896,9 @@ OUI:006440*
 OUI:0064A6*
  ID_OUI_FROM_DATABASE=Maquet CardioVascular
 
+OUI:006619*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:00664B*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -33902,6 +33908,9 @@ OUI:006762*
 OUI:0068EB*
  ID_OUI_FROM_DATABASE=HP Inc.
 
+OUI:00692D*
+ ID_OUI_FROM_DATABASE=Sunnovo International Limited
+
 OUI:0069670*
  ID_OUI_FROM_DATABASE=Annapurna labs
 
@@ -34856,6 +34865,9 @@ OUI:008764*
 OUI:008865*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:0088BA*
+ ID_OUI_FROM_DATABASE=NC&C
+
 OUI:008A96*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -35696,6 +35708,9 @@ OUI:009E1E*
 OUI:009EC8*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:009EEE*
+ ID_OUI_FROM_DATABASE=Positivo Tecnologia S.A.
+
 OUI:00A000*
  ID_OUI_FROM_DATABASE=CENTILLION NETWORKS, INC.
 
@@ -36533,6 +36548,9 @@ OUI:00AD24*
 OUI:00AD63*
  ID_OUI_FROM_DATABASE=Dedicated Micros Malta LTD
 
+OUI:00ADD5*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:00AECD*
  ID_OUI_FROM_DATABASE=Pensando Systems
 
@@ -36692,6 +36710,9 @@ OUI:00B771*
 OUI:00B78D*
  ID_OUI_FROM_DATABASE=Nanjing Shining Electric Automation Co., Ltd
 
+OUI:00B7A8*
+ ID_OUI_FROM_DATABASE=Heinzinger electronic GmbH
+
 OUI:00B810*
  ID_OUI_FROM_DATABASE=Yichip Microelectronics (Hangzhou) Co.,Ltd
 
@@ -39782,6 +39803,9 @@ OUI:048B42*
 OUI:048C03*
  ID_OUI_FROM_DATABASE=ThinPAD Technology (Shenzhen)CO.,LTD
 
+OUI:048C16*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:048C9A*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -39905,6 +39929,9 @@ OUI:04BD70*
 OUI:04BD88*
  ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
 
+OUI:04BDBF*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:04BF6D*
  ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
 
@@ -40175,6 +40202,9 @@ OUI:04F128*
 OUI:04F13E*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:04F169*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:04F17D*
  ID_OUI_FROM_DATABASE=Tarana Wireless
 
@@ -40919,6 +40949,9 @@ OUI:0868EA*
 OUI:086A0A*
  ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
 
+OUI:086BD1*
+ ID_OUI_FROM_DATABASE=Shenzhen SuperElectron Technology Co.,Ltd.
+
 OUI:086BD7*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
@@ -40997,6 +41030,9 @@ OUI:088620*
 OUI:08863B*
  ID_OUI_FROM_DATABASE=Belkin International Inc.
 
+OUI:0887C6*
+ ID_OUI_FROM_DATABASE=INGRAM MICRO SERVICES
+
 OUI:088C2C*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -41114,9 +41150,15 @@ OUI:08BE77*
 OUI:08BEAC*
  ID_OUI_FROM_DATABASE=Edimax Technology Co. Ltd.
 
+OUI:08BFA0*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:08C021*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:08C0EB*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
 OUI:08C5E1*
  ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO-MECHANICS(THAILAND)
 
@@ -41193,7 +41235,7 @@ OUI:08EA40*
  ID_OUI_FROM_DATABASE=SHENZHEN BILIAN ELECTRONIC CO.，LTD
 
 OUI:08EA44*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:08EB29*
  ID_OUI_FROM_DATABASE=Jiangsu Huitong Group Co.,Ltd.
@@ -41279,6 +41321,9 @@ OUI:08F1EA*
 OUI:08F2F4*
  ID_OUI_FROM_DATABASE=Net One Partners Co.,Ltd.
 
+OUI:08F458*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:08F4AB*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -41390,6 +41435,9 @@ OUI:0C2724*
 OUI:0C2755*
  ID_OUI_FROM_DATABASE=Valuable Techologies Limited
 
+OUI:0C29EF*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:0C2A69*
  ID_OUI_FROM_DATABASE=electric imp, incorporated
 
@@ -41411,9 +41459,15 @@ OUI:0C2FB0*
 OUI:0C3021*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:0C35FE*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:0C3747*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:0C3796*
+ ID_OUI_FROM_DATABASE=BIZLINK TECHNOLOGY, INC.
+
 OUI:0C37DC*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -41459,6 +41513,9 @@ OUI:0C47C9*
 OUI:0C4885*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
+OUI:0C48C6*
+ ID_OUI_FROM_DATABASE=CELESTICA INC.
+
 OUI:0C4933*
  ID_OUI_FROM_DATABASE=Sichuan Jiuzhou Electronic Technology Co., Ltd.
 
@@ -41657,6 +41714,9 @@ OUI:0C8268*
 OUI:0C826A*
  ID_OUI_FROM_DATABASE=Wuhan Huagong Genuine Optics Technology Co., Ltd
 
+OUI:0C839A*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:0C8411*
  ID_OUI_FROM_DATABASE=A.O. Smith Water Products
 
@@ -42140,6 +42200,9 @@ OUI:1005B1*
 OUI:1005CA*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:1005E1*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:1007230*
  ID_OUI_FROM_DATABASE=RippleTek Tech Ltd
 
@@ -42392,6 +42455,9 @@ OUI:104F58*
 OUI:104FA8*
  ID_OUI_FROM_DATABASE=Sony Corporation
 
+OUI:105072*
+ ID_OUI_FROM_DATABASE=Sercomm Corporation.
+
 OUI:105172*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -42476,6 +42542,9 @@ OUI:106F3F*
 OUI:106FEF*
  ID_OUI_FROM_DATABASE=Ad-Sol Nissin Corp
 
+OUI:1070FD*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
 OUI:1071F9*
  ID_OUI_FROM_DATABASE=Cloud Telecomputers, LLC
 
@@ -42686,6 +42755,9 @@ OUI:10C2BA*
 OUI:10C37B*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
+OUI:10C3AB*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:10C586*
  ID_OUI_FROM_DATABASE=BIO SOUND LAB CO., LTD.
 
@@ -42731,6 +42803,9 @@ OUI:10CDAE*
 OUI:10CDB6*
  ID_OUI_FROM_DATABASE=Essential Products, Inc.
 
+OUI:10CE45*
+ ID_OUI_FROM_DATABASE=Miromico AG
+
 OUI:10CEA9*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -42959,6 +43034,9 @@ OUI:1414E6*
 OUI:14157C*
  ID_OUI_FROM_DATABASE=TOKYO COSMOS ELECTRIC CO.,LTD.
 
+OUI:14169D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:14169E*
  ID_OUI_FROM_DATABASE=Wingtech Group (HongKong）Limited
 
@@ -43142,6 +43220,9 @@ OUI:14444A*
 OUI:1446E4*
  ID_OUI_FROM_DATABASE=AVISTEL
 
+OUI:14472D*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:144802*
  ID_OUI_FROM_DATABASE=THE YEOLRIM Co.,Ltd.
 
@@ -43298,6 +43379,9 @@ OUI:147411*
 OUI:147590*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
+OUI:147740*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:14780B*
  ID_OUI_FROM_DATABASE=Varex Imaging Deutschland AG
 
@@ -43439,6 +43523,51 @@ OUI:14ABF0*
 OUI:14ADCA*
  ID_OUI_FROM_DATABASE=China Mobile Iot Limited company
 
+OUI:14AE850*
+ ID_OUI_FROM_DATABASE=Kayamatics Limited
+
+OUI:14AE851*
+ ID_OUI_FROM_DATABASE=Henfred Technology Co., Ltd.
+
+OUI:14AE852*
+ ID_OUI_FROM_DATABASE=Qingdao iTechene Technologies Co., Ltd.
+
+OUI:14AE853*
+ ID_OUI_FROM_DATABASE=IFLYTEK CO.,LTD.
+
+OUI:14AE854*
+ ID_OUI_FROM_DATABASE=CENTERVUE SPA
+
+OUI:14AE855*
+ ID_OUI_FROM_DATABASE=AZ-TECHNOLOGY SDN BHD
+
+OUI:14AE856*
+ ID_OUI_FROM_DATABASE=TMG TE GmbH
+
+OUI:14AE857*
+ ID_OUI_FROM_DATABASE=SHENZHEN HONOR ELECTRONIC CO.,LTD
+
+OUI:14AE858*
+ ID_OUI_FROM_DATABASE=Trimble LEM
+
+OUI:14AE859*
+ ID_OUI_FROM_DATABASE=Veo Technologies
+
+OUI:14AE85A*
+ ID_OUI_FROM_DATABASE=MTA Systems
+
+OUI:14AE85B*
+ ID_OUI_FROM_DATABASE=NTC SOFT
+
+OUI:14AE85C*
+ ID_OUI_FROM_DATABASE=IO Industries Inc.
+
+OUI:14AE85D*
+ ID_OUI_FROM_DATABASE=iSolution Technologies Co.,Ltd.
+
+OUI:14AE85E*
+ ID_OUI_FROM_DATABASE=Sercomm Corporation.
+
 OUI:14AEDB*
  ID_OUI_FROM_DATABASE=VTech Telecommunications Ltd.
 
@@ -43886,6 +44015,9 @@ OUI:185644*
 OUI:185680*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:185869*
+ ID_OUI_FROM_DATABASE=Sailer Electronic Co., Ltd
+
 OUI:185933*
  ID_OUI_FROM_DATABASE=Cisco SPVTG
 
@@ -43952,12 +44084,18 @@ OUI:186882*
 OUI:1868CB*
  ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 
+OUI:1869D8*
+ ID_OUI_FROM_DATABASE=HANGZHOU AIXIANGJI TECHNOLOGY CO., LTD
+
 OUI:1869DA*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
 OUI:186D99*
  ID_OUI_FROM_DATABASE=Adanis Inc.
 
+OUI:186F2D*
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+
 OUI:18703B*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -43988,6 +44126,9 @@ OUI:187C0B*
 OUI:187C81*
  ID_OUI_FROM_DATABASE=Valeo Vision Systems
 
+OUI:187EB9*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:187ED5*
  ID_OUI_FROM_DATABASE=shenzhen kaism technology Co. Ltd
 
@@ -44006,6 +44147,9 @@ OUI:18810E*
 OUI:188219*
  ID_OUI_FROM_DATABASE=Alibaba Cloud Computing Ltd.
 
+OUI:18828C*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
 OUI:188331*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -44036,6 +44180,9 @@ OUI:1889A0*
 OUI:1889DF*
  ID_OUI_FROM_DATABASE=CerebrEX Inc.
 
+OUI:188A6A*
+ ID_OUI_FROM_DATABASE=AVPro Global Hldgs
+
 OUI:188B15*
  ID_OUI_FROM_DATABASE=ShenZhen ZhongRuiJing Technology co.,LTD
 
@@ -44132,6 +44279,9 @@ OUI:189C27*
 OUI:189C5D*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:189E2C*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:189EFC*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -44294,6 +44444,9 @@ OUI:18D717*
 OUI:18D949*
  ID_OUI_FROM_DATABASE=Qvis Labs, LLC
 
+OUI:18D98F*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:18D9EF*
  ID_OUI_FROM_DATABASE=Shuttle Inc.
 
@@ -44402,6 +44555,12 @@ OUI:18FF2E*
 OUI:1C0042*
  ID_OUI_FROM_DATABASE=NARI Technology Co., Ltd.
 
+OUI:1C0219*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
+OUI:1C05B7*
+ ID_OUI_FROM_DATABASE=Chongqing Trantor Technology Co., Ltd.
+
 OUI:1C0656*
  ID_OUI_FROM_DATABASE=IDY Corporation
 
@@ -44726,6 +44885,9 @@ OUI:1C62B8*
 OUI:1C63B7*
  ID_OUI_FROM_DATABASE=OpenProducts 237 AB
 
+OUI:1C63BF*
+ ID_OUI_FROM_DATABASE=SHENZHEN BROADTEL  TELECOM CO.,LTD
+
 OUI:1C6499*
  ID_OUI_FROM_DATABASE=Comtrend Corporation
 
@@ -45095,6 +45257,9 @@ OUI:1C965A*
 OUI:1C973D*
  ID_OUI_FROM_DATABASE=PRICOM Design
 
+OUI:1C97C5*
+ ID_OUI_FROM_DATABASE=Ynomia Pty Ltd
+
 OUI:1C98EC*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
@@ -45755,6 +45920,9 @@ OUI:204E71*
 OUI:204E7F*
  ID_OUI_FROM_DATABASE=NETGEAR
 
+OUI:2050E7*
+ ID_OUI_FROM_DATABASE=AMPAK Technology,Inc.
+
 OUI:2053CA*
  ID_OUI_FROM_DATABASE=Risk Technology Ltd
 
@@ -45834,7 +46002,10 @@ OUI:206BE7*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
 OUI:206C8A*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
+
+OUI:206D31*
+ ID_OUI_FROM_DATABASE=FIREWALLA INC
 
 OUI:206E9C*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@@ -45887,6 +46058,9 @@ OUI:207D74*
 OUI:208058*
  ID_OUI_FROM_DATABASE=Ciena Corporation
 
+OUI:20826A*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:2082C0*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -45986,6 +46160,9 @@ OUI:209BA5*
 OUI:209BCD*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:209EF7*
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
+
 OUI:20A2E4*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -46160,6 +46337,9 @@ OUI:20E564*
 OUI:20E791*
  ID_OUI_FROM_DATABASE=Siemens Healthcare Diagnostics, Inc
 
+OUI:20E874*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:20E882*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -46334,6 +46514,9 @@ OUI:241510E*
 OUI:24166D*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:24169D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:24181D*
  ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO-MECHANICS(THAILAND)
 
@@ -46802,6 +46985,9 @@ OUI:24CBE7*
 OUI:24CF21*
  ID_OUI_FROM_DATABASE=Shenzhen State Micro Technology Co., Ltd
 
+OUI:24D0DF*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:24D13F*
  ID_OUI_FROM_DATABASE=MEXUS CO.,LTD
 
@@ -46979,6 +47165,9 @@ OUI:28107B*
 OUI:2811A5*
  ID_OUI_FROM_DATABASE=Bose Corporation
 
+OUI:2811EC*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:281471*
  ID_OUI_FROM_DATABASE=Lantis co., LTD.
 
@@ -47096,6 +47285,9 @@ OUI:283152*
 OUI:283166*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:28317E*
+ ID_OUI_FROM_DATABASE=Hongkong Nano IC Technologies Co., Ltd
+
 OUI:2832C5*
  ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
 
@@ -47237,11 +47429,14 @@ OUI:2852E0*
 OUI:2852F9*
  ID_OUI_FROM_DATABASE=Zhongxin Intelligent Times (Shenzhen) Co., Ltd.
 
+OUI:285471*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:28565A*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
 OUI:2856C1*
- ID_OUI_FROM_DATABASE=Harman International
+ ID_OUI_FROM_DATABASE=Harman/Becker Automotive Systems GmbH
 
 OUI:285767*
  ID_OUI_FROM_DATABASE=Dish Technologies Corp
@@ -47270,6 +47465,9 @@ OUI:286336*
 OUI:2863BD*
  ID_OUI_FROM_DATABASE=APTIV SERVICES US, LLC
 
+OUI:2864B0*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:28656B*
  ID_OUI_FROM_DATABASE=Keystone Microtech Corporation
 
@@ -47612,6 +47810,9 @@ OUI:28E31F*
 OUI:28E347*
  ID_OUI_FROM_DATABASE=Liteon Technology Corporation
 
+OUI:28E34E*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:28E476*
  ID_OUI_FROM_DATABASE=Pi-Coral
 
@@ -47654,6 +47855,9 @@ OUI:28EED3*
 OUI:28EF01*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:28F033*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:28F076*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -47717,6 +47921,9 @@ OUI:28F537E*
 OUI:28F606*
  ID_OUI_FROM_DATABASE=Syes srl
 
+OUI:28FA7A*
+ ID_OUI_FROM_DATABASE=Zhejiang Tmall Technology Co., Ltd.
+
 OUI:28FAA0*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -47897,6 +48104,9 @@ OUI:2C18AE*
 OUI:2C1984*
  ID_OUI_FROM_DATABASE=IDN Telecom, Inc.
 
+OUI:2C1A01*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:2C1A31*
  ID_OUI_FROM_DATABASE=Electronics Company Limited
 
@@ -48458,6 +48668,9 @@ OUI:2C9717*
 OUI:2C97B1*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:2C97ED*
+ ID_OUI_FROM_DATABASE=Sony Imaging Products & Solutions Inc.
+
 OUI:2C9924*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -48572,6 +48785,9 @@ OUI:2CC260*
 OUI:2CC407*
  ID_OUI_FROM_DATABASE=machineQ
 
+OUI:2CC546*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:2CC548*
  ID_OUI_FROM_DATABASE=IAdea Corporation
 
@@ -48701,6 +48917,9 @@ OUI:2CE6CC*
 OUI:2CE871*
  ID_OUI_FROM_DATABASE=Alert Metalguard ApS
 
+OUI:2CEA7F*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:2CEDEB*
  ID_OUI_FROM_DATABASE=Alpheus Digital Company Limited
 
@@ -49070,6 +49289,9 @@ OUI:304EC3*
 OUI:304F75*
  ID_OUI_FROM_DATABASE=DASAN Network Solutions
 
+OUI:305075*
+ ID_OUI_FROM_DATABASE=GN Audio A/S
+
 OUI:3050FD*
  ID_OUI_FROM_DATABASE=Skyworth Digital Technology(Shenzhen) Co.,Ltd
 
@@ -49184,6 +49406,9 @@ OUI:307CB2*
 OUI:307ECB*
  ID_OUI_FROM_DATABASE=SFR
 
+OUI:30809B*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:308454*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -49305,7 +49530,7 @@ OUI:30B164*
  ID_OUI_FROM_DATABASE=Power Electronics International Inc.
 
 OUI:30B216*
- ID_OUI_FROM_DATABASE=ABB AG - Power Grids - Grid Automation
+ ID_OUI_FROM_DATABASE=ABB Power Grids Germany AG – Grid Automation
 
 OUI:30B3A2*
  ID_OUI_FROM_DATABASE=Shenzhen Heguang Measurement & Control Technology Co.,Ltd
@@ -49331,6 +49556,9 @@ OUI:30B64F*
 OUI:30B7D4*
  ID_OUI_FROM_DATABASE=Hitron Technologies. Inc
 
+OUI:30B9B0*
+ ID_OUI_FROM_DATABASE=Intracom Asia Co., Ltd
+
 OUI:30C01B*
  ID_OUI_FROM_DATABASE=Shenzhen Jingxun Software Telecommunication Technology Co.,Ltd
 
@@ -49637,6 +49865,9 @@ OUI:3413E8*
 OUI:34145F*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:3414B5*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:341513*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -49769,6 +50000,9 @@ OUI:34363B*
 OUI:343759*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:343794*
+ ID_OUI_FROM_DATABASE=Hamee Corp.
+
 OUI:3438AF*
  ID_OUI_FROM_DATABASE=Inlab Software GmbH
 
@@ -49832,6 +50066,9 @@ OUI:344F5C*
 OUI:344F69*
  ID_OUI_FROM_DATABASE=EKINOPS SAS
 
+OUI:345180*
+ ID_OUI_FROM_DATABASE=TCL King Electrical Appliances (Huizhou) Co., Ltd
+
 OUI:3451AA*
  ID_OUI_FROM_DATABASE=JID GLOBAL
 
@@ -49919,6 +50156,9 @@ OUI:346F92*
 OUI:346FED*
  ID_OUI_FROM_DATABASE=Enovation Controls
 
+OUI:347146*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:347563*
  ID_OUI_FROM_DATABASE=SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
 
@@ -49928,6 +50168,9 @@ OUI:3475C7*
 OUI:3476C5*
  ID_OUI_FROM_DATABASE=I-O DATA DEVICE,INC.
 
+OUI:347839*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:347877*
  ID_OUI_FROM_DATABASE=O-Net Communications (Shenzhen) Limited
 
@@ -49980,7 +50223,7 @@ OUI:348446*
  ID_OUI_FROM_DATABASE=Ericsson AB
 
 OUI:348584*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:34862A*
  ID_OUI_FROM_DATABASE=Heinz Lackmann GmbH & Co KG
@@ -50198,6 +50441,9 @@ OUI:34CE00*
 OUI:34CE94*
  ID_OUI_FROM_DATABASE=Parsec (Pty) Ltd
 
+OUI:34CFF6*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:34D09B*
  ID_OUI_FROM_DATABASE=MobilMAX Technology Inc.
 
@@ -50441,6 +50687,9 @@ OUI:380025*
 OUI:380118*
  ID_OUI_FROM_DATABASE=ULVAC,Inc.
 
+OUI:380146*
+ ID_OUI_FROM_DATABASE=SHENZHEN BILIAN ELECTRONIC CO.，LTD
+
 OUI:380195*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -50507,6 +50756,9 @@ OUI:38144E*
 OUI:3816D1*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:381730*
+ ID_OUI_FROM_DATABASE=Ulrich Lippert GmbH & Co KG
+
 OUI:381766*
  ID_OUI_FROM_DATABASE=PROMZAKAZ LTD.
 
@@ -50558,6 +50810,9 @@ OUI:38229D*
 OUI:3822D6*
  ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
 
+OUI:3822E2*
+ ID_OUI_FROM_DATABASE=HP Inc.
+
 OUI:38256B*
  ID_OUI_FROM_DATABASE=Microsoft Mobile Oy
 
@@ -50864,6 +51119,9 @@ OUI:388345*
 OUI:38839A*
  ID_OUI_FROM_DATABASE=SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
 
+OUI:388479*
+ ID_OUI_FROM_DATABASE=Cisco Meraki
+
 OUI:388602*
  ID_OUI_FROM_DATABASE=Flexoptix GmbH
 
@@ -51212,6 +51470,9 @@ OUI:38E98C*
 OUI:38EAA7*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
+OUI:38EB47*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:38EC0D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -51257,6 +51518,9 @@ OUI:38F557*
 OUI:38F597*
  ID_OUI_FROM_DATABASE=home2net GmbH
 
+OUI:38F601*
+ ID_OUI_FROM_DATABASE=Solid State Storage Technology Corporation
+
 OUI:38F708*
  ID_OUI_FROM_DATABASE=National Resource Management, Inc.
 
@@ -51707,6 +51971,9 @@ OUI:3C57BD*
 OUI:3C57D5*
  ID_OUI_FROM_DATABASE=FiveCo
 
+OUI:3C58C2*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:3C591E*
  ID_OUI_FROM_DATABASE=TCL King Electrical Appliances (Huizhou) Co., Ltd
 
@@ -51722,6 +51989,9 @@ OUI:3C5CC3*
 OUI:3C5CC4*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
+OUI:3C5CF1*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:3C5EC3*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -51839,12 +52109,18 @@ OUI:3C7873*
 OUI:3C7A8A*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:3C7D0A*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:3C7DB1*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
 OUI:3C7F6F*
  ID_OUI_FROM_DATABASE=Telechips, Inc.
 
+OUI:3C806B*
+ ID_OUI_FROM_DATABASE=Hunan Voc Acoustics Technology Co., Ltd.
+
 OUI:3C80AA*
  ID_OUI_FROM_DATABASE=Ransnet Singapore Pte Ltd
 
@@ -52004,6 +52280,9 @@ OUI:3CB15B*
 OUI:3CB17F*
  ID_OUI_FROM_DATABASE=Wattwatchers Pty Ld
 
+OUI:3CB53D*
+ ID_OUI_FROM_DATABASE=HUNAN GOKE MICROELECTRONICS CO.,LTD
+
 OUI:3CB6B7*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -52353,7 +52632,7 @@ OUI:4017E2*
  ID_OUI_FROM_DATABASE=INTAI TECHNOLOGY CORP.
 
 OUI:4018B1*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:4018D7*
  ID_OUI_FROM_DATABASE=Smartronix, Inc.
@@ -52388,6 +52667,9 @@ OUI:402814*
 OUI:402B50*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:402B69*
+ ID_OUI_FROM_DATABASE=Kumho Electric Inc.
+
 OUI:402BA1*
  ID_OUI_FROM_DATABASE=Sony Mobile Communications Inc
 
@@ -52439,6 +52721,12 @@ OUI:402CF4*
 OUI:402E28*
  ID_OUI_FROM_DATABASE=MiXTelematics
 
+OUI:402E71*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
+OUI:402F86*
+ ID_OUI_FROM_DATABASE=LG Innotek
+
 OUI:403004*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -52482,7 +52770,7 @@ OUI:4045DA*
  ID_OUI_FROM_DATABASE=Spreadtrum Communications (Shanghai) Co., Ltd.
 
 OUI:40476A*
- ID_OUI_FROM_DATABASE=AG Acquisition Corp. d.b.a. ASTRO Gaming
+ ID_OUI_FROM_DATABASE=Astro Gaming
 
 OUI:4048FD0*
  ID_OUI_FROM_DATABASE=BEIJING C&W ELECTRONICS(GROUP)CO.,LTD
@@ -52886,6 +53174,9 @@ OUI:40B688*
 OUI:40B6B1*
  ID_OUI_FROM_DATABASE=SUNGSAM CO,.Ltd
 
+OUI:40B6E7*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:40B7F3*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -52904,6 +53195,9 @@ OUI:40BA61*
 OUI:40BC60*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:40BC68*
+ ID_OUI_FROM_DATABASE=Wuhan Funshion Online Technologies Co.,Ltd
+
 OUI:40BC73*
  ID_OUI_FROM_DATABASE=Cronoplast  S.L.
 
@@ -52985,6 +53279,9 @@ OUI:40D855*
 OUI:40DC9D*
  ID_OUI_FROM_DATABASE=HAJEN
 
+OUI:40DEAD*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:40DF02*
  ID_OUI_FROM_DATABASE=LINE BIZ Plus
 
@@ -53003,6 +53300,9 @@ OUI:40E793*
 OUI:40EACE*
  ID_OUI_FROM_DATABASE=FOUNDER BROADBAND NETWORK SERVICE CO.,LTD
 
+OUI:40EC99*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:40ECF8*
  ID_OUI_FROM_DATABASE=Siemens AG
 
@@ -53135,6 +53435,9 @@ OUI:40F420*
 OUI:40F4EC*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:40F520*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:40F52E*
  ID_OUI_FROM_DATABASE=Leica Microsystems (Schweiz) AG
 
@@ -53222,6 +53525,9 @@ OUI:4409B8*
 OUI:440CFD*
  ID_OUI_FROM_DATABASE=NetMan Co., Ltd.
 
+OUI:4410FE*
+ ID_OUI_FROM_DATABASE=Huizhou Foryou General Electronics Co., Ltd.
+
 OUI:441102*
  ID_OUI_FROM_DATABASE=EDMI  Europe Ltd
 
@@ -53429,6 +53735,9 @@ OUI:44599F*
 OUI:4459E3*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:445CE9*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:445D5E*
  ID_OUI_FROM_DATABASE=SHENZHEN Coolkit Technology CO.,LTD
 
@@ -53507,6 +53816,9 @@ OUI:4473D6*
 OUI:44746C*
  ID_OUI_FROM_DATABASE=Sony Mobile Communications Inc
 
+OUI:447654*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:44783E*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -53699,6 +54011,9 @@ OUI:44C4A9*
 OUI:44C56F*
  ID_OUI_FROM_DATABASE=NGN Easy Satfinder (Tianjin) Electronic Co., Ltd
 
+OUI:44C65D*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:44C69B*
  ID_OUI_FROM_DATABASE=Wuhan Feng Tian Information Network CO.,LTD
 
@@ -54233,6 +54548,9 @@ OUI:486B91*
 OUI:486DBB*
  ID_OUI_FROM_DATABASE=Vestel Elektronik San ve Tic. A.Ş.
 
+OUI:486E70*
+ ID_OUI_FROM_DATABASE=Zhejiang Tmall Technology Co., Ltd.
+
 OUI:486E73*
  ID_OUI_FROM_DATABASE=Pica8, Inc.
 
@@ -54266,8 +54584,14 @@ OUI:487A55*
 OUI:487ADA*
  ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
 
+OUI:487AF6*
+ ID_OUI_FROM_DATABASE=NCS ELECTRICAL SDN BHD
+
+OUI:487AFF*
+ ID_OUI_FROM_DATABASE=ESSYS
+
 OUI:487B5E*
- ID_OUI_FROM_DATABASE=Social Mobile
+ ID_OUI_FROM_DATABASE=SMT TELECOMM HK
 
 OUI:487B6B*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@@ -54362,6 +54686,9 @@ OUI:48A22D*
 OUI:48A2B7*
  ID_OUI_FROM_DATABASE=Kodofon JSC
 
+OUI:48A2E6*
+ ID_OUI_FROM_DATABASE=Resideo
+
 OUI:48A380*
  ID_OUI_FROM_DATABASE=Gionee Communication Equipment Co.,Ltd.
 
@@ -54410,6 +54737,9 @@ OUI:48B5A7*
 OUI:48B620*
  ID_OUI_FROM_DATABASE=ROLI Ltd.
 
+OUI:48B8A3*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:48B8DE*
  ID_OUI_FROM_DATABASE=HOMEWINS TECHNOLOGY CO.,LTD.
 
@@ -54662,6 +54992,9 @@ OUI:4C09B4*
 OUI:4C09D4*
  ID_OUI_FROM_DATABASE=Arcadyan Technology Corporation
 
+OUI:4C0A3D*
+ ID_OUI_FROM_DATABASE=ADNACOM INC.
+
 OUI:4C0B3A*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
@@ -54803,6 +55136,9 @@ OUI:4C3C16*
 OUI:4C3FD3*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:4C4576*
+ ID_OUI_FROM_DATABASE=China Mobile(Hangzhou) Information Technology Co.,Ltd.
+
 OUI:4C48DA*
  ID_OUI_FROM_DATABASE=Beijing Autelan Technology Co.,Ltd
 
@@ -55155,7 +55491,7 @@ OUI:4C9EFF*
  ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
 
 OUI:4CA003*
- ID_OUI_FROM_DATABASE=T-21 Technologies LLC
+ ID_OUI_FROM_DATABASE=VITEC
 
 OUI:4CA161*
  ID_OUI_FROM_DATABASE=Rain Bird Corporation
@@ -55166,6 +55502,9 @@ OUI:4CA515*
 OUI:4CA56D*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:4CA64D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:4CA74B*
  ID_OUI_FROM_DATABASE=Alcatel Lucent
 
@@ -55232,6 +55571,9 @@ OUI:4CB82C*
 OUI:4CB8B5*
  ID_OUI_FROM_DATABASE=Shenzhen YOUHUA Technology Co., Ltd
 
+OUI:4CB911*
+ ID_OUI_FROM_DATABASE=Raisecom Technology CO.,LTD
+
 OUI:4CB9C8*
  ID_OUI_FROM_DATABASE=CONET CO., LTD.
 
@@ -55313,6 +55655,9 @@ OUI:4CC206*
 OUI:4CC452*
  ID_OUI_FROM_DATABASE=Shang Hai Tyd. Electon Technology Ltd.
 
+OUI:4CC53E*
+ ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
+
 OUI:4CC602*
  ID_OUI_FROM_DATABASE=Radios, Inc.
 
@@ -55340,6 +55685,9 @@ OUI:4CCC34*
 OUI:4CCC6A*
  ID_OUI_FROM_DATABASE=Micro-Star INTL CO., LTD.
 
+OUI:4CCE2D*
+ ID_OUI_FROM_DATABASE=Danlaw Inc
+
 OUI:4CD08A*
  ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
 
@@ -55499,6 +55847,9 @@ OUI:4CFB45*
 OUI:4CFBFE*
  ID_OUI_FROM_DATABASE=Sercomm Japan Corporation
 
+OUI:4CFCAA*
+ ID_OUI_FROM_DATABASE=Tesla,Inc.
+
 OUI:4CFF12*
  ID_OUI_FROM_DATABASE=Fuze Entertainment Co., ltd
 
@@ -55637,6 +55988,9 @@ OUI:501E2D*
 OUI:50206B*
  ID_OUI_FROM_DATABASE=Emerson Climate Technologies Transportation Solutions
 
+OUI:5021EC*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:502267*
  ID_OUI_FROM_DATABASE=PixeLINK
 
@@ -56454,7 +56808,7 @@ OUI:540237*
  ID_OUI_FROM_DATABASE=Teltronic AG
 
 OUI:540384*
- ID_OUI_FROM_DATABASE=Hangkong Nano IC Technologies Co., Ltd
+ ID_OUI_FROM_DATABASE=Hongkong Nano IC Technologies Co., Ltd
 
 OUI:5403F5*
  ID_OUI_FROM_DATABASE=EBN Technology Corp.
@@ -56483,6 +56837,9 @@ OUI:540955*
 OUI:54098D*
  ID_OUI_FROM_DATABASE=deister electronic GmbH
 
+OUI:540DF9*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:541031*
  ID_OUI_FROM_DATABASE=SMARTO
 
@@ -56636,6 +56993,9 @@ OUI:544810*
 OUI:54489C*
  ID_OUI_FROM_DATABASE=CDOUBLES ELECTRONICS CO. LTD.
 
+OUI:5448E6*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co.,Ltd
+
 OUI:544A00*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -56714,6 +57074,9 @@ OUI:546C0E*
 OUI:546D52*
  ID_OUI_FROM_DATABASE=TOPVIEW OPTRONICS CORP.
 
+OUI:5471DD*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:54724F*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -56750,6 +57113,9 @@ OUI:547F54*
 OUI:547FA8*
  ID_OUI_FROM_DATABASE=TELCO systems, s.r.o.
 
+OUI:547FBC*
+ ID_OUI_FROM_DATABASE=iodyne
+
 OUI:547FEE*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -56960,6 +57326,9 @@ OUI:54AB3A*
 OUI:54AE27*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:54AED0*
+ ID_OUI_FROM_DATABASE=DASAN Networks, Inc.
+
 OUI:54B121*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -57369,7 +57738,7 @@ OUI:58570D*
  ID_OUI_FROM_DATABASE=Danfoss Solar Inverters
 
 OUI:5859C2*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:585FF6*
  ID_OUI_FROM_DATABASE=zte corporation
@@ -57515,6 +57884,9 @@ OUI:5893D8*
 OUI:58946B*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:5894B2*
+ ID_OUI_FROM_DATABASE=BrainCo
+
 OUI:5894CF*
  ID_OUI_FROM_DATABASE=Vertex Standard LMR, Inc.
 
@@ -58043,6 +58415,9 @@ OUI:5C521E*
 OUI:5C546D*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:5C5578*
+ ID_OUI_FROM_DATABASE=iryx corp
+
 OUI:5C56ED*
  ID_OUI_FROM_DATABASE=3pleplay Electronics Private Limited
 
@@ -58232,6 +58607,9 @@ OUI:5CA3EB*
 OUI:5CA48A*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:5CA62D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:5CA86A*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -58262,6 +58640,9 @@ OUI:5CB13E*
 OUI:5CB15F*
  ID_OUI_FROM_DATABASE=Oceanblue Cloud Technology Limited
 
+OUI:5CB29E*
+ ID_OUI_FROM_DATABASE=ASCO Power Technologies
+
 OUI:5CB395*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -58289,6 +58670,9 @@ OUI:5CB8CB*
 OUI:5CB901*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
+OUI:5CBA2C*
+ ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
+
 OUI:5CBA37*
  ID_OUI_FROM_DATABASE=Microsoft Corporation
 
@@ -58298,6 +58682,9 @@ OUI:5CBAEF*
 OUI:5CBD9E*
  ID_OUI_FROM_DATABASE=HONGKONG MIRACLE EAGLE TECHNOLOGY(GROUP) LIMITED
 
+OUI:5CC1D7*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:5CC213*
  ID_OUI_FROM_DATABASE=Fr. Sauter AG
 
@@ -58640,6 +59027,9 @@ OUI:601D0F*
 OUI:601D91*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
+OUI:601D9D*
+ ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
+
 OUI:601E02*
  ID_OUI_FROM_DATABASE=EltexAlatau
 
@@ -58814,6 +59204,9 @@ OUI:6064A1*
 OUI:606720*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:60684E*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:606944*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -59210,6 +59603,9 @@ OUI:60D7E3E*
 OUI:60D819*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
+OUI:60D89C*
+ ID_OUI_FROM_DATABASE=HMD Global Oy
+
 OUI:60D9A0*
  ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd.
 
@@ -59225,6 +59621,9 @@ OUI:60DA83*
 OUI:60DB2A*
  ID_OUI_FROM_DATABASE=HNS
 
+OUI:60DE35*
+ ID_OUI_FROM_DATABASE=GITSN, Inc.
+
 OUI:60DE44*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -59351,6 +59750,9 @@ OUI:64094C*
 OUI:640980*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:6409AC*
+ ID_OUI_FROM_DATABASE=TCT mobile ltd
+
 OUI:640B4A*
  ID_OUI_FROM_DATABASE=Digital Telecom Technology Limited
 
@@ -59579,6 +59981,9 @@ OUI:645A04*
 OUI:645AED*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:645CF3*
+ ID_OUI_FROM_DATABASE=ParanTek Inc.
+
 OUI:645D86*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -59588,6 +59993,9 @@ OUI:645D92*
 OUI:645DD7*
  ID_OUI_FROM_DATABASE=Shenzhen Lifesense Medical Electronics Co., Ltd.
 
+OUI:645E2C*
+ ID_OUI_FROM_DATABASE=IRay Technology Co., Ltd.
+
 OUI:645EBE*
  ID_OUI_FROM_DATABASE=Yahoo! JAPAN
 
@@ -59603,6 +60011,51 @@ OUI:646184*
 OUI:646223*
  ID_OUI_FROM_DATABASE=Cellient Co., Ltd.
 
+OUI:6462660*
+ ID_OUI_FROM_DATABASE=MiiVii Dynamics Technology CO.,LTD
+
+OUI:6462661*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:6462662*
+ ID_OUI_FROM_DATABASE=Protectli
+
+OUI:6462663*
+ ID_OUI_FROM_DATABASE=FaceHeart Inc.
+
+OUI:6462664*
+ ID_OUI_FROM_DATABASE=Redstone Systems, Inc.
+
+OUI:6462665*
+ ID_OUI_FROM_DATABASE=Bühler AG
+
+OUI:6462666*
+ ID_OUI_FROM_DATABASE=Pass & Seymour, Inc d/b/a Legrand
+
+OUI:6462667*
+ ID_OUI_FROM_DATABASE=Shenzhen C & D Electronics Co., Ltd.
+
+OUI:6462668*
+ ID_OUI_FROM_DATABASE=Leontech Limited
+
+OUI:6462669*
+ ID_OUI_FROM_DATABASE=Chunghwa System Integration Co., Ltd.
+
+OUI:646266A*
+ ID_OUI_FROM_DATABASE=Sensoro Co., Ltd.
+
+OUI:646266B*
+ ID_OUI_FROM_DATABASE=Signal Hound
+
+OUI:646266C*
+ ID_OUI_FROM_DATABASE=Jiangsu Aisida Electronic Co.,Ltd
+
+OUI:646266D*
+ ID_OUI_FROM_DATABASE=Kobol Innovations Pte. Ltd.
+
+OUI:646266E*
+ ID_OUI_FROM_DATABASE=Shenzhen Jie Shi Lian Industrial Co., LTD
+
 OUI:64628A*
  ID_OUI_FROM_DATABASE=evon GmbH
 
@@ -59648,6 +60101,9 @@ OUI:646E69*
 OUI:646E6C*
  ID_OUI_FROM_DATABASE=Radio Datacom LLC
 
+OUI:646E97*
+ ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
+
 OUI:646EEA*
  ID_OUI_FROM_DATABASE=Iskratel d.o.o.
 
@@ -59849,6 +60305,9 @@ OUI:64BC0C*
 OUI:64BC11*
  ID_OUI_FROM_DATABASE=CombiQ AB
 
+OUI:64BC58*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:64C2DE*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
@@ -59999,12 +60458,18 @@ OUI:64EEB7*
 OUI:64F242*
  ID_OUI_FROM_DATABASE=Gerdes Aktiengesellschaft
 
+OUI:64F2FB*
+ ID_OUI_FROM_DATABASE=Hangzhou Ezviz Software Co.,Ltd.
+
 OUI:64F50E*
  ID_OUI_FROM_DATABASE=Kinion Technology Company Limited
 
 OUI:64F69D*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:64F6BB*
+ ID_OUI_FROM_DATABASE=Fibocom Wireless Inc.
+
 OUI:64F6F7*
  ID_OUI_FROM_DATABASE=Anhui Dynamic Power Co., Ltd.
 
@@ -60245,6 +60710,12 @@ OUI:684749*
 OUI:684898*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:6849B2*
+ ID_OUI_FROM_DATABASE=CARLO GAVAZZI LTD
+
+OUI:684A76*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:684AAE*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -60317,6 +60788,9 @@ OUI:68692E*
 OUI:686975*
  ID_OUI_FROM_DATABASE=Angler Labs Inc
 
+OUI:6869CA*
+ ID_OUI_FROM_DATABASE=Hitachi, Ltd.
+
 OUI:6869F2*
  ID_OUI_FROM_DATABASE=ComAp s.r.o.
 
@@ -60413,6 +60887,9 @@ OUI:688F2E*
 OUI:688F84*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:688FC9*
+ ID_OUI_FROM_DATABASE=Zhuolian (Shenzhen) Communication Co., Ltd
+
 OUI:6891D00*
  ID_OUI_FROM_DATABASE=Central Railway Manufacturing
 
@@ -60578,6 +61055,9 @@ OUI:68B8D9*
 OUI:68B983*
  ID_OUI_FROM_DATABASE=b-plus GmbH
 
+OUI:68B9D3*
+ ID_OUI_FROM_DATABASE=Shenzhen Trolink Technology CO, LTD
+
 OUI:68BC0C*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -60626,6 +61106,9 @@ OUI:68D247*
 OUI:68D482*
  ID_OUI_FROM_DATABASE=SHENZHEN GONGJIN ELECTRONICS CO.,LT
 
+OUI:68D79A*
+ ID_OUI_FROM_DATABASE=Ubiquiti Networks Inc.
+
 OUI:68D925*
  ID_OUI_FROM_DATABASE=ProSys Development Services
 
@@ -60755,6 +61238,9 @@ OUI:6C09D6*
 OUI:6C0B84*
  ID_OUI_FROM_DATABASE=Universal Global Scientific Industrial Co., Ltd.
 
+OUI:6C0D34*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:6C0E0D*
  ID_OUI_FROM_DATABASE=Sony Mobile Communications Inc
 
@@ -60773,6 +61259,9 @@ OUI:6C15F9*
 OUI:6C160E*
  ID_OUI_FROM_DATABASE=ShotTracker
 
+OUI:6C1632*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:6C1811*
  ID_OUI_FROM_DATABASE=Decatur Electronics
 
@@ -60917,6 +61406,9 @@ OUI:6C49C1*
 OUI:6C4A39*
  ID_OUI_FROM_DATABASE=BITA
 
+OUI:6C4A85*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:6C4B7F*
  ID_OUI_FROM_DATABASE=Vossloh-Schwabe Deutschland GmbH
 
@@ -61031,6 +61523,9 @@ OUI:6C60EB*
 OUI:6C6126*
  ID_OUI_FROM_DATABASE=Rinicom Holdings
 
+OUI:6C61F4*
+ ID_OUI_FROM_DATABASE=SFR
+
 OUI:6C626D*
  ID_OUI_FROM_DATABASE=Micro-Star INT'L CO., LTD
 
@@ -61040,6 +61535,9 @@ OUI:6C639C*
 OUI:6C641A*
  ID_OUI_FROM_DATABASE=Penguin Computing
 
+OUI:6C6A77*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:6C6CD3*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -61307,12 +61805,18 @@ OUI:6CD68A*
 OUI:6CD71F*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
+OUI:6CD94C*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:6CDC6A*
  ID_OUI_FROM_DATABASE=Promethean Limited
 
 OUI:6CDD30*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:6CDDBC*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:6CDFFB0*
  ID_OUI_FROM_DATABASE=Shenzhen HDCVT Technology
 
@@ -61424,6 +61928,9 @@ OUI:6CF37F*
 OUI:6CF5E8*
  ID_OUI_FROM_DATABASE=Mooredoll Inc.
 
+OUI:6CF712*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:6CF97C*
  ID_OUI_FROM_DATABASE=Nanoptix Inc.
 
@@ -61538,6 +62045,9 @@ OUI:701DC4*
 OUI:701E68*
  ID_OUI_FROM_DATABASE=Hanna Instruments, Inc.
 
+OUI:701F3C*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:701F53*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -61617,7 +62127,7 @@ OUI:703509*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
 OUI:703811*
- ID_OUI_FROM_DATABASE=Invensys Rail
+ ID_OUI_FROM_DATABASE=Siemens Mobility Limited
 
 OUI:7038B4*
  ID_OUI_FROM_DATABASE=Low Tech Solutions
@@ -61673,6 +62183,9 @@ OUI:70480F*
 OUI:7048F7*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
+OUI:704A0E*
+ ID_OUI_FROM_DATABASE=AMPAK Technology,Inc.
+
 OUI:704AAE*
  ID_OUI_FROM_DATABASE=Xstream Flow (Pty) Ltd
 
@@ -61793,6 +62306,9 @@ OUI:7065A3*
 OUI:70661B*
  ID_OUI_FROM_DATABASE=Sonova AG
 
+OUI:706655*
+ ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
+
 OUI:706879*
  ID_OUI_FROM_DATABASE=Saijo Denki International Co., Ltd.
 
@@ -61845,7 +62361,7 @@ OUI:707630*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
 OUI:7076DD*
- ID_OUI_FROM_DATABASE=Oxyguard International A/S
+ ID_OUI_FROM_DATABASE=OxyGuard Internation A/S
 
 OUI:7076F0*
  ID_OUI_FROM_DATABASE=LevelOne Communications (India) Private Limited
@@ -62174,6 +62690,9 @@ OUI:70B3D5029*
 OUI:70B3D502A*
  ID_OUI_FROM_DATABASE=BAE Systems Surface Ships Limited
 
+OUI:70B3D502B*
+ ID_OUI_FROM_DATABASE=Scorpion Precision Industry (HK)CO. Ltd.
+
 OUI:70B3D502D*
  ID_OUI_FROM_DATABASE=NEXTtec srl
 
@@ -62204,6 +62723,9 @@ OUI:70B3D5035*
 OUI:70B3D5037*
  ID_OUI_FROM_DATABASE=EIFFAGE ENERGIE ELECTRONIQUE
 
+OUI:70B3D5038*
+ ID_OUI_FROM_DATABASE=DONG IL VISION Co., Ltd.
+
 OUI:70B3D5039*
  ID_OUI_FROM_DATABASE=DoWoo Digitech
 
@@ -62654,6 +63176,9 @@ OUI:70B3D50D9*
 OUI:70B3D50DA*
  ID_OUI_FROM_DATABASE=Aquavision Distribution Ltd
 
+OUI:70B3D50DB*
+ ID_OUI_FROM_DATABASE=Cryptotronix LLC
+
 OUI:70B3D50DC*
  ID_OUI_FROM_DATABASE=Talleres de Escoriaza
 
@@ -62717,6 +63242,9 @@ OUI:70B3D50F2*
 OUI:70B3D50F3*
  ID_OUI_FROM_DATABASE=MonsoonRF, Inc.
 
+OUI:70B3D50F4*
+ ID_OUI_FROM_DATABASE=Visual Robotics
+
 OUI:70B3D50F6*
  ID_OUI_FROM_DATABASE=KSE GmbH
 
@@ -62801,6 +63329,9 @@ OUI:70B3D5114*
 OUI:70B3D5115*
  ID_OUI_FROM_DATABASE=Welltec Corp.
 
+OUI:70B3D5117*
+ ID_OUI_FROM_DATABASE=SysCom Automationstechnik GmbH
+
 OUI:70B3D5119*
  ID_OUI_FROM_DATABASE=Private
 
@@ -63101,6 +63632,9 @@ OUI:70B3D5188*
 OUI:70B3D5189*
  ID_OUI_FROM_DATABASE=DAVE SRL
 
+OUI:70B3D518A*
+ ID_OUI_FROM_DATABASE=NSP Europe Ltd
+
 OUI:70B3D518B*
  ID_OUI_FROM_DATABASE=Aplex Technology Inc.
 
@@ -63113,12 +63647,18 @@ OUI:70B3D518D*
 OUI:70B3D518E*
  ID_OUI_FROM_DATABASE=NIPPON SEIKI CO., LTD.
 
+OUI:70B3D518F*
+ ID_OUI_FROM_DATABASE=Newtec A/S
+
 OUI:70B3D5190*
  ID_OUI_FROM_DATABASE=Fantom Wireless, Inc.
 
 OUI:70B3D5192*
  ID_OUI_FROM_DATABASE=ASPT, INC.
 
+OUI:70B3D5193*
+ ID_OUI_FROM_DATABASE=ERA TOYS LIMITED
+
 OUI:70B3D5194*
  ID_OUI_FROM_DATABASE=Husty M.Styczen J.Hupert Sp.J.
 
@@ -63212,12 +63752,18 @@ OUI:70B3D51BD*
 OUI:70B3D51BE*
  ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
+OUI:70B3D51BF*
+ ID_OUI_FROM_DATABASE=DEUTA-WERKE GmbH
+
 OUI:70B3D51C0*
  ID_OUI_FROM_DATABASE=W. H. Leary Co., Inc.
 
 OUI:70B3D51C2*
  ID_OUI_FROM_DATABASE=CENSIS, Uiversity of Glasgow
 
+OUI:70B3D51C3*
+ ID_OUI_FROM_DATABASE=Shanghai Tiancheng Communication Technology Corporation
+
 OUI:70B3D51C4*
  ID_OUI_FROM_DATABASE=Smeg S.p.A.
 
@@ -63245,6 +63791,9 @@ OUI:70B3D51CD*
 OUI:70B3D51CE*
  ID_OUI_FROM_DATABASE=Clear Flow by Antiference
 
+OUI:70B3D51CF*
+ ID_OUI_FROM_DATABASE=Dalcnet srl
+
 OUI:70B3D51D0*
  ID_OUI_FROM_DATABASE=Shenzhen INVT Electric Co.,Ltd
 
@@ -63260,6 +63809,9 @@ OUI:70B3D51D3*
 OUI:70B3D51D4*
  ID_OUI_FROM_DATABASE=Brinkmann Audio GmbH
 
+OUI:70B3D51D5*
+ ID_OUI_FROM_DATABASE=MIVO Technology AB
+
 OUI:70B3D51D6*
  ID_OUI_FROM_DATABASE=MacGray Services
 
@@ -63296,6 +63848,9 @@ OUI:70B3D51E0*
 OUI:70B3D51E1*
  ID_OUI_FROM_DATABASE=TEX COMPUTER SRL
 
+OUI:70B3D51E2*
+ ID_OUI_FROM_DATABASE=Shenzhen CAMERAY ELECTRONIC CO., LTD
+
 OUI:70B3D51E3*
  ID_OUI_FROM_DATABASE=Hatel Elektronik LTD. STI.
 
@@ -63308,6 +63863,9 @@ OUI:70B3D51E5*
 OUI:70B3D51E6*
  ID_OUI_FROM_DATABASE=Sanmina Israel
 
+OUI:70B3D51E7*
+ ID_OUI_FROM_DATABASE=DogWatch Inc
+
 OUI:70B3D51E8*
  ID_OUI_FROM_DATABASE=Gogo BA
 
@@ -63332,6 +63890,9 @@ OUI:70B3D51F0*
 OUI:70B3D51F1*
  ID_OUI_FROM_DATABASE=DIEHL Connectivity Solutions
 
+OUI:70B3D51F2*
+ ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
+
 OUI:70B3D51F3*
  ID_OUI_FROM_DATABASE=Smart Energy Code Company Limited
 
@@ -63548,6 +64109,9 @@ OUI:70B3D5241*
 OUI:70B3D5243*
  ID_OUI_FROM_DATABASE=Rohde&Schwarz Topex SA
 
+OUI:70B3D5244*
+ ID_OUI_FROM_DATABASE=DAT Informatics Pvt Ltd
+
 OUI:70B3D5245*
  ID_OUI_FROM_DATABASE=Newtec A/S
 
@@ -63557,6 +64121,9 @@ OUI:70B3D5246*
 OUI:70B3D5248*
  ID_OUI_FROM_DATABASE=GL TECH CO.,LTD
 
+OUI:70B3D5249*
+ ID_OUI_FROM_DATABASE=Kospel S.A.
+
 OUI:70B3D524A*
  ID_OUI_FROM_DATABASE=Unmukti Technology Pvt Ltd
 
@@ -63608,6 +64175,9 @@ OUI:70B3D525A*
 OUI:70B3D525B*
  ID_OUI_FROM_DATABASE=GID Industrial
 
+OUI:70B3D525C*
+ ID_OUI_FROM_DATABASE=ARCLAN'SYSTEM
+
 OUI:70B3D525D*
  ID_OUI_FROM_DATABASE=Mimo Networks
 
@@ -63704,6 +64274,9 @@ OUI:70B3D5280*
 OUI:70B3D5281*
  ID_OUI_FROM_DATABASE=ITG.CO.LTD
 
+OUI:70B3D5282*
+ ID_OUI_FROM_DATABASE=SAMBO HITECH
+
 OUI:70B3D5283*
  ID_OUI_FROM_DATABASE=TextNinja Co.
 
@@ -64118,18 +64691,27 @@ OUI:70B3D532C*
 OUI:70B3D532D*
  ID_OUI_FROM_DATABASE=Hanwell Technology Co., Ltd.
 
+OUI:70B3D532E*
+ ID_OUI_FROM_DATABASE=A&T Corporation
+
 OUI:70B3D532F*
  ID_OUI_FROM_DATABASE=Movidius SRL
 
 OUI:70B3D5330*
  ID_OUI_FROM_DATABASE=iOne
 
+OUI:70B3D5331*
+ ID_OUI_FROM_DATABASE=Firecom, Inc.
+
 OUI:70B3D5332*
  ID_OUI_FROM_DATABASE=InnoSenT
 
 OUI:70B3D5334*
  ID_OUI_FROM_DATABASE=Dokuen Co. Ltd.
 
+OUI:70B3D5335*
+ ID_OUI_FROM_DATABASE=Jonsa Australia Pty Ltd
+
 OUI:70B3D5336*
  ID_OUI_FROM_DATABASE=Synaccess Networks Inc.
 
@@ -64343,6 +64925,9 @@ OUI:70B3D5383*
 OUI:70B3D5384*
  ID_OUI_FROM_DATABASE=Sensohive Technologies
 
+OUI:70B3D5385*
+ ID_OUI_FROM_DATABASE=Kamacho Scale Co., Ltd.
+
 OUI:70B3D5387*
  ID_OUI_FROM_DATABASE=GWF MessSysteme AG
 
@@ -64469,6 +65054,9 @@ OUI:70B3D53BF*
 OUI:70B3D53C0*
  ID_OUI_FROM_DATABASE=DK-Technologies A/S
 
+OUI:70B3D53C1*
+ ID_OUI_FROM_DATABASE=thingdust AG
+
 OUI:70B3D53C2*
  ID_OUI_FROM_DATABASE=Cellular Specialties, Inc.
 
@@ -64619,6 +65207,9 @@ OUI:70B3D53FA*
 OUI:70B3D53FB*
  ID_OUI_FROM_DATABASE=Liberty Reach
 
+OUI:70B3D53FC*
+ ID_OUI_FROM_DATABASE=TangRen C&S CO., Ltd
+
 OUI:70B3D53FE*
  ID_OUI_FROM_DATABASE=Mentor Graphics
 
@@ -64817,6 +65408,9 @@ OUI:70B3D5449*
 OUI:70B3D544B*
  ID_OUI_FROM_DATABASE=Open System Solutions Limited
 
+OUI:70B3D544D*
+ ID_OUI_FROM_DATABASE=Vessel Technology Ltd
+
 OUI:70B3D544E*
  ID_OUI_FROM_DATABASE=Solace Systems Inc.
 
@@ -64871,6 +65465,12 @@ OUI:70B3D5463*
 OUI:70B3D5465*
  ID_OUI_FROM_DATABASE=ENERGISME
 
+OUI:70B3D5466*
+ ID_OUI_FROM_DATABASE=SYLink Technologie
+
+OUI:70B3D5467*
+ ID_OUI_FROM_DATABASE=GreenWake Technologies
+
 OUI:70B3D5469*
  ID_OUI_FROM_DATABASE=Gentec Systems  Co.
 
@@ -65138,6 +65738,9 @@ OUI:70B3D54D1*
 OUI:70B3D54D2*
  ID_OUI_FROM_DATABASE=Biotage Sweden AB
 
+OUI:70B3D54D3*
+ ID_OUI_FROM_DATABASE=Hefei STAROT Technology Co.,Ltd
+
 OUI:70B3D54D4*
  ID_OUI_FROM_DATABASE=Nortek Global HVAC
 
@@ -65210,6 +65813,9 @@ OUI:70B3D54F1*
 OUI:70B3D54F2*
  ID_OUI_FROM_DATABASE=COMPAL ELECTRONICS, INC.
 
+OUI:70B3D54F3*
+ ID_OUI_FROM_DATABASE=XPS ELETRONICA LTDA
+
 OUI:70B3D54F4*
  ID_OUI_FROM_DATABASE=WiTagg, Inc
 
@@ -65345,6 +65951,9 @@ OUI:70B3D5526*
 OUI:70B3D5528*
  ID_OUI_FROM_DATABASE=Aplex Technology Inc.
 
+OUI:70B3D5529*
+ ID_OUI_FROM_DATABASE=Inventeq B.V.
+
 OUI:70B3D552A*
  ID_OUI_FROM_DATABASE=Dataflex International BV
 
@@ -65360,6 +65969,9 @@ OUI:70B3D552D*
 OUI:70B3D552E*
  ID_OUI_FROM_DATABASE=Swissponic Sagl
 
+OUI:70B3D552F*
+ ID_OUI_FROM_DATABASE=R.C. Systems Inc
+
 OUI:70B3D5530*
  ID_OUI_FROM_DATABASE=iSiS-Ex Limited
 
@@ -65396,6 +66008,9 @@ OUI:70B3D553C*
 OUI:70B3D553D*
  ID_OUI_FROM_DATABASE=ACCEL CORP
 
+OUI:70B3D5541*
+ ID_OUI_FROM_DATABASE=Nanjing Pingguang Electronic Technology Co., Ltd
+
 OUI:70B3D5542*
  ID_OUI_FROM_DATABASE=RTDS Technologies Inc.
 
@@ -65588,6 +66203,9 @@ OUI:70B3D5588*
 OUI:70B3D5589*
  ID_OUI_FROM_DATABASE=Cityntel OU
 
+OUI:70B3D558A*
+ ID_OUI_FROM_DATABASE=ITK Dr. Kassen GmbH
+
 OUI:70B3D558C*
  ID_OUI_FROM_DATABASE=OPTSYS
 
@@ -65678,6 +66296,9 @@ OUI:70B3D55AD*
 OUI:70B3D55AE*
  ID_OUI_FROM_DATABASE=TinTec Co., Ltd.
 
+OUI:70B3D55AF*
+ ID_OUI_FROM_DATABASE=JENG IoT BV
+
 OUI:70B3D55B0*
  ID_OUI_FROM_DATABASE=Qxperts Italia S.r.l.
 
@@ -65744,6 +66365,9 @@ OUI:70B3D55D0*
 OUI:70B3D55D1*
  ID_OUI_FROM_DATABASE=Software Motor Corp
 
+OUI:70B3D55D2*
+ ID_OUI_FROM_DATABASE=Contec Americas Inc.
+
 OUI:70B3D55D3*
  ID_OUI_FROM_DATABASE=Supracon AG
 
@@ -65843,6 +66467,9 @@ OUI:70B3D55F4*
 OUI:70B3D55F6*
  ID_OUI_FROM_DATABASE=FreeFlight Systems
 
+OUI:70B3D55F7*
+ ID_OUI_FROM_DATABASE=JFA Electronics Industry and Commerce EIRELI
+
 OUI:70B3D55F8*
  ID_OUI_FROM_DATABASE=Forcite Helmet Systems Pty Ltd
 
@@ -65867,6 +66494,9 @@ OUI:70B3D55FF*
 OUI:70B3D5600*
  ID_OUI_FROM_DATABASE=Stellwerk GmbH
 
+OUI:70B3D5601*
+ ID_OUI_FROM_DATABASE=Tricom Research Inc.
+
 OUI:70B3D5602*
  ID_OUI_FROM_DATABASE=Quantum Opus, LLC
 
@@ -65915,6 +66545,9 @@ OUI:70B3D5611*
 OUI:70B3D5613*
  ID_OUI_FROM_DATABASE=Suprock Technologies
 
+OUI:70B3D5614*
+ ID_OUI_FROM_DATABASE=QUALITTEQ LLC
+
 OUI:70B3D5615*
  ID_OUI_FROM_DATABASE=JSC OTZVUK
 
@@ -65957,12 +66590,18 @@ OUI:70B3D5625*
 OUI:70B3D5628*
  ID_OUI_FROM_DATABASE=MECT SRL
 
+OUI:70B3D562A*
+ ID_OUI_FROM_DATABASE=DOGA
+
 OUI:70B3D562B*
  ID_OUI_FROM_DATABASE=Silicann Systems GmbH
 
 OUI:70B3D562C*
  ID_OUI_FROM_DATABASE=OOO NTC Rotek
 
+OUI:70B3D562D*
+ ID_OUI_FROM_DATABASE=elements
+
 OUI:70B3D562F*
  ID_OUI_FROM_DATABASE=BARCO, s.r.o.
 
@@ -66011,6 +66650,9 @@ OUI:70B3D563F*
 OUI:70B3D5640*
  ID_OUI_FROM_DATABASE=Electronic Equipment Company Pvt. Ltd.
 
+OUI:70B3D5641*
+ ID_OUI_FROM_DATABASE=Burk Technology
+
 OUI:70B3D5642*
  ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
 
@@ -66086,6 +66728,9 @@ OUI:70B3D565D*
 OUI:70B3D565E*
  ID_OUI_FROM_DATABASE=Season Electronics Ltd
 
+OUI:70B3D565F*
+ ID_OUI_FROM_DATABASE=Axnes AS
+
 OUI:70B3D5660*
  ID_OUI_FROM_DATABASE=Smart Service Technologies CO., LTD
 
@@ -66221,6 +66866,9 @@ OUI:70B3D5696*
 OUI:70B3D5697*
  ID_OUI_FROM_DATABASE=Alazar Technologies Inc.
 
+OUI:70B3D5699*
+ ID_OUI_FROM_DATABASE=Flextronics International Kft
+
 OUI:70B3D569A*
  ID_OUI_FROM_DATABASE=Altaneos
 
@@ -66311,6 +66959,9 @@ OUI:70B3D56BB*
 OUI:70B3D56BC*
  ID_OUI_FROM_DATABASE=EA Elektroautomatik GmbH & Co. KG
 
+OUI:70B3D56BD*
+ ID_OUI_FROM_DATABASE=RCH Vietnam Limited Liability Company
+
 OUI:70B3D56BE*
  ID_OUI_FROM_DATABASE=VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
 
@@ -66320,12 +66971,18 @@ OUI:70B3D56BF*
 OUI:70B3D56C1*
  ID_OUI_FROM_DATABASE=Labtronik s.r.l.
 
+OUI:70B3D56C2*
+ ID_OUI_FROM_DATABASE=TEX COMPUTER SRL
+
 OUI:70B3D56C3*
  ID_OUI_FROM_DATABASE=BEIJING ZGH SECURITY RESEARCH INSTITUTE CO., LTD
 
 OUI:70B3D56C5*
  ID_OUI_FROM_DATABASE=CJSC «Russian telecom equipment company» (CJSC RTEC)
 
+OUI:70B3D56C6*
+ ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
+
 OUI:70B3D56C7*
  ID_OUI_FROM_DATABASE=Becton Dickinson
 
@@ -66797,6 +67454,9 @@ OUI:70B3D577D*
 OUI:70B3D577E*
  ID_OUI_FROM_DATABASE=Blue Marble Communications, Inc.
 
+OUI:70B3D577F*
+ ID_OUI_FROM_DATABASE=Microchip Technology Germany II GmbH&Co.KG
+
 OUI:70B3D5780*
  ID_OUI_FROM_DATABASE=NIDEC LEROY-SOMER
 
@@ -67034,6 +67694,9 @@ OUI:70B3D57D9*
 OUI:70B3D57DA*
  ID_OUI_FROM_DATABASE=Grupo Epelsa S.L.
 
+OUI:70B3D57DB*
+ ID_OUI_FROM_DATABASE=aquila biolabs GmbH
+
 OUI:70B3D57DC*
  ID_OUI_FROM_DATABASE=Software Systems Plus
 
@@ -67349,6 +68012,9 @@ OUI:70B3D5855*
 OUI:70B3D5857*
  ID_OUI_FROM_DATABASE=RCH ITALIA SPA
 
+OUI:70B3D5858*
+ ID_OUI_FROM_DATABASE=Hubbell Power Systems
+
 OUI:70B3D585A*
  ID_OUI_FROM_DATABASE=BRUSHIES
 
@@ -67388,6 +68054,9 @@ OUI:70B3D5866*
 OUI:70B3D5868*
  ID_OUI_FROM_DATABASE=U-JIN Mesco Co., Ltd.
 
+OUI:70B3D5869*
+ ID_OUI_FROM_DATABASE=chargeBIG
+
 OUI:70B3D586A*
  ID_OUI_FROM_DATABASE=Stealth Communications
 
@@ -67478,6 +68147,9 @@ OUI:70B3D588B*
 OUI:70B3D588D*
  ID_OUI_FROM_DATABASE=LG Electronics
 
+OUI:70B3D588E*
+ ID_OUI_FROM_DATABASE=RCH Vietnam Limited Liability Company
+
 OUI:70B3D588F*
  ID_OUI_FROM_DATABASE=Quaesta Instruments, LLC
 
@@ -67538,6 +68210,9 @@ OUI:70B3D58A5*
 OUI:70B3D58A6*
  ID_OUI_FROM_DATABASE=CRDE
 
+OUI:70B3D58A7*
+ ID_OUI_FROM_DATABASE=Tucsen Photonics Co., Ltd.
+
 OUI:70B3D58A8*
  ID_OUI_FROM_DATABASE=megatec electronic GmbH
 
@@ -67820,6 +68495,9 @@ OUI:70B3D591F*
 OUI:70B3D5920*
  ID_OUI_FROM_DATABASE=SLAT
 
+OUI:70B3D5922*
+ ID_OUI_FROM_DATABASE=Adcole Maryland Aerospace
+
 OUI:70B3D5923*
  ID_OUI_FROM_DATABASE=eumig industrie-tv GmbH
 
@@ -68045,6 +68723,9 @@ OUI:70B3D5977*
 OUI:70B3D5978*
  ID_OUI_FROM_DATABASE=Satixfy Israel Ltd.
 
+OUI:70B3D5979*
+ ID_OUI_FROM_DATABASE=eSMART Technologies SA
+
 OUI:70B3D597A*
  ID_OUI_FROM_DATABASE=Orion Corporation
 
@@ -68054,12 +68735,18 @@ OUI:70B3D597B*
 OUI:70B3D597C*
  ID_OUI_FROM_DATABASE=Nu-Tek Power Controls and Automation
 
+OUI:70B3D597D*
+ ID_OUI_FROM_DATABASE=RCH Vietnam Limited Liability Company
+
 OUI:70B3D597E*
  ID_OUI_FROM_DATABASE=Public Joint Stock Company Morion
 
 OUI:70B3D597F*
  ID_OUI_FROM_DATABASE=BISTOS.,Co.,Ltd
 
+OUI:70B3D5980*
+ ID_OUI_FROM_DATABASE=Beijing Yourong Runda Rechnology Development Co.Ltd.
+
 OUI:70B3D5981*
  ID_OUI_FROM_DATABASE=Zamir Recognition Systems Ltd.
 
@@ -68414,6 +69101,9 @@ OUI:70B3D5A07*
 OUI:70B3D5A08*
  ID_OUI_FROM_DATABASE=BioBusiness
 
+OUI:70B3D5A09*
+ ID_OUI_FROM_DATABASE=Smart Embedded Systems
+
 OUI:70B3D5A0A*
  ID_OUI_FROM_DATABASE=CAPSYS
 
@@ -68666,6 +69356,9 @@ OUI:70B3D5A68*
 OUI:70B3D5A69*
  ID_OUI_FROM_DATABASE=Leviathan Solutions Ltd.
 
+OUI:70B3D5A6A*
+ ID_OUI_FROM_DATABASE=Privafy, Inc
+
 OUI:70B3D5A6B*
  ID_OUI_FROM_DATABASE=xmi systems
 
@@ -68697,7 +69390,7 @@ OUI:70B3D5A74*
  ID_OUI_FROM_DATABASE=Sadel S.p.A.
 
 OUI:70B3D5A75*
- ID_OUI_FROM_DATABASE=Taejin InforTech
+ ID_OUI_FROM_DATABASE=Taejin InfoTech
 
 OUI:70B3D5A76*
  ID_OUI_FROM_DATABASE=Pietro Fiorentini
@@ -68720,6 +69413,9 @@ OUI:70B3D5A7D*
 OUI:70B3D5A7E*
  ID_OUI_FROM_DATABASE=QUICCO SOUND Corporation
 
+OUI:70B3D5A7F*
+ ID_OUI_FROM_DATABASE=AUDIO VISUAL DIGITAL SYSTEMS
+
 OUI:70B3D5A80*
  ID_OUI_FROM_DATABASE=EVCO SPA
 
@@ -68729,6 +69425,9 @@ OUI:70B3D5A81*
 OUI:70B3D5A82*
  ID_OUI_FROM_DATABASE=Telefrank GmbH
 
+OUI:70B3D5A83*
+ ID_OUI_FROM_DATABASE=SHENZHEN HUINENGYUAN Technology Co., Ltd
+
 OUI:70B3D5A84*
  ID_OUI_FROM_DATABASE=SOREL GmbH Mikroelektronik
 
@@ -69095,9 +69794,6 @@ OUI:70B3D5B10*
 OUI:70B3D5B11*
  ID_OUI_FROM_DATABASE=CAB S.R.L.
 
-OUI:70B3D5B12*
- ID_OUI_FROM_DATABASE=SFR
-
 OUI:70B3D5B13*
  ID_OUI_FROM_DATABASE=Omwave
 
@@ -69119,6 +69815,9 @@ OUI:70B3D5B19*
 OUI:70B3D5B1A*
  ID_OUI_FROM_DATABASE=Aaronia AG
 
+OUI:70B3D5B1B*
+ ID_OUI_FROM_DATABASE=Technology Link Corporation
+
 OUI:70B3D5B1D*
  ID_OUI_FROM_DATABASE=Safelet BV
 
@@ -69182,6 +69881,9 @@ OUI:70B3D5B34*
 OUI:70B3D5B35*
  ID_OUI_FROM_DATABASE=Rexxam Co.,Ltd.
 
+OUI:70B3D5B36*
+ ID_OUI_FROM_DATABASE=Cetitec GmbH
+
 OUI:70B3D5B37*
  ID_OUI_FROM_DATABASE=CODEC Co., Ltd.
 
@@ -69212,6 +69914,9 @@ OUI:70B3D5B3F*
 OUI:70B3D5B40*
  ID_OUI_FROM_DATABASE=Wuhan Xingtuxinke ELectronic Co.,Ltd
 
+OUI:70B3D5B41*
+ ID_OUI_FROM_DATABASE=T&M Media Pty Ltd
+
 OUI:70B3D5B43*
  ID_OUI_FROM_DATABASE=ZAO ZEO
 
@@ -69326,6 +70031,9 @@ OUI:70B3D5B73*
 OUI:70B3D5B74*
  ID_OUI_FROM_DATABASE=OnYield Inc Ltd
 
+OUI:70B3D5B75*
+ ID_OUI_FROM_DATABASE=Grossenbacher Systeme AG
+
 OUI:70B3D5B76*
  ID_OUI_FROM_DATABASE=ATL-SD
 
@@ -69401,6 +70109,9 @@ OUI:70B3D5B93*
 OUI:70B3D5B94*
  ID_OUI_FROM_DATABASE=Cygnetic Technologies (Pty) Ltd
 
+OUI:70B3D5B96*
+ ID_OUI_FROM_DATABASE=Oculii
+
 OUI:70B3D5B97*
  ID_OUI_FROM_DATABASE=Canam Technology, Inc.
 
@@ -69701,6 +70412,9 @@ OUI:70B3D5C07*
 OUI:70B3D5C08*
  ID_OUI_FROM_DATABASE=Talleres de Escoriaza SA
 
+OUI:70B3D5C09*
+ ID_OUI_FROM_DATABASE=RCH Vietnam Limited Liability Company
+
 OUI:70B3D5C0A*
  ID_OUI_FROM_DATABASE=Infosocket Co., Ltd.
 
@@ -69779,6 +70493,9 @@ OUI:70B3D5C29*
 OUI:70B3D5C2A*
  ID_OUI_FROM_DATABASE=Array Telepresence
 
+OUI:70B3D5C2B*
+ ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
+
 OUI:70B3D5C2C*
  ID_OUI_FROM_DATABASE=Dromont S.p.A.
 
@@ -69791,6 +70508,9 @@ OUI:70B3D5C2E*
 OUI:70B3D5C2F*
  ID_OUI_FROM_DATABASE=ATBiS Co.,Ltd
 
+OUI:70B3D5C31*
+ ID_OUI_FROM_DATABASE=German Power GmbH
+
 OUI:70B3D5C32*
  ID_OUI_FROM_DATABASE=INFRASAFE/ ADVANTOR SYSTEMS
 
@@ -69875,6 +70595,9 @@ OUI:70B3D5C50*
 OUI:70B3D5C51*
  ID_OUI_FROM_DATABASE=Innotas Elektronik GmbH
 
+OUI:70B3D5C52*
+ ID_OUI_FROM_DATABASE=sensorway
+
 OUI:70B3D5C53*
  ID_OUI_FROM_DATABASE=S Labs sp. z o.o.
 
@@ -69995,6 +70718,9 @@ OUI:70B3D5C80*
 OUI:70B3D5C81*
  ID_OUI_FROM_DATABASE=DSP DESIGN
 
+OUI:70B3D5C82*
+ ID_OUI_FROM_DATABASE=Sicon srl
+
 OUI:70B3D5C83*
  ID_OUI_FROM_DATABASE=CertusNet Inc.
 
@@ -70043,6 +70769,9 @@ OUI:70B3D5C92*
 OUI:70B3D5C93*
  ID_OUI_FROM_DATABASE=GMI Ltd
 
+OUI:70B3D5C94*
+ ID_OUI_FROM_DATABASE=Vars Technology
+
 OUI:70B3D5C95*
  ID_OUI_FROM_DATABASE=Chengdu Meihuan Technology Co., Ltd
 
@@ -70052,6 +70781,12 @@ OUI:70B3D5C96*
 OUI:70B3D5C97*
  ID_OUI_FROM_DATABASE=CSINFOTEL
 
+OUI:70B3D5C98*
+ ID_OUI_FROM_DATABASE=Trust Automation
+
+OUI:70B3D5C9A*
+ ID_OUI_FROM_DATABASE=Todd Digital Limited
+
 OUI:70B3D5C9B*
  ID_OUI_FROM_DATABASE=Tieto Sweden AB
 
@@ -70391,6 +71126,9 @@ OUI:70B3D5D28*
 OUI:70B3D5D29*
  ID_OUI_FROM_DATABASE=Sportzcast
 
+OUI:70B3D5D2A*
+ ID_OUI_FROM_DATABASE=ITsynergy Ltd
+
 OUI:70B3D5D2B*
  ID_OUI_FROM_DATABASE=StreamPlay Oy Ltd
 
@@ -70589,6 +71327,9 @@ OUI:70B3D5D75*
 OUI:70B3D5D76*
  ID_OUI_FROM_DATABASE=attocube systems AG
 
+OUI:70B3D5D77*
+ ID_OUI_FROM_DATABASE=Portrait Displays, Inc.
+
 OUI:70B3D5D79*
  ID_OUI_FROM_DATABASE=GOMA ELETTRONICA SpA
 
@@ -70682,6 +71423,9 @@ OUI:70B3D5D9D*
 OUI:70B3D5D9E*
  ID_OUI_FROM_DATABASE=Grupo Epelsa S.L.
 
+OUI:70B3D5D9F*
+ ID_OUI_FROM_DATABASE=Digital Solutions JSC
+
 OUI:70B3D5DA1*
  ID_OUI_FROM_DATABASE=Qprel srl
 
@@ -70718,6 +71462,9 @@ OUI:70B3D5DAC*
 OUI:70B3D5DAD*
  ID_OUI_FROM_DATABASE=GD Mission Systems
 
+OUI:70B3D5DAE*
+ ID_OUI_FROM_DATABASE=LGE
+
 OUI:70B3D5DAF*
  ID_OUI_FROM_DATABASE=INNOVATIVE CONCEPTS AND DESIGN LLC
 
@@ -70838,6 +71585,9 @@ OUI:70B3D5DDF*
 OUI:70B3D5DE0*
  ID_OUI_FROM_DATABASE=eCozy GmbH
 
+OUI:70B3D5DE1*
+ ID_OUI_FROM_DATABASE=Duplomatic MS spa
+
 OUI:70B3D5DE2*
  ID_OUI_FROM_DATABASE=ACD Elekronik GmbH
 
@@ -70961,6 +71711,9 @@ OUI:70B3D5E0F*
 OUI:70B3D5E10*
  ID_OUI_FROM_DATABASE=Leidos
 
+OUI:70B3D5E12*
+ ID_OUI_FROM_DATABASE=SNK, Inc.
+
 OUI:70B3D5E14*
  ID_OUI_FROM_DATABASE=Automata Spa
 
@@ -71003,6 +71756,9 @@ OUI:70B3D5E22*
 OUI:70B3D5E23*
  ID_OUI_FROM_DATABASE=Smith Meter, Inc.
 
+OUI:70B3D5E24*
+ ID_OUI_FROM_DATABASE=Gogo Business Aviation
+
 OUI:70B3D5E25*
  ID_OUI_FROM_DATABASE=GJD Manufacturing
 
@@ -71042,6 +71798,9 @@ OUI:70B3D5E32*
 OUI:70B3D5E33*
  ID_OUI_FROM_DATABASE=DEUTA-WERKE GmbH
 
+OUI:70B3D5E34*
+ ID_OUI_FROM_DATABASE=Gamber Johnson-LLC
+
 OUI:70B3D5E35*
  ID_OUI_FROM_DATABASE=Nanospeed Technologies Limited
 
@@ -71099,6 +71858,9 @@ OUI:70B3D5E4B*
 OUI:70B3D5E4C*
  ID_OUI_FROM_DATABASE=IAI-Israel Aerospace Industries MBT
 
+OUI:70B3D5E4D*
+ ID_OUI_FROM_DATABASE=Vulcan Wireless Inc.
+
 OUI:70B3D5E4E*
  ID_OUI_FROM_DATABASE=Midfin Systems
 
@@ -71135,6 +71897,9 @@ OUI:70B3D5E59*
 OUI:70B3D5E5B*
  ID_OUI_FROM_DATABASE=Argosy Labs Inc.
 
+OUI:70B3D5E5C*
+ ID_OUI_FROM_DATABASE=Walton Hi-Tech Industries Ltd.
+
 OUI:70B3D5E5D*
  ID_OUI_FROM_DATABASE=Boffins Technologies AB
 
@@ -71174,6 +71939,9 @@ OUI:70B3D5E70*
 OUI:70B3D5E71*
  ID_OUI_FROM_DATABASE=SiS Technology
 
+OUI:70B3D5E72*
+ ID_OUI_FROM_DATABASE=KDT Corp.
+
 OUI:70B3D5E74*
  ID_OUI_FROM_DATABASE=Exfrontier Co., Ltd.
 
@@ -71309,6 +72077,9 @@ OUI:70B3D5EA3*
 OUI:70B3D5EA4*
  ID_OUI_FROM_DATABASE=Grupo Epelsa S.L.
 
+OUI:70B3D5EA5*
+ ID_OUI_FROM_DATABASE=LOTES TM OOO
+
 OUI:70B3D5EA6*
  ID_OUI_FROM_DATABASE=Galios
 
@@ -71375,6 +72146,9 @@ OUI:70B3D5EBD*
 OUI:70B3D5EBE*
  ID_OUI_FROM_DATABASE=Sierra Pacific Innovations Corp
 
+OUI:70B3D5EBF*
+ ID_OUI_FROM_DATABASE=AUTOMATICA Y REGULACION S.A.
+
 OUI:70B3D5EC1*
  ID_OUI_FROM_DATABASE=Xafax Nederland bv
 
@@ -71459,6 +72233,9 @@ OUI:70B3D5EE4*
 OUI:70B3D5EE5*
  ID_OUI_FROM_DATABASE=Beijing Hzhytech Technology Co.Ltd
 
+OUI:70B3D5EE6*
+ ID_OUI_FROM_DATABASE=Vaunix Technology Corporation
+
 OUI:70B3D5EE7*
  ID_OUI_FROM_DATABASE=BLUE-SOLUTIONS CANADA INC.
 
@@ -71471,6 +72248,9 @@ OUI:70B3D5EE9*
 OUI:70B3D5EEA*
  ID_OUI_FROM_DATABASE=Dameca a/s
 
+OUI:70B3D5EEB*
+ ID_OUI_FROM_DATABASE=shenzhen suofeixiang technology Co.,Ltd
+
 OUI:70B3D5EEC*
  ID_OUI_FROM_DATABASE=Impolux GmbH
 
@@ -71627,6 +72407,9 @@ OUI:70B3D5F25*
 OUI:70B3D5F27*
  ID_OUI_FROM_DATABASE=NIRIT- Xinwei  Telecom Technology Co., Ltd.
 
+OUI:70B3D5F28*
+ ID_OUI_FROM_DATABASE=Yi An Electronics Co., Ltd
+
 OUI:70B3D5F29*
  ID_OUI_FROM_DATABASE=SamabaNova Systems
 
@@ -71696,6 +72479,9 @@ OUI:70B3D5F44*
 OUI:70B3D5F45*
  ID_OUI_FROM_DATABASE=Norbit ODM AS
 
+OUI:70B3D5F47*
+ ID_OUI_FROM_DATABASE=TXMission Ltd.
+
 OUI:70B3D5F48*
  ID_OUI_FROM_DATABASE=HEITEC AG
 
@@ -71765,6 +72551,9 @@ OUI:70B3D5F62*
 OUI:70B3D5F63*
  ID_OUI_FROM_DATABASE=Ars Products
 
+OUI:70B3D5F64*
+ ID_OUI_FROM_DATABASE=silicom
+
 OUI:70B3D5F65*
  ID_OUI_FROM_DATABASE=MARKUS LABS
 
@@ -71774,6 +72563,12 @@ OUI:70B3D5F67*
 OUI:70B3D5F68*
  ID_OUI_FROM_DATABASE=AL ZAJEL MODERN TELECOMM
 
+OUI:70B3D5F69*
+ ID_OUI_FROM_DATABASE=Copper Labs, Inc.
+
+OUI:70B3D5F6A*
+ ID_OUI_FROM_DATABASE=Guan Show Technologe Co., Ltd.
+
 OUI:70B3D5F6C*
  ID_OUI_FROM_DATABASE=VisioGreen
 
@@ -71912,6 +72707,9 @@ OUI:70B3D5F9C*
 OUI:70B3D5F9E*
  ID_OUI_FROM_DATABASE=International Center for Elementary Particle Physics, The University of Tokyo
 
+OUI:70B3D5F9F*
+ ID_OUI_FROM_DATABASE=M.A.C. Solutions (UK) Ltd
+
 OUI:70B3D5FA0*
  ID_OUI_FROM_DATABASE=TIAMA
 
@@ -71936,6 +72734,9 @@ OUI:70B3D5FA6*
 OUI:70B3D5FA7*
  ID_OUI_FROM_DATABASE=Nordson Corporation
 
+OUI:70B3D5FA8*
+ ID_OUI_FROM_DATABASE=Munters
+
 OUI:70B3D5FA9*
  ID_OUI_FROM_DATABASE=CorDes, LLC
 
@@ -71957,6 +72758,9 @@ OUI:70B3D5FAF*
 OUI:70B3D5FB0*
  ID_OUI_FROM_DATABASE=Rohde&Schwarz Topex SA
 
+OUI:70B3D5FB1*
+ ID_OUI_FROM_DATABASE=TOMEI TSUSHIN KOGYO CO,.LTD
+
 OUI:70B3D5FB2*
  ID_OUI_FROM_DATABASE=KJ3 Elektronik AB
 
@@ -72209,6 +73013,9 @@ OUI:70C9C6*
 OUI:70CA4D*
  ID_OUI_FROM_DATABASE=Shenzhen lnovance Technology Co.,Ltd.
 
+OUI:70CA97*
+ ID_OUI_FROM_DATABASE=Ruckus Wireless
+
 OUI:70CA9B*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -72557,6 +73364,9 @@ OUI:741F4A*
 OUI:741F79*
  ID_OUI_FROM_DATABASE=YOUNGKOOK ELECTRONICS CO.,LTD
 
+OUI:7422BB*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:742344*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -72626,6 +73436,9 @@ OUI:7438B7*
 OUI:743A65*
  ID_OUI_FROM_DATABASE=NEC Corporation
 
+OUI:743AEF*
+ ID_OUI_FROM_DATABASE=Kaonmedia CO., LTD.
+
 OUI:743C18*
  ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 
@@ -72992,6 +73805,9 @@ OUI:74A78E*
 OUI:74AC5F*
  ID_OUI_FROM_DATABASE=Qiku Internet Network Scientific (Shenzhen) Co., Ltd.
 
+OUI:74ACB9*
+ ID_OUI_FROM_DATABASE=Ubiquiti Networks Inc.
+
 OUI:74ADB7*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
@@ -73010,6 +73826,9 @@ OUI:74B57E*
 OUI:74B587*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:74B6B6*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:74B91E*
  ID_OUI_FROM_DATABASE=Nanjing Bestway Automation System Co., Ltd
 
@@ -73052,6 +73871,9 @@ OUI:74C621*
 OUI:74C63B*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
+OUI:74C929*
+ ID_OUI_FROM_DATABASE=Zhejiang Dahua Technology Co., Ltd.
+
 OUI:74C99A*
  ID_OUI_FROM_DATABASE=Ericsson AB
 
@@ -73559,6 +74381,9 @@ OUI:784F43*
 OUI:784F9B*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:78507C*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:78510C*
  ID_OUI_FROM_DATABASE=LiveU Ltd.
 
@@ -73571,6 +74396,9 @@ OUI:78524A*
 OUI:785262*
  ID_OUI_FROM_DATABASE=Shenzhen Hojy Software Co., Ltd.
 
+OUI:78530D*
+ ID_OUI_FROM_DATABASE=Shenzhen Skyworth  Digital  Technology  CO., Ltd
+
 OUI:785364*
  ID_OUI_FROM_DATABASE=SHIFT GmbH
 
@@ -73665,7 +74493,7 @@ OUI:787D48*
  ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
 
 OUI:787D53*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:787E61*
  ID_OUI_FROM_DATABASE=Apple, Inc.
@@ -73682,6 +74510,9 @@ OUI:788102*
 OUI:78818F*
  ID_OUI_FROM_DATABASE=Server Racks Australia Pty Ltd
 
+OUI:7881CE*
+ ID_OUI_FROM_DATABASE=China Mobile Iot Limited company
+
 OUI:78843C*
  ID_OUI_FROM_DATABASE=Sony Corporation
 
@@ -73736,6 +74567,9 @@ OUI:78929C*
 OUI:7894B4*
  ID_OUI_FROM_DATABASE=Sercomm Corporation.
 
+OUI:7894E8*
+ ID_OUI_FROM_DATABASE=Radio Bridge
+
 OUI:789682*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -73817,12 +74651,18 @@ OUI:78A7EB*
 OUI:78A873*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:78AA82*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:78AB60*
  ID_OUI_FROM_DATABASE=ABB Australia
 
 OUI:78ABBB*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:78AC44*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:78ACBF*
  ID_OUI_FROM_DATABASE=Igneous Systems
 
@@ -73868,6 +74708,9 @@ OUI:78B81A*
 OUI:78B84B*
  ID_OUI_FROM_DATABASE=SICHUAN TIANYI COMHEART TELECOMCO.,LTD
 
+OUI:78B8D6*
+ ID_OUI_FROM_DATABASE=Zebra Technologies Inc.
+
 OUI:78BAD0*
  ID_OUI_FROM_DATABASE=Shinybow Technology Co. Ltd.
 
@@ -74745,7 +75588,7 @@ OUI:7C94B2*
  ID_OUI_FROM_DATABASE=Philips Healthcare PCCI
 
 OUI:7C95B1*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:7C95F3*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@@ -74765,6 +75608,9 @@ OUI:7C9A54*
 OUI:7C9A9B*
  ID_OUI_FROM_DATABASE=VSE valencia smart energy
 
+OUI:7C9EBD*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:7CA15D*
  ID_OUI_FROM_DATABASE=GN ReSound A/S
 
@@ -74795,6 +75641,9 @@ OUI:7CA97D*
 OUI:7CAB25*
  ID_OUI_FROM_DATABASE=MESMO TECHNOLOGY INC.
 
+OUI:7CAB60*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:7CACB2*
  ID_OUI_FROM_DATABASE=Bosch Software Innovations GmbH
 
@@ -75065,6 +75914,9 @@ OUI:7CD844*
 OUI:7CD95C*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
+OUI:7CD9A0*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:7CD9FE*
  ID_OUI_FROM_DATABASE=New Cosmos Electric Co., Ltd.
 
@@ -75086,6 +75938,9 @@ OUI:7CDD76*
 OUI:7CDD90*
  ID_OUI_FROM_DATABASE=Shenzhen Ogemray Technology Co., Ltd.
 
+OUI:7CDFA1*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:7CE044*
  ID_OUI_FROM_DATABASE=NEON Inc
 
@@ -75302,6 +76157,9 @@ OUI:8020DA*
 OUI:8020E1*
  ID_OUI_FROM_DATABASE=BVBA DPTechnics
 
+OUI:8020FD*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:802275*
  ID_OUI_FROM_DATABASE=Beijing Beny Wave Technology Co Ltd
 
@@ -76100,6 +76958,9 @@ OUI:842BBC*
 OUI:842C80*
  ID_OUI_FROM_DATABASE=Sichuan Changhong Electric Ltd.
 
+OUI:842E14*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:842E27*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -76553,6 +77414,9 @@ OUI:84A9EA*
 OUI:84AA9C*
  ID_OUI_FROM_DATABASE=MitraStar Technology Corp.
 
+OUI:84AB1A*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:84ACA4*
  ID_OUI_FROM_DATABASE=Beijing Novel Super Digital TV Technology Co., Ltd
 
@@ -76667,6 +77531,9 @@ OUI:84D47E*
 OUI:84D4C8*
  ID_OUI_FROM_DATABASE=Widex A/S
 
+OUI:84D6C5*
+ ID_OUI_FROM_DATABASE=SolarEdge Technologies
+
 OUI:84D6D0*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -76955,6 +77822,9 @@ OUI:88365F*
 OUI:88366C*
  ID_OUI_FROM_DATABASE=EFM Networks
 
+OUI:8836CF*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:883A30*
  ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
 
@@ -77055,7 +77925,7 @@ OUI:885A92*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
 OUI:885BDD*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:885C47*
  ID_OUI_FROM_DATABASE=Alcatel Lucent
@@ -77303,6 +78173,9 @@ OUI:8895B9*
 OUI:88964E*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:889655*
+ ID_OUI_FROM_DATABASE=Zitte corporation
+
 OUI:889676*
  ID_OUI_FROM_DATABASE=TTC MARCONI s.r.o.
 
@@ -77336,6 +78209,9 @@ OUI:889D98*
 OUI:889E33*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
+OUI:889E68*
+ ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
+
 OUI:889F6F*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -77498,6 +78374,9 @@ OUI:88C255*
 OUI:88C36E*
  ID_OUI_FROM_DATABASE=Beijing Ereneben lnformation Technology Limited
 
+OUI:88C397*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
+
 OUI:88C3B3*
  ID_OUI_FROM_DATABASE=SOVICO
 
@@ -77693,6 +78572,9 @@ OUI:8C088B*
 OUI:8C09F4*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:8C0C87*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:8C0C90*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
@@ -77924,6 +78806,9 @@ OUI:8C3A7E*
 OUI:8C3AE3*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
+OUI:8C3B32*
+ ID_OUI_FROM_DATABASE=Microfan B.V.
+
 OUI:8C3BAD*
  ID_OUI_FROM_DATABASE=NETGEAR
 
@@ -78056,6 +78941,9 @@ OUI:8C598B*
 OUI:8C59C3*
  ID_OUI_FROM_DATABASE=ADB Italia
 
+OUI:8C59DC*
+ ID_OUI_FROM_DATABASE=ASR Microelectronics (Shanghai) Co., Ltd.
+
 OUI:8C5A25*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -78080,6 +78968,9 @@ OUI:8C5D60*
 OUI:8C5F48*
  ID_OUI_FROM_DATABASE=Continental Intelligent Transportation Systems LLC
 
+OUI:8C5FAD*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:8C5FDF*
  ID_OUI_FROM_DATABASE=Beijing Railway Signal Factory
 
@@ -78104,6 +78995,9 @@ OUI:8C640B*
 OUI:8C6422*
  ID_OUI_FROM_DATABASE=Sony Mobile Communications Inc
 
+OUI:8C683A*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:8C6878*
  ID_OUI_FROM_DATABASE=Nortek-AS
 
@@ -78179,6 +79073,9 @@ OUI:8C82A8*
 OUI:8C839D*
  ID_OUI_FROM_DATABASE=SHENZHEN XINYUPENG ELECTRONIC TECHNOLOGY CO., LTD
 
+OUI:8C83DF*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:8C83E1*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -78578,6 +79475,9 @@ OUI:900A39*
 OUI:900A3A*
  ID_OUI_FROM_DATABASE=PSG Plastic Service GmbH
 
+OUI:900A84*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
 OUI:900BC1*
  ID_OUI_FROM_DATABASE=Sprocomm Technologies CO.,Ltd
 
@@ -78848,6 +79748,9 @@ OUI:905682*
 OUI:905692*
  ID_OUI_FROM_DATABASE=Autotalks Ltd.
 
+OUI:9056FC*
+ ID_OUI_FROM_DATABASE=TECNO MOBILE LIMITED
+
 OUI:905851*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
@@ -78860,6 +79763,9 @@ OUI:905C34*
 OUI:905C44*
  ID_OUI_FROM_DATABASE=Compal Broadband Networks, Inc.
 
+OUI:905D7C*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:905F2E*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
@@ -78926,6 +79832,9 @@ OUI:907282*
 OUI:90735A*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
+OUI:90749D*
+ ID_OUI_FROM_DATABASE=IRay Technology Co., Ltd.
+
 OUI:907841*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -78995,6 +79904,9 @@ OUI:90895F*
 OUI:908C09*
  ID_OUI_FROM_DATABASE=Total Phase
 
+OUI:908C43*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:908C44*
  ID_OUI_FROM_DATABASE=H.K ZONGMU TECHNOLOGY CO., LTD.
 
@@ -79046,6 +79958,9 @@ OUI:909916*
 OUI:909A77*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:909C4A*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:909D7D*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -79094,6 +80009,9 @@ OUI:90AC3F*
 OUI:90ADF7*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:90ADFC*
+ ID_OUI_FROM_DATABASE=Telechips, Inc.
+
 OUI:90AE1B*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -79122,7 +80040,7 @@ OUI:90B686*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
 OUI:90B832*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:90B8D0*
  ID_OUI_FROM_DATABASE=Joyent, Inc.
@@ -79274,9 +80192,51 @@ OUI:90E202*
 OUI:90E2BA*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:90E2FC0*
+ ID_OUI_FROM_DATABASE=Pars Ertebat Afzar Co.
+
+OUI:90E2FC1*
+ ID_OUI_FROM_DATABASE=Yite technology
+
+OUI:90E2FC2*
+ ID_OUI_FROM_DATABASE=ShenZhen Temwey Innovation Technology Co.,Ltd.
+
+OUI:90E2FC3*
+ ID_OUI_FROM_DATABASE=Shenzhen Hisource Technology Development CO.,Ltd.
+
+OUI:90E2FC4*
+ ID_OUI_FROM_DATABASE=Dongguan Kangyong electronics technology Co. Ltd
+
+OUI:90E2FC5*
+ ID_OUI_FROM_DATABASE=TOTALONE TECHNOLOGY CO., LTD.
+
+OUI:90E2FC6*
+ ID_OUI_FROM_DATABASE=Sindoh Techno Co., Ltd.
+
+OUI:90E2FC7*
+ ID_OUI_FROM_DATABASE=Fair Winds Digital srl
+
+OUI:90E2FC8*
+ ID_OUI_FROM_DATABASE=bitsensing Inc.
+
+OUI:90E2FC9*
+ ID_OUI_FROM_DATABASE=Huddly AS
+
+OUI:90E2FCA*
+ ID_OUI_FROM_DATABASE=Power Engineering & Manufacturing, Inc.
+
+OUI:90E2FCB*
+ ID_OUI_FROM_DATABASE=Shenzhen Dingsheng Intelligent Technology Co., Ltd
+
+OUI:90E2FCC*
+ ID_OUI_FROM_DATABASE=Stanley Security
+
 OUI:90E2FCD*
  ID_OUI_FROM_DATABASE=Beijing Lanxum Computer Technology CO.,LTD.
 
+OUI:90E2FCE*
+ ID_OUI_FROM_DATABASE=DevCom spol. s r.o.
+
 OUI:90E6BA*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
@@ -79292,6 +80252,9 @@ OUI:90EA60*
 OUI:90EC50*
  ID_OUI_FROM_DATABASE=C.O.B.O. SPA
 
+OUI:90EC77*
+ ID_OUI_FROM_DATABASE=silicom
+
 OUI:90EED9*
  ID_OUI_FROM_DATABASE=UNIVERSAL DE DESARROLLOS ELECTRÓNICOS, SA
 
@@ -79364,6 +80327,51 @@ OUI:94049C*
 OUI:9405B6*
  ID_OUI_FROM_DATABASE=Liling FullRiver Electronics & Technology Ltd
 
+OUI:9405BB0*
+ ID_OUI_FROM_DATABASE=Qingdao Maotran Electronics co., ltd
+
+OUI:9405BB1*
+ ID_OUI_FROM_DATABASE=Dongguan Kingtron Electronics Tech Co., Ltd
+
+OUI:9405BB2*
+ ID_OUI_FROM_DATABASE=Dongguan CXWE Technology Co.,Ltd.
+
+OUI:9405BB3*
+ ID_OUI_FROM_DATABASE=Neurik AG
+
+OUI:9405BB4*
+ ID_OUI_FROM_DATABASE=Shenzhen Baolijie Technology Co., Ltd.
+
+OUI:9405BB5*
+ ID_OUI_FROM_DATABASE=Chengdu Zhongheng Network Co.,Ltd.
+
+OUI:9405BB6*
+ ID_OUI_FROM_DATABASE=ZIGPOS GmbH
+
+OUI:9405BB7*
+ ID_OUI_FROM_DATABASE=LTE-X, Inc
+
+OUI:9405BB8*
+ ID_OUI_FROM_DATABASE=iungo
+
+OUI:9405BB9*
+ ID_OUI_FROM_DATABASE=Zimmer GmbH
+
+OUI:9405BBA*
+ ID_OUI_FROM_DATABASE=SolarEdge Technologies
+
+OUI:9405BBB*
+ ID_OUI_FROM_DATABASE=AUSTAR HEARING SCIENCE AND TECHNILIGY(XIAMEN)CO.,LTD
+
+OUI:9405BBC*
+ ID_OUI_FROM_DATABASE=LAO INDUSTRIA LTDA
+
+OUI:9405BBD*
+ ID_OUI_FROM_DATABASE=Sunthink S&T Development Co.,Ltd
+
+OUI:9405BBE*
+ ID_OUI_FROM_DATABASE=BAE Systems
+
 OUI:940937*
  ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
 
@@ -79838,6 +80846,51 @@ OUI:94C962*
 OUI:94CA0F*
  ID_OUI_FROM_DATABASE=Honeywell Analytics
 
+OUI:94CC040*
+ ID_OUI_FROM_DATABASE=Hangzhou Yongkong Technology Co., Ltd.
+
+OUI:94CC041*
+ ID_OUI_FROM_DATABASE=GOCOAX, INC
+
+OUI:94CC042*
+ ID_OUI_FROM_DATABASE=Nanjing Yacer Communication Technology Co. Ltd.
+
+OUI:94CC043*
+ ID_OUI_FROM_DATABASE=Shenzhen Link technology Co.,Ltd
+
+OUI:94CC044*
+ ID_OUI_FROM_DATABASE=ProConnections, Inc.
+
+OUI:94CC045*
+ ID_OUI_FROM_DATABASE=SHENZHEN SANRAY TECHNOLOGY CO.,LTD
+
+OUI:94CC046*
+ ID_OUI_FROM_DATABASE=Sam Nazarko Trading Ltd
+
+OUI:94CC047*
+ ID_OUI_FROM_DATABASE=Gowing Business And Contracting Wenzhou Co., LTD
+
+OUI:94CC048*
+ ID_OUI_FROM_DATABASE=CircuitWerkes, Inc.
+
+OUI:94CC049*
+ ID_OUI_FROM_DATABASE=ENTEC Electric & Electronic Co., LTD.
+
+OUI:94CC04A*
+ ID_OUI_FROM_DATABASE=hyBee Inc.
+
+OUI:94CC04B*
+ ID_OUI_FROM_DATABASE=Shandong free optical technology co., ltd.
+
+OUI:94CC04C*
+ ID_OUI_FROM_DATABASE=Shanxi Baixin Information Technology Co., Ltd.
+
+OUI:94CC04D*
+ ID_OUI_FROM_DATABASE=Hanzhuo Information Technology(Shanghai) Ltd.
+
+OUI:94CC04E*
+ ID_OUI_FROM_DATABASE=SynchronicIT BV
+
 OUI:94CCB9*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -79898,6 +80951,9 @@ OUI:94D9B3*
 OUI:94DB49*
  ID_OUI_FROM_DATABASE=SITCORP
 
+OUI:94DB56*
+ ID_OUI_FROM_DATABASE=Sony Home Entertainment&Sound Products Inc
+
 OUI:94DBC9*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
@@ -79940,12 +80996,18 @@ OUI:94E2FD*
 OUI:94E36D*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:94E4BA*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:94E6F7*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
 OUI:94E711*
  ID_OUI_FROM_DATABASE=Xirka Dama Persada PT
 
+OUI:94E7EA*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:94E848*
  ID_OUI_FROM_DATABASE=FYLDE MICRO LTD
 
@@ -79961,6 +81023,9 @@ OUI:94E979*
 OUI:94E98C*
  ID_OUI_FROM_DATABASE=Nokia
 
+OUI:94E9EE*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:94EAEA*
  ID_OUI_FROM_DATABASE=TELLESCOM INDUSTRIA E COMERCIO EM TELECOMUNICACAO
 
@@ -80027,6 +81092,9 @@ OUI:94FE9D*
 OUI:94FEF4*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:98006A*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:980074*
  ID_OUI_FROM_DATABASE=Raisecom Technology CO., LTD
 
@@ -80159,6 +81227,9 @@ OUI:980CA5*
 OUI:980D2E*
  ID_OUI_FROM_DATABASE=HTC Corporation
 
+OUI:980D51*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:980D67*
  ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
 
@@ -80639,6 +81710,9 @@ OUI:98C5DB*
 OUI:98C845*
  ID_OUI_FROM_DATABASE=PacketAccess
 
+OUI:98C8B8*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:98CA33*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -80690,6 +81764,9 @@ OUI:98DAC4*
 OUI:98DCD9*
  ID_OUI_FROM_DATABASE=UNITEC Co., Ltd.
 
+OUI:98DD5B*
+ ID_OUI_FROM_DATABASE=TAKUMI JAPAN LTD
+
 OUI:98DDEA*
  ID_OUI_FROM_DATABASE=Infinix mobility limited
 
@@ -80730,7 +81807,7 @@ OUI:98EC65*
  ID_OUI_FROM_DATABASE=Cosesy ApS
 
 OUI:98ED5C*
- ID_OUI_FROM_DATABASE=Tesla Motors, Inc
+ ID_OUI_FROM_DATABASE=Tesla,Inc.
 
 OUI:98EECB*
  ID_OUI_FROM_DATABASE=Wistron Infocomm (Zhongshan) Corporation
@@ -80825,6 +81902,9 @@ OUI:98F9C7E*
 OUI:98FA9B*
  ID_OUI_FROM_DATABASE=LCFC(HeFei) Electronics Technology co., ltd
 
+OUI:98FAA7*
+ ID_OUI_FROM_DATABASE=INNONET
+
 OUI:98FAE3*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -80948,6 +82028,9 @@ OUI:9C2DCF*
 OUI:9C2EA1*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:9C2F4E*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:9C2F73*
  ID_OUI_FROM_DATABASE=Universal Tiancheng Technology (Beijing) Co., Ltd.
 
@@ -81123,7 +82206,7 @@ OUI:9C5CF9*
  ID_OUI_FROM_DATABASE=Sony Mobile Communications Inc
 
 OUI:9C5D12*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:9C5D95*
  ID_OUI_FROM_DATABASE=VTC Electronics Corp.
@@ -81135,7 +82218,7 @@ OUI:9C5F5A*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
 OUI:9C611D*
- ID_OUI_FROM_DATABASE=Omni-ID USA, Inc.
+ ID_OUI_FROM_DATABASE=Panasonic Corporation of North America
 
 OUI:9C6121*
  ID_OUI_FROM_DATABASE=SICHUAN TIANYI COMHEART TELECOMCO.,LTD
@@ -81461,6 +82544,9 @@ OUI:9CC8FC*
 OUI:9CC950*
  ID_OUI_FROM_DATABASE=Baumer Holding
 
+OUI:9CC9EB*
+ ID_OUI_FROM_DATABASE=NETGEAR
+
 OUI:9CCAD9*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
@@ -81566,6 +82652,9 @@ OUI:9CEBE8*
 OUI:9CEFD5*
  ID_OUI_FROM_DATABASE=Panda Wireless, Inc.
 
+OUI:9CF029*
+ ID_OUI_FROM_DATABASE=Integrated Device Technology (Malaysia) Sdn. Bhd.
+
 OUI:9CF387*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -82016,6 +83105,9 @@ OUI:A0423F*
 OUI:A04246*
  ID_OUI_FROM_DATABASE=IT Telecom Co., Ltd.
 
+OUI:A043B0*
+ ID_OUI_FROM_DATABASE=Hangzhou BroadLink Technology Co.,Ltd
+
 OUI:A043DB*
  ID_OUI_FROM_DATABASE=Sitael S.p.A.
 
@@ -82040,6 +83132,9 @@ OUI:A04E04*
 OUI:A04EA7*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:A04F85*
+ ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
+
 OUI:A04FD4*
  ID_OUI_FROM_DATABASE=ADB Broadband Italia
 
@@ -82628,6 +83723,9 @@ OUI:A4059E*
 OUI:A407B6*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:A40801*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:A408EA*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
@@ -82724,6 +83822,9 @@ OUI:A41566*
 OUI:A41588*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:A416E7*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:A41731*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -82772,6 +83873,9 @@ OUI:A42940*
 OUI:A42983*
  ID_OUI_FROM_DATABASE=Boeing Defence Australia
 
+OUI:A42985*
+ ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
+
 OUI:A429B7*
  ID_OUI_FROM_DATABASE=bluesky
 
@@ -83345,6 +84449,9 @@ OUI:A4C3F0*
 OUI:A4C494*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:A4C54E*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:A4C64F*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -83366,6 +84473,9 @@ OUI:A4CD23*
 OUI:A4CF12*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:A4CFD2*
+ ID_OUI_FROM_DATABASE=Ubee Interactive Co., Limited
+
 OUI:A4D094*
  ID_OUI_FROM_DATABASE=Erwin Peters Systemtechnik GmbH
 
@@ -83774,6 +84884,9 @@ OUI:A83FA1E*
 OUI:A84041*
  ID_OUI_FROM_DATABASE=Dragino Technology Co., Limited
 
+OUI:A84122*
+ ID_OUI_FROM_DATABASE=China Mobile (Hangzhou) Information Technology Co.,Ltd.
+
 OUI:A84481*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
@@ -84029,6 +85142,9 @@ OUI:A89FEC*
 OUI:A8A089*
  ID_OUI_FROM_DATABASE=Tactical Communications
 
+OUI:A8A097*
+ ID_OUI_FROM_DATABASE=ScioTeq bvba
+
 OUI:A8A159*
  ID_OUI_FROM_DATABASE=ASRock Incorporation
 
@@ -84281,6 +85397,9 @@ OUI:AC0DFE*
 OUI:AC11D3*
  ID_OUI_FROM_DATABASE=Suzhou HOTEK  Video Technology Co. Ltd
 
+OUI:AC1203*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:AC1461*
  ID_OUI_FROM_DATABASE=ATAW  Co., Ltd.
 
@@ -84356,6 +85475,9 @@ OUI:AC1DDFE*
 OUI:AC1E92*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,LTD
 
+OUI:AC1ED0*
+ ID_OUI_FROM_DATABASE=Temic Automotive Philippines Inc.
+
 OUI:AC1F6B*
  ID_OUI_FROM_DATABASE=Super Micro Computer, Inc.
 
@@ -84413,6 +85535,9 @@ OUI:AC35EE*
 OUI:AC3613*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:AC3651*
+ ID_OUI_FROM_DATABASE=Jiangsu Hengtong Terahertz Technology Co., Ltd.
+
 OUI:AC3743*
  ID_OUI_FROM_DATABASE=HTC Corporation
 
@@ -84422,6 +85547,9 @@ OUI:AC37C9*
 OUI:AC3870*
  ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd.
 
+OUI:AC3A67*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:AC3A7A*
  ID_OUI_FROM_DATABASE=Roku, Inc.
 
@@ -84464,9 +85592,18 @@ OUI:AC4723*
 OUI:AC482D*
  ID_OUI_FROM_DATABASE=Ralinwi Nanjing Electronic Technology Co., Ltd.
 
+OUI:AC4A56*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
+OUI:AC4A67*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:AC4AFE*
  ID_OUI_FROM_DATABASE=Hisense Broadband Multimedia Technology Co.,Ltd.
 
+OUI:AC4B1E*
+ ID_OUI_FROM_DATABASE=Integri-Sys.Com LLC
+
 OUI:AC4BC8*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -84836,6 +85973,9 @@ OUI:ACBEB6*
 OUI:ACC1EE*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:ACC25D*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:ACC2EC*
  ID_OUI_FROM_DATABASE=CLT INT'L IND. CORP.
 
@@ -84878,6 +86018,9 @@ OUI:ACCABA*
 OUI:ACCB09*
  ID_OUI_FROM_DATABASE=Hefcom Metering (Pty) Ltd
 
+OUI:ACCB51*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:ACCC8E*
  ID_OUI_FROM_DATABASE=Axis Communications AB
 
@@ -85430,6 +86573,9 @@ OUI:B09137*
 OUI:B0935B*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:B09575*
+ ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
+
 OUI:B0958E*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -85502,6 +86648,9 @@ OUI:B0ADAA*
 OUI:B0AE25*
  ID_OUI_FROM_DATABASE=Varikorea
 
+OUI:B0B194*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:B0B28F*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -85562,6 +86711,9 @@ OUI:B0B3AD*
 OUI:B0B448*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:B0B5C3*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:B0B5E8*
  ID_OUI_FROM_DATABASE=Ruroc LTD
 
@@ -85685,6 +86837,9 @@ OUI:B0C95B*
 OUI:B0CA68*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:B0CCFE*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:B0CE18*
  ID_OUI_FROM_DATABASE=Zhejiang shenghui lighting co.,Ltd
 
@@ -85739,6 +86894,9 @@ OUI:B0E2E5*
 OUI:B0E39D*
  ID_OUI_FROM_DATABASE=CAT SYSTEM CO.,LTD.
 
+OUI:B0E4D5*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:B0E50E*
  ID_OUI_FROM_DATABASE=NRG SYSTEMS INC
 
@@ -85883,6 +87041,9 @@ OUI:B407F9*
 OUI:B40832*
  ID_OUI_FROM_DATABASE=TC Communications
 
+OUI:B40931*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:B40AC6*
  ID_OUI_FROM_DATABASE=DEXON Systems Ltd.
 
@@ -85916,6 +87077,9 @@ OUI:B41489*
 OUI:B41513*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:B4157E*
+ ID_OUI_FROM_DATABASE=Celona Inc.
+
 OUI:B41780*
  ID_OUI_FROM_DATABASE=DTI Group Ltd
 
@@ -85940,6 +87104,9 @@ OUI:B4211D*
 OUI:B4218A*
  ID_OUI_FROM_DATABASE=Dog Hunter LLC
 
+OUI:B42200*
+ ID_OUI_FROM_DATABASE=Brother Industries, LTD.
+
 OUI:B424E7*
  ID_OUI_FROM_DATABASE=Codetek Technology Co.,Ltd
 
@@ -86066,6 +87233,9 @@ OUI:B43DB2*
 OUI:B43E3B*
  ID_OUI_FROM_DATABASE=Viableware, Inc
 
+OUI:B440A4*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:B4417A*
  ID_OUI_FROM_DATABASE=SHENZHEN GONGJIN ELECTRONICS CO.,LT
 
@@ -86210,6 +87380,9 @@ OUI:B46D35*
 OUI:B46D83*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:B46E08*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:B47356*
  ID_OUI_FROM_DATABASE=Hangzhou Treebear Networking Co., Ltd.
 
@@ -86249,6 +87422,9 @@ OUI:B47C9C*
 OUI:B47F5E*
  ID_OUI_FROM_DATABASE=Foresight Manufacture (S) Pte Ltd
 
+OUI:B48107*
+ ID_OUI_FROM_DATABASE=SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD
+
 OUI:B481BF*
  ID_OUI_FROM_DATABASE=Meta-Networks, LLC
 
@@ -86417,6 +87593,9 @@ OUI:B4AE6F*
 OUI:B4B017*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
+OUI:B4B055*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:B4B15A*
  ID_OUI_FROM_DATABASE=Siemens AG Energy Management Division
 
@@ -86498,6 +87677,9 @@ OUI:B4CCE9*
 OUI:B4CD27*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:B4CE40*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:B4CEF6*
  ID_OUI_FROM_DATABASE=HTC Corporation
 
@@ -86618,6 +87800,9 @@ OUI:B4EFFA*
 OUI:B4F0AB*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:B4F18C*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:B4F1DA*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
@@ -86657,6 +87842,9 @@ OUI:B4FE8C*
 OUI:B80018*
  ID_OUI_FROM_DATABASE=Htel
 
+OUI:B802A4*
+ ID_OUI_FROM_DATABASE=Aeonsemi, Inc.
+
 OUI:B80305*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -86762,6 +87950,9 @@ OUI:B82ADC*
 OUI:B82CA0*
  ID_OUI_FROM_DATABASE=Resideo
 
+OUI:B82FCB*
+ ID_OUI_FROM_DATABASE=CMS Electracom
+
 OUI:B830A8*
  ID_OUI_FROM_DATABASE=Road-Track Telematics Development
 
@@ -86873,6 +88064,9 @@ OUI:B8621F*
 OUI:B8634D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:B86392*
+ ID_OUI_FROM_DATABASE=GUANGDONG GENIUS TECHNOLOGY CO., LTD.
+
 OUI:B863BC*
  ID_OUI_FROM_DATABASE=ROBOTIS, Co, Ltd
 
@@ -86940,7 +88134,7 @@ OUI:B87C6F*
  ID_OUI_FROM_DATABASE=NXP (China) Management Ltd.
 
 OUI:B87CF2*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:B88198*
  ID_OUI_FROM_DATABASE=Intel Corporate
@@ -86984,6 +88178,9 @@ OUI:B88D12*
 OUI:B88E3A*
  ID_OUI_FROM_DATABASE=Infinite Technologies JLT
 
+OUI:B88E82*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:B88EC6*
  ID_OUI_FROM_DATABASE=Stateless Networks
 
@@ -86996,6 +88193,9 @@ OUI:B88F14*
 OUI:B88FB4*
  ID_OUI_FROM_DATABASE=JABIL CIRCUIT ITALIA S.R.L
 
+OUI:B89047*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:B891C9*
  ID_OUI_FROM_DATABASE=Handreamnet
 
@@ -87167,6 +88367,9 @@ OUI:B8C46F*
 OUI:B8C68E*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:B8C6AA*
+ ID_OUI_FROM_DATABASE=Earda Technologies co Ltd
+
 OUI:B8C716*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
@@ -87197,12 +88400,18 @@ OUI:B8CD93*
 OUI:B8CDA7*
  ID_OUI_FROM_DATABASE=Maxeler Technologies Ltd.
 
+OUI:B8CEF6*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
 OUI:B8D06F*
  ID_OUI_FROM_DATABASE=GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE
 
 OUI:B8D49D*
  ID_OUI_FROM_DATABASE=M Seven System Ltd.
 
+OUI:B8D4E7*
+ ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
+
 OUI:B8D50B*
  ID_OUI_FROM_DATABASE=Sunitec Enterprise Co.,Ltd
 
@@ -87284,6 +88493,9 @@ OUI:B8DE5E*
 OUI:B8DF6B*
  ID_OUI_FROM_DATABASE=SpotCam Co., Ltd.
 
+OUI:B8E3B1*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:B8E589*
  ID_OUI_FROM_DATABASE=Payter BV
 
@@ -87386,6 +88598,9 @@ OUI:BC024A*
 OUI:BC0543*
  ID_OUI_FROM_DATABASE=AVM GmbH
 
+OUI:BC0963*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:BC0DA5*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -87419,6 +88634,9 @@ OUI:BC15AC*
 OUI:BC1665*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:BC1695*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:BC16F5*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -87479,6 +88697,9 @@ OUI:BC2C55*
 OUI:BC2D98*
  ID_OUI_FROM_DATABASE=ThinGlobal LLC
 
+OUI:BC2DEF*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:BC2E48*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -87593,6 +88814,9 @@ OUI:BC4100*
 OUI:BC4101*
  ID_OUI_FROM_DATABASE=Shenzhen TINNO Mobile Technology Corp.
 
+OUI:BC428C*
+ ID_OUI_FROM_DATABASE=ALPS ELECTRIC CO., LTD.
+
 OUI:BC4377*
  ID_OUI_FROM_DATABASE=Hang Zhou Huite Technology Co.,ltd.
 
@@ -87614,6 +88838,9 @@ OUI:BC4699*
 OUI:BC4760*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:BC4A56*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:BC4B79*
  ID_OUI_FROM_DATABASE=SensingTek
 
@@ -87638,6 +88865,9 @@ OUI:BC52B4*
 OUI:BC52B7*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:BC542F*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:BC5436*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -87800,6 +89030,9 @@ OUI:BC779F*
 OUI:BC79AD*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:BC7ABF*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:BC7DD1*
  ID_OUI_FROM_DATABASE=Radio Data Comms
 
@@ -88131,7 +89364,7 @@ OUI:BCF2AF*
  ID_OUI_FROM_DATABASE=devolo AG
 
 OUI:BCF310*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:BCF5AC*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
@@ -88154,6 +89387,9 @@ OUI:BCFE8C*
 OUI:BCFED9*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:BCFF21*
+ ID_OUI_FROM_DATABASE=Smart Code(shenzhen)Technology Co.,Ltd
+
 OUI:BCFFAC*
  ID_OUI_FROM_DATABASE=TOPCON CORPORATION
 
@@ -88196,6 +89432,9 @@ OUI:C0143D*
 OUI:C014B8*
  ID_OUI_FROM_DATABASE=Nokia
 
+OUI:C01692*
+ ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
+
 OUI:C0174D*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -88517,6 +89756,9 @@ OUI:C09132*
 OUI:C09134*
  ID_OUI_FROM_DATABASE=ProCurve Networking by HP
 
+OUI:C095DA*
+ ID_OUI_FROM_DATABASE=NXP India Private Limited
+
 OUI:C09727*
  ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO-MECHANICS(THAILAND)
 
@@ -88899,7 +90141,7 @@ OUI:C412F5*
  ID_OUI_FROM_DATABASE=D-Link International
 
 OUI:C413E2*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:C4143C*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@@ -88970,6 +90212,9 @@ OUI:C42F90*
 OUI:C43018*
  ID_OUI_FROM_DATABASE=MCS Logic Inc.
 
+OUI:C432D1*
+ ID_OUI_FROM_DATABASE=Farlink Technology Limited
+
 OUI:C43306*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
@@ -89015,6 +90260,9 @@ OUI:C4411E*
 OUI:C44202*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:C44268*
+ ID_OUI_FROM_DATABASE=CRESTRON ELECTRONICS, INC.
+
 OUI:C4438F*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
@@ -89918,6 +91166,9 @@ OUI:C85645*
 OUI:C85663*
  ID_OUI_FROM_DATABASE=Sunflex Europe GmbH
 
+OUI:C858C0*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:C85A9F*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -89988,10 +91239,10 @@ OUI:C8662C*
  ID_OUI_FROM_DATABASE=Beijing Haitai Fangyuan High Technology Co,.Ltd.
 
 OUI:C8665D*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:C8675E*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:C869CD*
  ID_OUI_FROM_DATABASE=Apple, Inc.
@@ -90311,6 +91562,9 @@ OUI:C8D69D*
 OUI:C8D719*
  ID_OUI_FROM_DATABASE=Cisco-Linksys, LLC
 
+OUI:C8D778*
+ ID_OUI_FROM_DATABASE=BSH Hausgeraete GmbH
+
 OUI:C8D779*
  ID_OUI_FROM_DATABASE=QING DAO HAIER TELECOM CO.,LTD.
 
@@ -90713,6 +91967,9 @@ OUI:CC3FEA*
 OUI:CC40D0*
  ID_OUI_FROM_DATABASE=NETGEAR
 
+OUI:CC418E*
+ ID_OUI_FROM_DATABASE=MSA Innovation
+
 OUI:CC43E3*
  ID_OUI_FROM_DATABASE=Trump s.a.
 
@@ -90890,6 +92147,12 @@ OUI:CC7D37*
 OUI:CC7EE7*
  ID_OUI_FROM_DATABASE=Panasonic Corporation AVC Networks Company
 
+OUI:CC7F75*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
+OUI:CC7F76*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:CC81DA*
  ID_OUI_FROM_DATABASE=Phicomm (Shanghai) Co., Ltd.
 
@@ -90992,6 +92255,9 @@ OUI:CCA4AF*
 OUI:CCA614*
  ID_OUI_FROM_DATABASE=AIFA TECHNOLOGY CORP.
 
+OUI:CCA7C1*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:CCAF78*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -91193,6 +92459,9 @@ OUI:CCD3C1*
 OUI:CCD3E2*
  ID_OUI_FROM_DATABASE=Jiangsu Yinhe  Electronics Co.,Ltd.
 
+OUI:CCD42E*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
 OUI:CCD4A1*
  ID_OUI_FROM_DATABASE=MitraStar Technology Corp.
 
@@ -91283,6 +92552,9 @@ OUI:CCF954*
 OUI:CCF957*
  ID_OUI_FROM_DATABASE=u-blox AG
 
+OUI:CCF9E4*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:CCF9E8*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -91310,6 +92582,9 @@ OUI:D0034B*
 OUI:D003DF*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:D003EB*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:D00401*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
@@ -91487,6 +92762,9 @@ OUI:D03DC3*
 OUI:D03E5C*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:D03FAA*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:D041C9*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
@@ -91649,6 +92927,9 @@ OUI:D0634D*
 OUI:D063B4*
  ID_OUI_FROM_DATABASE=SolidRun Ltd.
 
+OUI:D06544*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:D065CA*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -91883,6 +93164,9 @@ OUI:D0B2C4*
 OUI:D0B33F*
  ID_OUI_FROM_DATABASE=Shenzhen TINNO Mobile Technology Corp.
 
+OUI:D0B45D*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:D0B498*
  ID_OUI_FROM_DATABASE=Robert Bosch LLC Automotive Electronics
 
@@ -92018,6 +93302,9 @@ OUI:D0D286*
 OUI:D0D2B0*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:D0D3E0*
+ ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
+
 OUI:D0D3FC*
  ID_OUI_FROM_DATABASE=Mios, Ltd.
 
@@ -92237,6 +93524,9 @@ OUI:D4223F*
 OUI:D4224E*
  ID_OUI_FROM_DATABASE=Alcatel Lucent
 
+OUI:D422CD*
+ ID_OUI_FROM_DATABASE=Xsens Technologies B.V.
+
 OUI:D42493*
  ID_OUI_FROM_DATABASE=GW Technologies Co.,Ltd
 
@@ -92417,6 +93707,9 @@ OUI:D45251*
 OUI:D45297*
  ID_OUI_FROM_DATABASE=nSTREAMS Technologies, Inc.
 
+OUI:D452EE*
+ ID_OUI_FROM_DATABASE=BSkyB Ltd
+
 OUI:D45383*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
@@ -92447,6 +93740,9 @@ OUI:D45D64*
 OUI:D45DDF*
  ID_OUI_FROM_DATABASE=PEGATRON CORPORATION
 
+OUI:D45EEC*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Electronics Co., Ltd.
+
 OUI:D45F25*
  ID_OUI_FROM_DATABASE=Shenzhen YOUHUA Technology Co., Ltd
 
@@ -92651,6 +93947,9 @@ OUI:D4883F*
 OUI:D48890*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:D48A39*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:D48CB5*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -92801,6 +94100,9 @@ OUI:D4B92F*
 OUI:D4BBC8*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:D4BBE6*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:D4BD1E*
  ID_OUI_FROM_DATABASE=5VT Technologies,Taiwan LTd.
 
@@ -92856,7 +94158,7 @@ OUI:D4CF37*
  ID_OUI_FROM_DATABASE=Symbolic IO
 
 OUI:D4CFF9*
- ID_OUI_FROM_DATABASE=Shenzhen Sen5 Technology Co., Ltd.
+ ID_OUI_FROM_DATABASE=Shenzhen SEI Robotics Co.,Ltd
 
 OUI:D4D184*
  ID_OUI_FROM_DATABASE=ADB Broadband Italia
@@ -92867,6 +94169,9 @@ OUI:D4D249*
 OUI:D4D252*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:D4D2D6*
+ ID_OUI_FROM_DATABASE=FN-LINK TECHNOLOGY LIMITED
+
 OUI:D4D2E5*
  ID_OUI_FROM_DATABASE=BKAV Corporation
 
@@ -92885,6 +94190,12 @@ OUI:D4D898*
 OUI:D4D919*
  ID_OUI_FROM_DATABASE=GoPro
 
+OUI:D4DACD*
+ ID_OUI_FROM_DATABASE=BSkyB Ltd
+
+OUI:D4DC09*
+ ID_OUI_FROM_DATABASE=Mist Systems, Inc.
+
 OUI:D4DCCD*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -92978,6 +94289,9 @@ OUI:D8052E*
 OUI:D806D1*
  ID_OUI_FROM_DATABASE=Honeywell Fire System (Shanghai) Co,. Ltd.
 
+OUI:D807B6*
+ ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
+
 OUI:D80831*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -93167,6 +94481,9 @@ OUI:D84606*
 OUI:D84710*
  ID_OUI_FROM_DATABASE=Sichuan Changhong Electric Ltd.
 
+OUI:D84732*
+ ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
+
 OUI:D848EE*
  ID_OUI_FROM_DATABASE=Hangzhou Xueji Technology Co., Ltd.
 
@@ -93182,6 +94499,12 @@ OUI:D84A87*
 OUI:D84B2A*
  ID_OUI_FROM_DATABASE=Cognitas Technologies, Inc.
 
+OUI:D84C90*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
+OUI:D84DB9*
+ ID_OUI_FROM_DATABASE=Wu Qi Technologies,Inc.
+
 OUI:D84FB8*
  ID_OUI_FROM_DATABASE=LG ELECTRONICS
 
@@ -93192,7 +94515,7 @@ OUI:D8543A*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
 OUI:D854A2*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:D85575*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@@ -93224,6 +94547,9 @@ OUI:D85DEF*
 OUI:D85DFB*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:D85F77*
+ ID_OUI_FROM_DATABASE=Telink Semiconductor (Shanghai) Co., Ltd.
+
 OUI:D860B0*
  ID_OUI_FROM_DATABASE=bioMérieux Italia S.p.A.
 
@@ -93467,6 +94793,9 @@ OUI:D8A6FD*
 OUI:D8A756*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:D8A8C8*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:D8A98B*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -93551,6 +94880,9 @@ OUI:D8C497*
 OUI:D8C4E9*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:D8C561*
+ ID_OUI_FROM_DATABASE=CommFront Communications Pte Ltd
+
 OUI:D8C691*
  ID_OUI_FROM_DATABASE=Hichan Technology Corp.
 
@@ -93851,11 +95183,14 @@ OUI:DC31D1*
 OUI:DC330D*
  ID_OUI_FROM_DATABASE=QING DAO HAIER TELECOM CO.,LTD.
 
+OUI:DC333D*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:DC3350*
  ID_OUI_FROM_DATABASE=TechSAT GmbH
 
 OUI:DC35F1*
- ID_OUI_FROM_DATABASE=Positivo Informática SA.
+ ID_OUI_FROM_DATABASE=Positivo Tecnologia S.A.
 
 OUI:DC3714*
  ID_OUI_FROM_DATABASE=Apple, Inc.
@@ -93906,7 +95241,7 @@ OUI:DC44270*
  ID_OUI_FROM_DATABASE=Suritel
 
 OUI:DC44271*
- ID_OUI_FROM_DATABASE=Tesla Motors, Inc
+ ID_OUI_FROM_DATABASE=Tesla,Inc.
 
 OUI:DC44272*
  ID_OUI_FROM_DATABASE=Skywave Technology Co,.Ltd.
@@ -94106,6 +95441,9 @@ OUI:DC9088*
 OUI:DC962C*
  ID_OUI_FROM_DATABASE=NST Audio Ltd
 
+OUI:DC9840*
+ ID_OUI_FROM_DATABASE=Microsoft Corporation
+
 OUI:DC9914*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -94506,7 +95844,7 @@ OUI:E01AEA*
  ID_OUI_FROM_DATABASE=Allied Telesis, Inc.
 
 OUI:E01C41*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:E01CEE*
  ID_OUI_FROM_DATABASE=Bravo Tech, Inc.
@@ -94529,6 +95867,9 @@ OUI:E01F88*
 OUI:E02202*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:E023FF*
+ ID_OUI_FROM_DATABASE=Fortinet, Inc.
+
 OUI:E0247F*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -95096,6 +96437,9 @@ OUI:E0D1E6*
 OUI:E0D31A*
  ID_OUI_FROM_DATABASE=EQUES Technology Co., Limited
 
+OUI:E0D4E8*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:E0D55E*
  ID_OUI_FROM_DATABASE=GIGA-BYTE TECHNOLOGY CO.,LTD.
 
@@ -95132,6 +96476,9 @@ OUI:E0DCFF*
 OUI:E0DDC0*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:E0E0FC*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:E0E5CF*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -95306,6 +96653,9 @@ OUI:E425E7*
 OUI:E425E9*
  ID_OUI_FROM_DATABASE=Color-Chip
 
+OUI:E42686*
+ ID_OUI_FROM_DATABASE=DWnet Technologies(Suzhou) Corporation
+
 OUI:E42771*
  ID_OUI_FROM_DATABASE=Smartlabs
 
@@ -95501,6 +96851,9 @@ OUI:E45D52*
 OUI:E45D75*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:E45E37*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:E46059*
  ID_OUI_FROM_DATABASE=Pingtek Co., Ltd.
 
@@ -95588,6 +96941,9 @@ OUI:E481B3*
 OUI:E482CC*
  ID_OUI_FROM_DATABASE=Jumptronic GmbH
 
+OUI:E48326*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:E48399*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -95618,6 +96974,9 @@ OUI:E49069*
 OUI:E4907E*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
+OUI:E490FD*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:E4922A*
  ID_OUI_FROM_DATABASE=DBG HOLDINGS LIMITED
 
@@ -95861,6 +97220,9 @@ OUI:E4E0A6*
 OUI:E4E0C5*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:E4E112*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:E4E130*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
@@ -95897,6 +97259,9 @@ OUI:E4F327*
 OUI:E4F365*
  ID_OUI_FROM_DATABASE=Time-O-Matic, Inc.
 
+OUI:E4F3C4*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:E4F3E3*
  ID_OUI_FROM_DATABASE=Shanghai iComhome Co.,Ltd.
 
@@ -96578,6 +97943,9 @@ OUI:E8E875*
 OUI:E8E8B7*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
+OUI:E8E98E*
+ ID_OUI_FROM_DATABASE=SOLAR controls s.r.o.
+
 OUI:E8EA6A*
  ID_OUI_FROM_DATABASE=StarTech.com
 
@@ -96746,6 +98114,9 @@ OUI:EC2E4E*
 OUI:EC3091*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:EC316D*
+ ID_OUI_FROM_DATABASE=Hansgrohe
+
 OUI:EC3586*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -96896,6 +98267,9 @@ OUI:EC71DB*
 OUI:EC74BA*
  ID_OUI_FROM_DATABASE=Hirschmann Automation and Control GmbH
 
+OUI:EC7949*
+ ID_OUI_FROM_DATABASE=FUJITSU LIMITED
+
 OUI:EC79F2*
  ID_OUI_FROM_DATABASE=Startel
 
@@ -96983,6 +98357,9 @@ OUI:EC93ED*
 OUI:EC9681*
  ID_OUI_FROM_DATABASE=2276427 Ontario Inc
 
+OUI:EC97B2*
+ ID_OUI_FROM_DATABASE=SUMEC Machinery & Electric Co.,Ltd.
+
 OUI:EC986C*
  ID_OUI_FROM_DATABASE=Lufft Mess- und Regeltechnik GmbH
 
@@ -97280,6 +98657,9 @@ OUI:F0038C*
 OUI:F00786*
  ID_OUI_FROM_DATABASE=Shandong Bittel Electronics Co., Ltd
 
+OUI:F008D1*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:F008F1*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -97298,6 +98678,9 @@ OUI:F00EBF*
 OUI:F00FEC*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:F01090*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:F010AB*
  ID_OUI_FROM_DATABASE=China Mobile (Hangzhou) Information Technology Co., Ltd.
 
@@ -97436,6 +98819,9 @@ OUI:F02FD8*
 OUI:F0321A*
  ID_OUI_FROM_DATABASE=Mita-Teknik A/S
 
+OUI:F033E5*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:F03404*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
@@ -97670,6 +99056,9 @@ OUI:F079E8*
 OUI:F07BCB*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
+OUI:F07CC7*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:F07D68*
  ID_OUI_FROM_DATABASE=D-Link Corporation
 
@@ -97682,6 +99071,9 @@ OUI:F07F0C*
 OUI:F08173*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
+OUI:F08175*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:F081AF*
  ID_OUI_FROM_DATABASE=IRZ AUTOMATION TECHNOLOGIES LTD
 
@@ -97758,7 +99150,7 @@ OUI:F09CD7*
  ID_OUI_FROM_DATABASE=Guangzhou Blue Cheetah Intelligent Technology Co., Ltd.
 
 OUI:F09CE9*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:F09E63*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@@ -98066,6 +99458,9 @@ OUI:F0F644*
 OUI:F0F669*
  ID_OUI_FROM_DATABASE=Motion Analysis Corporation
 
+OUI:F0F6C1*
+ ID_OUI_FROM_DATABASE=Sonos, Inc.
+
 OUI:F0F755*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -98099,6 +99494,9 @@ OUI:F40304*
 OUI:F40321*
  ID_OUI_FROM_DATABASE=BeNeXt B.V.
 
+OUI:F4032A*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:F4032F*
  ID_OUI_FROM_DATABASE=Reduxio Systems
 
@@ -98207,6 +99605,9 @@ OUI:F415FD*
 OUI:F417B8*
  ID_OUI_FROM_DATABASE=AirTies Wireless Networks
 
+OUI:F419E2*
+ ID_OUI_FROM_DATABASE=Volterra
+
 OUI:F41BA1*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -98435,6 +99836,9 @@ OUI:F470AB*
 OUI:F47190*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:F47335*
+ ID_OUI_FROM_DATABASE=Logitech Far East
+
 OUI:F473CA*
  ID_OUI_FROM_DATABASE=Conversion Sound Inc.
 
@@ -98501,12 +99905,39 @@ OUI:F48E92*
 OUI:F490CA*
  ID_OUI_FROM_DATABASE=Tensorcom
 
+OUI:F490CB3*
+ ID_OUI_FROM_DATABASE=Ricker Lyman Robotic
+
+OUI:F490CB4*
+ ID_OUI_FROM_DATABASE=OmniNet
+
+OUI:F490CB5*
+ ID_OUI_FROM_DATABASE=Avilution
+
+OUI:F490CB6*
+ ID_OUI_FROM_DATABASE=Airbeam Wireless Technologies Inc.
+
+OUI:F490CB7*
+ ID_OUI_FROM_DATABASE=TEQ SA
+
+OUI:F490CBB*
+ ID_OUI_FROM_DATABASE=A-dec Inc.
+
+OUI:F490CBC*
+ ID_OUI_FROM_DATABASE=Cheetah Medical
+
+OUI:F490CBD*
+ ID_OUI_FROM_DATABASE=Simavita (Aust) Pty Ltd
+
 OUI:F490EA*
  ID_OUI_FROM_DATABASE=Deciso B.V.
 
 OUI:F4911E*
  ID_OUI_FROM_DATABASE=ZHUHAI EWPE INFORMATION TECHNOLOGY INC
 
+OUI:F492BF*
+ ID_OUI_FROM_DATABASE=Ubiquiti Networks Inc.
+
 OUI:F4939F*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co., Ltd.
 
@@ -98546,6 +99977,9 @@ OUI:F49FF3*
 OUI:F4A294*
  ID_OUI_FROM_DATABASE=EAGLE WORLD DEVELOPMENT CO., LIMITED
 
+OUI:F4A4D6*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:F4A52A*
  ID_OUI_FROM_DATABASE=Hawa Technologies Inc
 
@@ -98594,6 +100028,9 @@ OUI:F4B6E5*
 OUI:F4B72A*
  ID_OUI_FROM_DATABASE=TIME INTERCONNECT LTD
 
+OUI:F4B78D*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:F4B7B3*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -98693,6 +100130,9 @@ OUI:F4D9C6*
 OUI:F4D9FB*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:F4DBE3*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:F4DBE6*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -98751,7 +100191,7 @@ OUI:F4EA67*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
 OUI:F4EAB5*
- ID_OUI_FROM_DATABASE=Aerohive Networks Inc.
+ ID_OUI_FROM_DATABASE=Extreme Networks, Inc.
 
 OUI:F4EB38*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
@@ -99149,6 +100589,9 @@ OUI:F84E73*
 OUI:F84F57*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:F84FAD*
+ ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
+
 OUI:F8501C*
  ID_OUI_FROM_DATABASE=Tianjin Geneuo Technology Co.,Ltd
 
@@ -99470,6 +100913,9 @@ OUI:F8ADCB*
 OUI:F8AE27*
  ID_OUI_FROM_DATABASE=John Deere Electronic Solutions
 
+OUI:F8AF05*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:F8AFDB*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
@@ -99920,6 +101366,9 @@ OUI:FC35E6*
 OUI:FC372B*
  ID_OUI_FROM_DATABASE=SICHUAN TIANYI COMHEART TELECOMCO.,LTD
 
+OUI:FC3964*
+ ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
+
 OUI:FC3CE9*
  ID_OUI_FROM_DATABASE=Tsingtong Technologies Co, Ltd.
 
@@ -100394,6 +101843,9 @@ OUI:FCDD55*
 OUI:FCDE90*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:FCE14F*
+ ID_OUI_FROM_DATABASE=BRK Brands, Inc.
+
 OUI:FCE186*
  ID_OUI_FROM_DATABASE=A3M Co., LTD
 

diff --git a/hwdb.d/20-acpi-vendor.hwdb.patch b/hwdb.d/20-acpi-vendor.hwdb.patch
index 8deb7e57023d51141cae41759c06b8a189762be2..84ea0fd59b72b4ce8e8a54e50ccf72550f6f5375 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   2019-11-29 14:29:51.816965218 +0100
-+++ 20-acpi-vendor.hwdb        2019-11-29 14:29:51.821964280 +0100
+--- 20-acpi-vendor.hwdb.base   2020-02-04 18:26:50.552863816 +0100
++++ 20-acpi-vendor.hwdb        2020-02-04 18:26:50.569863967 +0100
 @@ -3,6 +3,8 @@
  # Data imported from:
  #     https://uefi.org/uefi-pnp-export

diff --git a/hwdb.d/20-pci-vendor-model.hwdb b/hwdb.d/20-pci-vendor-model.hwdb
index 5c328d03826d985febd073ddd20e8047501d0174..495ebb5c7cdb75065d50a124684f3c244fc005ee 100644 (file)
--- a/hwdb.d/20-pci-vendor-model.hwdb
+++ b/hwdb.d/20-pci-vendor-model.hwdb
@@ -1832,6 +1832,12 @@ pci:v00001000d00000097sv00001028sd00001FD3*
 pci:v00001000d00000097sv000015D9sd00000808*
  ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (AOC-S3008L-L8e)
 
+pci:v00001000d00000097sv00001BD4sd0000000B*
+ ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (12G SAS3008IR)
+
+pci:v00001000d00000097sv00001BD4sd0000000C*
+ ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (12G SAS3008IT)
+
 pci:v00001000d00000097sv00001BD4sd00000011*
  ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (Inspur 12Gb 8i-3008 IT SAS HBA)
 
@@ -3329,6 +3335,9 @@ pci:v00001002d00004390sv00001849sd00004390*
 pci:v00001002d00004391*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode]
 
+pci:v00001002d00004391sv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode] (ProLiant MicroServer N36L)
+
 pci:v00001002d00004391sv0000103Csd00001611*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode] (Pavilion DM1Z-3000)
 
@@ -3368,6 +3377,9 @@ pci:v00001002d00004396*
 pci:v00001002d00004396sv00001019sd00002120*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 USB EHCI Controller (A785GM-M)
 
+pci:v00001002d00004396sv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 USB EHCI Controller (ProLiant MicroServer N36L)
+
 pci:v00001002d00004396sv0000103Csd00001611*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 USB EHCI Controller (Pavilion DM1Z-3000)
 
@@ -3392,6 +3404,9 @@ pci:v00001002d00004397*
 pci:v00001002d00004397sv00001019sd00002120*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 USB OHCI0 Controller (A785GM-M)
 
+pci:v00001002d00004397sv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 USB OHCI0 Controller (ProLiant MicroServer N36L)
+
 pci:v00001002d00004397sv0000103Csd00001611*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 USB OHCI0 Controller (Pavilion DM1Z-3000)
 
@@ -3452,6 +3467,9 @@ pci:v00001002d0000439Csv00001002sd00004392*
 pci:v00001002d0000439Csv00001019sd00002120*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 IDE Controller (A785GM-M)
 
+pci:v00001002d0000439Csv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 IDE Controller (ProLiant MicroServer N36L)
+
 pci:v00001002d0000439Csv00001043sd000082EF*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 IDE Controller (M3A78-EH Motherboard)
 
@@ -3464,6 +3482,9 @@ pci:v00001002d0000439D*
 pci:v00001002d0000439Dsv00001019sd00002120*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 LPC host controller (A785GM-M)
 
+pci:v00001002d0000439Dsv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 LPC host controller (ProLiant MicroServer N36L)
+
 pci:v00001002d0000439Dsv0000103Csd00001611*
  ID_MODEL_FROM_DATABASE=SB7x0/SB8x0/SB9x0 LPC host controller (Pavilion DM1Z-3000)
 
@@ -7496,6 +7517,9 @@ pci:v00001002d000067DFsv00001787sd0000A480*
 pci:v00001002d000067DFsv00001849sd00005001*
  ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Phantom Gaming X RX 580 OC)
 
+pci:v00001002d000067DFsv00001849sd00005030*
+ ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Phantom Gaming D Radeon RX580 8G OC)
+
 pci:v00001002d000067DFsv00001DA2sd0000E353*
  ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Radeon RX 570 Pulse 4GB)
 
@@ -10307,11 +10331,23 @@ pci:v00001002d00007300sv0000174Bsd0000E329*
 pci:v00001002d00007310*
  ID_MODEL_FROM_DATABASE=Navi 10
 
+pci:v00001002d00007312*
+ ID_MODEL_FROM_DATABASE=Navi 10 [Radeon Pro W5700]
+
 pci:v00001002d0000731F*
- ID_MODEL_FROM_DATABASE=Navi 10 [Radeon RX 5700 / 5700 XT]
+ ID_MODEL_FROM_DATABASE=Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]
 
 pci:v00001002d00007340*
- ID_MODEL_FROM_DATABASE=Navi 14 [Radeon RX 5500 / 5500M]
+ ID_MODEL_FROM_DATABASE=Navi 14 [Radeon RX 5500/5500M / Pro 5500M]
+
+pci:v00001002d00007341*
+ ID_MODEL_FROM_DATABASE=Navi 14 [Radeon Pro W5500]
+
+pci:v00001002d00007347*
+ ID_MODEL_FROM_DATABASE=Navi 14 [Radeon Pro W5500M]
+
+pci:v00001002d0000734F*
+ ID_MODEL_FROM_DATABASE=Navi 14 [Radeon Pro W5300M]
 
 pci:v00001002d00007833*
  ID_MODEL_FROM_DATABASE=RS350 Host Bridge
@@ -11003,6 +11039,9 @@ pci:v00001002d00009710sv00001043sd000083A2*
 pci:v00001002d00009712*
  ID_MODEL_FROM_DATABASE=RS880M [Mobility Radeon HD 4225/4250]
 
+pci:v00001002d00009712sv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=RS880M [Mobility Radeon HD 4225/4250] (ProLiant MicroServer N36L)
+
 pci:v00001002d00009713*
  ID_MODEL_FROM_DATABASE=RS880M [Mobility Radeon HD 4100]
 
@@ -11054,6 +11093,9 @@ pci:v00001002d00009831*
 pci:v00001002d00009832*
  ID_MODEL_FROM_DATABASE=Kabini [Radeon HD 8330]
 
+pci:v00001002d00009832sv00001849sd00009832*
+ ID_MODEL_FROM_DATABASE=Kabini [Radeon HD 8330] (QC5000-ITX/PH)
+
 pci:v00001002d00009833*
  ID_MODEL_FROM_DATABASE=Kabini [Radeon HD 8330E]
 
@@ -11081,6 +11123,9 @@ pci:v00001002d0000983D*
 pci:v00001002d00009840*
  ID_MODEL_FROM_DATABASE=Kabini HDMI/DP Audio
 
+pci:v00001002d00009840sv00001849sd00009840*
+ ID_MODEL_FROM_DATABASE=Kabini HDMI/DP Audio (QC5000-ITX/PH)
+
 pci:v00001002d00009850*
  ID_MODEL_FROM_DATABASE=Mullins [Radeon R3 Graphics]
 
@@ -13367,6 +13412,9 @@ pci:v00001022d00001468*
 pci:v00001022d00001480*
  ID_MODEL_FROM_DATABASE=Starship/Matisse Root Complex
 
+pci:v00001022d00001480sv00001462sd00007C37*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse Root Complex (X570-A PRO motherboard)
+
 pci:v00001022d00001481*
  ID_MODEL_FROM_DATABASE=Starship/Matisse IOMMU
 
@@ -13388,6 +13436,9 @@ pci:v00001022d00001486*
 pci:v00001022d00001487*
  ID_MODEL_FROM_DATABASE=Starship/Matisse HD Audio Controller
 
+pci:v00001022d00001487sv00001462sd00009C37*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse HD Audio Controller (X570-A PRO motherboard)
+
 pci:v00001022d00001488*
  ID_MODEL_FROM_DATABASE=Starship Reserved SSP
 
@@ -13451,6 +13502,9 @@ pci:v00001022d0000149B*
 pci:v00001022d0000149C*
  ID_MODEL_FROM_DATABASE=Matisse USB 3.0 Host Controller
 
+pci:v00001022d0000149Csv00001462sd00007C37*
+ ID_MODEL_FROM_DATABASE=Matisse USB 3.0 Host Controller (X570-A PRO motherboard)
+
 pci:v00001022d00001510*
  ID_MODEL_FROM_DATABASE=Family 14h Processor Root Complex
 
@@ -13493,6 +13547,9 @@ pci:v00001022d00001535*
 pci:v00001022d00001536*
  ID_MODEL_FROM_DATABASE=Family 16h Processor Root Complex
 
+pci:v00001022d00001536sv00001849sd00001536*
+ ID_MODEL_FROM_DATABASE=Family 16h Processor Root Complex (QC5000-ITX/PH)
+
 pci:v00001022d00001537*
  ID_MODEL_FROM_DATABASE=Kabini/Mullins PSP-Platform Security Processor
 
@@ -14195,6 +14252,15 @@ pci:v00001022d000043C8*
 pci:v00001022d000043D5*
  ID_MODEL_FROM_DATABASE=400 Series Chipset USB 3.1 XHCI Controller
 
+pci:v00001022d000057A3*
+ ID_MODEL_FROM_DATABASE=Matisse PCIe GPP Bridge
+
+pci:v00001022d000057A4*
+ ID_MODEL_FROM_DATABASE=Matisse PCIe GPP Bridge
+
+pci:v00001022d000057AD*
+ ID_MODEL_FROM_DATABASE=Matisse Switch Upstream
+
 pci:v00001022d00007006*
  ID_MODEL_FROM_DATABASE=AMD-751 [Irongate] System Controller
 
@@ -14369,6 +14435,9 @@ pci:v00001022d00007801sv0000103Csd0000168B*
 pci:v00001022d00007801sv0000103Csd0000194E*
  ID_MODEL_FROM_DATABASE=FCH SATA Controller [AHCI mode] (ProBook 455 G1 Notebook)
 
+pci:v00001022d00007801sv00001849sd00007801*
+ ID_MODEL_FROM_DATABASE=FCH SATA Controller [AHCI mode] (QC5000-ITX/PH)
+
 pci:v00001022d00007802*
  ID_MODEL_FROM_DATABASE=FCH SATA Controller [RAID mode]
 
@@ -14396,6 +14465,9 @@ pci:v00001022d00007807sv0000103Csd0000194E*
 pci:v00001022d00007807sv0000103Csd00001985*
  ID_MODEL_FROM_DATABASE=FCH USB OHCI Controller (Pavilion 17-e163sg Notebook PC)
 
+pci:v00001022d00007807sv00001849sd00007807*
+ ID_MODEL_FROM_DATABASE=FCH USB OHCI Controller (QC5000-ITX/PH)
+
 pci:v00001022d00007808*
  ID_MODEL_FROM_DATABASE=FCH USB EHCI Controller
 
@@ -14405,6 +14477,9 @@ pci:v00001022d00007808sv0000103Csd0000194E*
 pci:v00001022d00007808sv0000103Csd00001985*
  ID_MODEL_FROM_DATABASE=FCH USB EHCI Controller (Pavilion 17-e163sg Notebook PC)
 
+pci:v00001022d00007808sv00001849sd00007808*
+ ID_MODEL_FROM_DATABASE=FCH USB EHCI Controller (QC5000-ITX/PH)
+
 pci:v00001022d00007809*
  ID_MODEL_FROM_DATABASE=FCH USB OHCI Controller
 
@@ -14423,6 +14498,9 @@ pci:v00001022d0000780Bsv0000103Csd0000194E*
 pci:v00001022d0000780Bsv0000103Csd00001985*
  ID_MODEL_FROM_DATABASE=FCH SMBus Controller (Pavilion 17-e163sg Notebook PC)
 
+pci:v00001022d0000780Bsv00001849sd0000780B*
+ ID_MODEL_FROM_DATABASE=FCH SMBus Controller (QC5000-ITX/PH)
+
 pci:v00001022d0000780C*
  ID_MODEL_FROM_DATABASE=FCH IDE Controller
 
@@ -14438,6 +14516,9 @@ pci:v00001022d0000780Dsv0000103Csd00001985*
 pci:v00001022d0000780Dsv00001043sd00008444*
  ID_MODEL_FROM_DATABASE=FCH Azalia Controller (F2A85-M Series)
 
+pci:v00001022d0000780Dsv00001849sd00008892*
+ ID_MODEL_FROM_DATABASE=FCH Azalia Controller (QC5000-ITX/PH)
+
 pci:v00001022d0000780E*
  ID_MODEL_FROM_DATABASE=FCH LPC Bridge
 
@@ -14447,6 +14528,9 @@ pci:v00001022d0000780Esv0000103Csd0000194E*
 pci:v00001022d0000780Esv0000103Csd00001985*
  ID_MODEL_FROM_DATABASE=FCH LPC Bridge (Pavilion 17-e163sg Notebook PC)
 
+pci:v00001022d0000780Esv00001849sd0000780E*
+ ID_MODEL_FROM_DATABASE=FCH LPC Bridge (QC5000-ITX/PH)
+
 pci:v00001022d0000780F*
  ID_MODEL_FROM_DATABASE=FCH PCI Bridge
 
@@ -14465,6 +14549,9 @@ pci:v00001022d00007814sv0000103Csd0000194E*
 pci:v00001022d00007814sv0000103Csd00001985*
  ID_MODEL_FROM_DATABASE=FCH USB XHCI Controller (Pavilion 17-e163sg Notebook PC)
 
+pci:v00001022d00007814sv00001849sd00007814*
+ ID_MODEL_FROM_DATABASE=FCH USB XHCI Controller (QC5000-ITX/PH)
+
 pci:v00001022d00007900*
  ID_MODEL_FROM_DATABASE=FCH SATA Controller [IDE mode]
 
@@ -14474,6 +14561,9 @@ pci:v00001022d00007901*
 pci:v00001022d00007901sv0000103Csd00008615*
  ID_MODEL_FROM_DATABASE=FCH SATA Controller [AHCI mode] (Pavilion Laptop 15-cw1xxx)
 
+pci:v00001022d00007901sv00001462sd00007C37*
+ ID_MODEL_FROM_DATABASE=FCH SATA Controller [AHCI mode] (X570-A PRO motherboard)
+
 pci:v00001022d00007902*
  ID_MODEL_FROM_DATABASE=FCH SATA Controller [RAID mode]
 
@@ -14495,12 +14585,18 @@ pci:v00001022d0000790B*
 pci:v00001022d0000790Bsv0000103Csd00008615*
  ID_MODEL_FROM_DATABASE=FCH SMBus Controller (Pavilion Laptop 15-cw1xxx)
 
+pci:v00001022d0000790Bsv00001462sd00007C37*
+ ID_MODEL_FROM_DATABASE=FCH SMBus Controller (X570-A PRO motherboard)
+
 pci:v00001022d0000790E*
  ID_MODEL_FROM_DATABASE=FCH LPC Bridge
 
 pci:v00001022d0000790Esv0000103Csd00008615*
  ID_MODEL_FROM_DATABASE=FCH LPC Bridge (Pavilion Laptop 15-cw1xxx)
 
+pci:v00001022d0000790Esv00001462sd00007C37*
+ ID_MODEL_FROM_DATABASE=FCH LPC Bridge (X570-A PRO motherboard)
+
 pci:v00001022d0000790F*
  ID_MODEL_FROM_DATABASE=FCH PCI Bridge
 
@@ -14522,6 +14618,9 @@ pci:v00001022d00009601*
 pci:v00001022d00009601sv00001019sd00002120*
  ID_MODEL_FROM_DATABASE=RS880 Host Bridge (A785GM-M)
 
+pci:v00001022d00009601sv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=RS880 Host Bridge (ProLiant MicroServer N36L)
+
 pci:v00001022d00009601sv00001043sd000083A2*
  ID_MODEL_FROM_DATABASE=RS880 Host Bridge (M4A785-M Mainboard)
 
@@ -14534,6 +14633,9 @@ pci:v00001022d00009602*
 pci:v00001022d00009603*
  ID_MODEL_FROM_DATABASE=RS780 PCI to PCI bridge (ext gfx port 0)
 
+pci:v00001022d00009603sv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=RS780 PCI to PCI bridge (ext gfx port 0) (ProLiant MicroServer N36L)
+
 pci:v00001022d00009604*
  ID_MODEL_FROM_DATABASE=RS780/RS880 PCI to PCI bridge (PCIE port 0)
 
@@ -14543,6 +14645,9 @@ pci:v00001022d00009605*
 pci:v00001022d00009606*
  ID_MODEL_FROM_DATABASE=RS780 PCI to PCI bridge (PCIE port 2)
 
+pci:v00001022d00009606sv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=RS780 PCI to PCI bridge (PCIE port 2) (ProLiant MicroServer N36L)
+
 pci:v00001022d00009607*
  ID_MODEL_FROM_DATABASE=RS780/RS880 PCI to PCI bridge (PCIE port 3)
 
@@ -17384,6 +17489,9 @@ pci:v0000103Cd00004037*
 pci:v0000103Cd00009602*
  ID_MODEL_FROM_DATABASE=AMD RS780/RS880 PCI to PCI bridge (int gfx)
 
+pci:v0000103Cd00009602sv0000103Csd00001609*
+ ID_MODEL_FROM_DATABASE=AMD RS780/RS880 PCI to PCI bridge (int gfx) (ProLiant MicroServer N36L)
+
 pci:v0000103E*
  ID_VENDOR_FROM_DATABASE=Solliday Engineering
 
@@ -20639,6 +20747,27 @@ pci:v00001077d00008070sv00001077sd00000056*
 pci:v00001077d00008070sv00001077sd00000057*
  ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (2x25GE QL41232HxCU NIC)
 
+pci:v00001077d00008070sv00001077sd00000068*
+ ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (10GbE 2p SFP+ QL41132HLCU-HC Adapter)
+
+pci:v00001077d00008070sv00001077sd00000069*
+ ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (10GbE 2p BASE-T QL41132HQRJ-HC OCP3 Adapter)
+
+pci:v00001077d00008070sv00001077sd00000070*
+ ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (10GbE 2p BASE-T QL41132HLRJ-HC Adapter)
+
+pci:v00001077d00008070sv00001077sd00000071*
+ ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (10GbE 2p SFP+ QL41132HQCU-HC OCP3 Adapter)
+
+pci:v00001077d00008070sv00001077sd00000072*
+ ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (10GbE 4p SFP+ QL41134HLCU-HC Adapter)
+
+pci:v00001077d00008070sv00001077sd00000073*
+ ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (10/25GbE 2p SFP28 QL41232HQCU-HC OCP3 Adapter)
+
+pci:v00001077d00008070sv00001077sd00000074*
+ ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (10/25GbE 2p SFP28 QL41232HLCU-HC Adapter)
+
 pci:v00001077d00008070sv00001590sd0000021A*
  ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (10GbE 2P QL41162HLRJ-HP Adapter)
 
@@ -32813,6 +32942,9 @@ pci:v000010DEd000010F1*
 pci:v000010DEd000010F7*
  ID_MODEL_FROM_DATABASE=TU102 High Definition Audio Controller
 
+pci:v000010DEd000010F8*
+ ID_MODEL_FROM_DATABASE=TU104 HD Audio Controller
+
 pci:v000010DEd000010F9*
  ID_MODEL_FROM_DATABASE=TU106 High Definition Audio Controller
 
@@ -34700,6 +34832,9 @@ pci:v000010DEd00001ADBsv00001043sd00008673*
 pci:v000010DEd00001AEB*
  ID_MODEL_FROM_DATABASE=TU116 High Definition Audio Controller
 
+pci:v000010DEd00001AED*
+ ID_MODEL_FROM_DATABASE=TU116 [GeForce GTX 1650 SUPER]
+
 pci:v000010DEd00001B00*
  ID_MODEL_FROM_DATABASE=GP102 [TITAN X]
 
@@ -34883,6 +35018,9 @@ pci:v000010DEd00001C2D*
 pci:v000010DEd00001C30*
  ID_MODEL_FROM_DATABASE=GP106GL [Quadro P2000]
 
+pci:v000010DEd00001C31*
+ ID_MODEL_FROM_DATABASE=GP106GL [Quadro P2200]
+
 pci:v000010DEd00001C35*
  ID_MODEL_FROM_DATABASE=GP106
 
@@ -34907,6 +35045,12 @@ pci:v000010DEd00001C81*
 pci:v000010DEd00001C82*
  ID_MODEL_FROM_DATABASE=GP107 [GeForce GTX 1050 Ti]
 
+pci:v000010DEd00001C82sv00001043sd00008613*
+ ID_MODEL_FROM_DATABASE=GP107 [GeForce GTX 1050 Ti] (PH-GTX1050TI-4G)
+
+pci:v000010DEd00001C82sv00001458sd00003763*
+ ID_MODEL_FROM_DATABASE=GP107 [GeForce GTX 1050 Ti] (GV-N105TOC-4GD)
+
 pci:v000010DEd00001C83*
  ID_MODEL_FROM_DATABASE=GP107 [GeForce GTX 1050 3GB]
 
@@ -34931,6 +35075,9 @@ pci:v000010DEd00001C91*
 pci:v000010DEd00001C92*
  ID_MODEL_FROM_DATABASE=GP107M [GeForce GTX 1050 Mobile]
 
+pci:v000010DEd00001C94*
+ ID_MODEL_FROM_DATABASE=GP107M [GeForce MX350]
+
 pci:v000010DEd00001CA7*
  ID_MODEL_FROM_DATABASE=GP107GL
 
@@ -34979,6 +35126,9 @@ pci:v000010DEd00001CBBsv0000103Csd00008451*
 pci:v000010DEd00001CBC*
  ID_MODEL_FROM_DATABASE=GP107GLM [Quadro P600 Mobile]
 
+pci:v000010DEd00001CBD*
+ ID_MODEL_FROM_DATABASE=GP107GLM [Quadro P620]
+
 pci:v000010DEd00001CCC*
  ID_MODEL_FROM_DATABASE=GP107BM [GeForce GTX 1050 Ti Mobile]
 
@@ -35006,9 +35156,15 @@ pci:v000010DEd00001D12sv00001D72sd00001701*
 pci:v000010DEd00001D13*
  ID_MODEL_FROM_DATABASE=GP108M [GeForce MX250]
 
+pci:v000010DEd00001D16*
+ ID_MODEL_FROM_DATABASE=GP108M [GeForce MX330]
+
 pci:v000010DEd00001D33*
  ID_MODEL_FROM_DATABASE=GP108GLM [Quadro P500 Mobile]
 
+pci:v000010DEd00001D34*
+ ID_MODEL_FROM_DATABASE=GP108GLM [Quadro P520]
+
 pci:v000010DEd00001D52*
  ID_MODEL_FROM_DATABASE=GP108BM [GeForce MX250]
 
@@ -35019,7 +35175,7 @@ pci:v000010DEd00001DB1*
  ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 SXM2 16GB]
 
 pci:v000010DEd00001DB2*
- ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100-DGXS-16GB]
+ ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 DGXS 16GB]
 
 pci:v000010DEd00001DB3*
  ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 FHHL 16GB]
@@ -35036,12 +35192,24 @@ pci:v000010DEd00001DB6*
 pci:v000010DEd00001DB7*
  ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 DGXS 32GB]
 
+pci:v000010DEd00001DB8*
+ ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 SXM3 32GB]
+
+pci:v000010DEd00001DB8sv000010DEsd0000131D*
+ ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 SXM3 32GB] (Tesla V100-SXM3-32GB-H)
+
 pci:v000010DEd00001DBA*
  ID_MODEL_FROM_DATABASE=GV100GL [Quadro GV100]
 
 pci:v000010DEd00001DBAsv000010DEsd000012EB*
  ID_MODEL_FROM_DATABASE=GV100GL [Quadro GV100] (TITAN V CEO Edition)
 
+pci:v000010DEd00001DF5*
+ ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 SXM2 16GB]
+
+pci:v000010DEd00001DF6*
+ ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100S PCIe 32GB]
+
 pci:v000010DEd00001E02*
  ID_MODEL_FROM_DATABASE=TU102 [TITAN RTX]
 
@@ -35081,6 +35249,15 @@ pci:v000010DEd00001E3D*
 pci:v000010DEd00001E3E*
  ID_MODEL_FROM_DATABASE=TU102GL
 
+pci:v000010DEd00001E78*
+ ID_MODEL_FROM_DATABASE=TU102GL [Quadro RTX 6000/8000]
+
+pci:v000010DEd00001E78sv000010DEsd000013D8*
+ ID_MODEL_FROM_DATABASE=TU102GL [Quadro RTX 6000/8000] (Quadro RTX 8000)
+
+pci:v000010DEd00001E78sv000010DEsd000013D9*
+ ID_MODEL_FROM_DATABASE=TU102GL [Quadro RTX 6000/8000] (Quadro RTX 6000)
+
 pci:v000010DEd00001E81*
  ID_MODEL_FROM_DATABASE=TU104 [GeForce RTX 2080 SUPER]
 
@@ -35093,6 +35270,9 @@ pci:v000010DEd00001E84*
 pci:v000010DEd00001E87*
  ID_MODEL_FROM_DATABASE=TU104 [GeForce RTX 2080 Rev. A]
 
+pci:v000010DEd00001E89*
+ ID_MODEL_FROM_DATABASE=TU104 [GeForce RTX 2060]
+
 pci:v000010DEd00001E90*
  ID_MODEL_FROM_DATABASE=TU104M [GeForce RTX 2080 Mobile]
 
@@ -35123,6 +35303,12 @@ pci:v000010DEd00001EB9*
 pci:v000010DEd00001EBE*
  ID_MODEL_FROM_DATABASE=TU104GL
 
+pci:v000010DEd00001EC2*
+ ID_MODEL_FROM_DATABASE=TU104 [GeForce RTX 2070 SUPER]
+
+pci:v000010DEd00001EC7*
+ ID_MODEL_FROM_DATABASE=TU104 [GeForce RTX 2070 SUPER]
+
 pci:v000010DEd00001ED0*
  ID_MODEL_FROM_DATABASE=TU104BM [GeForce RTX 2080 Mobile]
 
@@ -35156,6 +35342,12 @@ pci:v000010DEd00001F2E*
 pci:v000010DEd00001F36*
  ID_MODEL_FROM_DATABASE=TU106GLM [Quadro RTX 3000 Mobile / Max-Q]
 
+pci:v000010DEd00001F42*
+ ID_MODEL_FROM_DATABASE=TU106 [GeForce RTX 2060 SUPER]
+
+pci:v000010DEd00001F47*
+ ID_MODEL_FROM_DATABASE=TU106 [GeForce RTX 2060 SUPER]
+
 pci:v000010DEd00001F50*
  ID_MODEL_FROM_DATABASE=TU106BM [GeForce RTX 2070 Mobile]
 
@@ -35168,9 +35360,15 @@ pci:v000010DEd00001F81*
 pci:v000010DEd00001F82*
  ID_MODEL_FROM_DATABASE=TU117 [GeForce GTX 1650]
 
+pci:v000010DEd00001F91*
+ ID_MODEL_FROM_DATABASE=TU117M [GeForce GTX 1650 Mobile / Max-Q]
+
 pci:v000010DEd00001F92*
  ID_MODEL_FROM_DATABASE=TU117M [GeForce GTX 1650 Mobile]
 
+pci:v000010DEd00001F96*
+ ID_MODEL_FROM_DATABASE=TU117M [GeForce GTX 1650 Mobile / Max-Q]
+
 pci:v000010DEd00001FAE*
  ID_MODEL_FROM_DATABASE=TU117GL
 
@@ -35192,6 +35390,9 @@ pci:v000010DEd00002183*
 pci:v000010DEd00002184*
  ID_MODEL_FROM_DATABASE=TU116 [GeForce GTX 1660]
 
+pci:v000010DEd00002187*
+ ID_MODEL_FROM_DATABASE=TU116 [GeForce GTX 1650 SUPER]
+
 pci:v000010DEd00002191*
  ID_MODEL_FROM_DATABASE=TU116M [GeForce GTX 1660 Ti Mobile]
 
@@ -35201,6 +35402,9 @@ pci:v000010DEd000021AE*
 pci:v000010DEd000021BF*
  ID_MODEL_FROM_DATABASE=TU116GL
 
+pci:v000010DEd000021C4*
+ ID_MODEL_FROM_DATABASE=TU116 [GeForce GTX 1660 SUPER]
+
 pci:v000010DEd000021D1*
  ID_MODEL_FROM_DATABASE=TU116BM [GeForce GTX 1660 Ti Mobile]
 
@@ -35967,7 +36171,7 @@ pci:v000010ECd00008139sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=RTL-8100/8101L/8139 PCI Fast Ethernet Adapter (Presario C700)
 
 pci:v000010ECd00008139sv00001043sd00001045*
- ID_MODEL_FROM_DATABASE=RTL-8100/8101L/8139 PCI Fast Ethernet Adapter (L8400B or L3C/S notebook)
+ ID_MODEL_FROM_DATABASE=RTL-8100/8101L/8139 PCI Fast Ethernet Adapter (L8400B, L3C/S, X58LE notebook)
 
 pci:v000010ECd00008139sv00001043sd00008109*
  ID_MODEL_FROM_DATABASE=RTL-8100/8101L/8139 PCI Fast Ethernet Adapter (P5P800-MX Mainboard)
@@ -36191,6 +36395,9 @@ pci:v000010ECd00008168sv00001462sd00004180*
 pci:v000010ECd00008168sv00001462sd00007522*
  ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (X58 Pro-E)
 
+pci:v000010ECd00008168sv00001462sd00007C37*
+ ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (X570-A PRO motherboard)
+
 pci:v000010ECd00008168sv00001775sd000011CC*
  ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (CC11/CL11)
 
@@ -36353,6 +36560,9 @@ pci:v000010ECd0000B822sv0000103Csd0000831B*
 pci:v000010ECd0000C821*
  ID_MODEL_FROM_DATABASE=RTL8821CE 802.11ac PCIe Wireless Network Adapter
 
+pci:v000010ECd0000C822*
+ ID_MODEL_FROM_DATABASE=RTL8822CE 802.11ac PCIe Wireless Network Adapter
+
 pci:v000010ECd0000D723*
  ID_MODEL_FROM_DATABASE=RTL8723DE 802.11b/g/n PCIe Adapter
 
@@ -41256,61 +41466,64 @@ pci:v00001148d00004300sv00001259sd00002977*
  ID_MODEL_FROM_DATABASE=SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link) (AT-2970TX/2TX Gigabit Ethernet Adapter)
 
 pci:v00001148d00004320*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001]
 
 pci:v00001148d00004320sv00001148sd00000121*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8001 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8001 Adapter)
 
 pci:v00001148d00004320sv00001148sd00000221*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8002 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8002 Adapter)
 
 pci:v00001148d00004320sv00001148sd00000321*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8003 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8003 Adapter)
 
 pci:v00001148d00004320sv00001148sd00000421*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8004 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8004 Adapter)
 
 pci:v00001148d00004320sv00001148sd00000621*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8006 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8006 Adapter)
 
 pci:v00001148d00004320sv00001148sd00000721*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8007 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8007 Adapter)
 
 pci:v00001148d00004320sv00001148sd00000821*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8008 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8008 Adapter)
 
 pci:v00001148d00004320sv00001148sd00000921*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8009 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8009 Adapter)
 
 pci:v00001148d00004320sv00001148sd00001121*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8011 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8011 Adapter)
 
 pci:v00001148d00004320sv00001148sd00001221*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (Marvell RDK-8012 Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (Marvell RDK-8012 Adapter)
 
 pci:v00001148d00004320sv00001148sd00003221*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (SK-9521 V2.0 10/100/1000Base-T Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (SK-9521 V2.0 10/100/1000Base-T Adapter)
 
 pci:v00001148d00004320sv00001148sd00005021*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter)
 
 pci:v00001148d00004320sv00001148sd00005041*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter)
 
 pci:v00001148d00004320sv00001148sd00005043*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter)
 
 pci:v00001148d00004320sv00001148sd00005051*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter)
 
 pci:v00001148d00004320sv00001148sd00005061*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter)
 
 pci:v00001148d00004320sv00001148sd00005071*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter)
 
 pci:v00001148d00004320sv00001148sd00009521*
- ID_MODEL_FROM_DATABASE=SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC (SK-9521 10/100/1000Base-T Adapter)
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (SK-9521 10/100/1000Base-T Adapter)
+
+pci:v00001148d00004320sv00001259sd00002916*
+ ID_MODEL_FROM_DATABASE=SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001] (AT-2916T)
 
 pci:v00001148d00004400*
  ID_MODEL_FROM_DATABASE=SK-9Dxx Gigabit Ethernet Adapter
@@ -41319,7 +41532,46 @@ pci:v00001148d00004500*
  ID_MODEL_FROM_DATABASE=SK-9Mxx Gigabit Ethernet Adapter
 
 pci:v00001148d00009000*
- ID_MODEL_FROM_DATABASE=SK-9S21 10/100/1000Base-T Server Adapter, PCI-X, Copper RJ-45
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022]
+
+pci:v00001148d00009000sv00001148sd00002100*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (SK-9S21 10/100/1000Base-T Server Adapter, PCI-X, Copper RJ-45)
+
+pci:v00001148d00009000sv00001148sd00002200*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (SK-9S22 10/100/1000Base-T Dual Port Server Adapter, PCI-X, 2 Copper RJ-45)
+
+pci:v00001148d00009000sv00001148sd00002210*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (SK-9P22 10/100/1000 Base-T Dual Port PMC card)
+
+pci:v00001148d00009000sv00001148sd00002220*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (TPMC-GBE-CO)
+
+pci:v00001148d00009000sv00001148sd00008100*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (SK-9S81 1000Base-SX Server Adapter,PCI-X, Fiber SX/LC)
+
+pci:v00001148d00009000sv00001148sd00008200*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (SK-9S82 1000Base-SX Dual Port Server Adapter, PCI-X, 2 Fiber SX/LC)
+
+pci:v00001148d00009000sv00001148sd00008210*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (SK-9P82 1000 Base-SX Dual Port PMC card)
+
+pci:v00001148d00009000sv00001148sd00008220*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (TPMC-GBE-FI)
+
+pci:v00001148d00009000sv00001148sd00009100*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (SK-9S91 1000Base-LX Server Adapter,PCI-X, Fiber LX/LC)
+
+pci:v00001148d00009000sv00001148sd00009200*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (SK-9S92 1000Base-LX Dual Port Server Adapter, PCI-X, 2 Fiber LX/LC)
+
+pci:v00001148d00009000sv00001259sd00002973*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (AT-2971SX v2 Gigabit Adapter)
+
+pci:v00001148d00009000sv00001259sd00002974*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (AT-2971T v2 Gigabit Adapter)
+
+pci:v00001148d00009000sv00001259sd00002978*
+ ID_MODEL_FROM_DATABASE=SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022] (AT-2971LX Gigabit Adapter)
 
 pci:v00001148d00009843*
  ID_MODEL_FROM_DATABASE=[Fujitsu] Gigabit Ethernet
@@ -42416,6 +42668,9 @@ pci:v00001180d00000476sv0000103Csd000030C0*
 pci:v00001180d00000476sv0000103Csd000030C1*
  ID_MODEL_FROM_DATABASE=RL5c476 II (Compaq 6910p)
 
+pci:v00001180d00000476sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=RL5c476 II (X58LE)
+
 pci:v00001180d00000476sv00001043sd00001237*
  ID_MODEL_FROM_DATABASE=RL5c476 II (A6J-Q008)
 
@@ -42548,6 +42803,9 @@ pci:v00001180d00000592sv0000103Csd000030CC*
 pci:v00001180d00000592sv0000103Csd000030CF*
  ID_MODEL_FROM_DATABASE=R5C592 Memory Stick Bus Host Adapter (Pavilion dv95xx/96xx/97xx/98xx series)
 
+pci:v00001180d00000592sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=R5C592 Memory Stick Bus Host Adapter (X58LE)
+
 pci:v00001180d00000592sv00001043sd00001237*
  ID_MODEL_FROM_DATABASE=R5C592 Memory Stick Bus Host Adapter (A6J-Q008)
 
@@ -42608,6 +42866,9 @@ pci:v00001180d00000822sv0000103Csd000030CC*
 pci:v00001180d00000822sv0000103Csd000030CF*
  ID_MODEL_FROM_DATABASE=R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter (Pavilion dv9668eg Laptop)
 
+pci:v00001180d00000822sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter (X58LE)
+
 pci:v00001180d00000822sv00001043sd00001237*
  ID_MODEL_FROM_DATABASE=R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter (A6J-Q008)
 
@@ -42701,6 +42962,9 @@ pci:v00001180d00000843sv0000103Csd000030B7*
 pci:v00001180d00000843sv0000103Csd000030CF*
  ID_MODEL_FROM_DATABASE=R5C843 MMC Host Controller (Pavilion dv9500/9600/9700 series)
 
+pci:v00001180d00000843sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=R5C843 MMC Host Controller (X58LE)
+
 pci:v00001180d00000843sv00001183sd00000843*
  ID_MODEL_FROM_DATABASE=R5C843 MMC Host Controller (Alienware Aurora m9700)
 
@@ -43712,6 +43976,12 @@ pci:v000011ABd00004380*
 pci:v000011ABd00004381*
  ID_MODEL_FROM_DATABASE=Yukon Optima 88E8059 [PCIe Gigabit Ethernet Controller with AVB]
 
+pci:v000011ABd00004381sv00001259sd00002803*
+ ID_MODEL_FROM_DATABASE=Yukon Optima 88E8059 [PCIe Gigabit Ethernet Controller with AVB] (AT-2814FX)
+
+pci:v000011ABd00004381sv00001259sd00002804*
+ ID_MODEL_FROM_DATABASE=Yukon Optima 88E8059 [PCIe Gigabit Ethernet Controller with AVB] (AT-2874xx)
+
 pci:v000011ABd00004611*
  ID_MODEL_FROM_DATABASE=GT-64115 System Controller
 
@@ -45531,7 +45801,7 @@ pci:v00001225*
  ID_VENDOR_FROM_DATABASE=Power I/O, Inc.
 
 pci:v00001227*
- ID_VENDOR_FROM_DATABASE=Tech-Source
+ ID_VENDOR_FROM_DATABASE=EIZO Rugged Solutions
 
 pci:v00001227d00000006*
  ID_MODEL_FROM_DATABASE=Raptor GFX 8P
@@ -54614,6 +54884,9 @@ pci:v000014E4d0000165F*
 pci:v000014E4d0000165Fsv00001028sd000004F7*
  ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (PowerEdge R320 server)
 
+pci:v000014E4d0000165Fsv00001028sd000008FD*
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (PowerEdge R6515/R7515 LOM)
+
 pci:v000014E4d0000165Fsv00001028sd000008FF*
  ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (PowerEdge Rx5xx LOM Board)
 
@@ -56102,6 +56375,9 @@ pci:v000014E4d00004432*
 pci:v000014E4d00004464*
  ID_MODEL_FROM_DATABASE=BCM4364 802.11ac Wireless Network Adapter
 
+pci:v000014E4d00004488*
+ ID_MODEL_FROM_DATABASE=BCM4377b Wireless Network Adapter
+
 pci:v000014E4d00004610*
  ID_MODEL_FROM_DATABASE=BCM4610 Sentry5 PCI to SB Bridge
 
@@ -58355,6 +58631,12 @@ pci:v000015B3d00000264*
 pci:v000015B3d00000281*
  ID_MODEL_FROM_DATABASE=NPS-600 Flash Recovery
 
+pci:v000015B3d00000538*
+ ID_MODEL_FROM_DATABASE=MT2910 Family [ConnectX-7 Flash Recovery]
+
+pci:v000015B3d00000539*
+ ID_MODEL_FROM_DATABASE=MT2910 Family [ConnectX-7 Secure Flash Recovery]
+
 pci:v000015B3d00001002*
  ID_MODEL_FROM_DATABASE=MT25400 Family [ConnectX-2 Virtual Function]
 
@@ -58602,7 +58884,7 @@ pci:v000015B3d00001020*
  ID_MODEL_FROM_DATABASE=MT28860
 
 pci:v000015B3d00001021*
- ID_MODEL_FROM_DATABASE=MT28861
+ ID_MODEL_FROM_DATABASE=MT2910 Family [ConnectX-7]
 
 pci:v000015B3d00001974*
  ID_MODEL_FROM_DATABASE=MT28800 Family [ConnectX-5 PCIe Bridge]
@@ -61844,6 +62126,9 @@ pci:v000017D3d00001880sv000017D3sd00001883*
 pci:v000017D3d00001884*
  ID_MODEL_FROM_DATABASE=ARC-1884 series PCIe 3.0 to SAS/SATA 12/6Gb RAID Controller
 
+pci:v000017D3d0000188A*
+ ID_MODEL_FROM_DATABASE=ARC-1886 series PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller
+
 pci:v000017D5*
  ID_VENDOR_FROM_DATABASE=Exar Corp.
 
@@ -64041,7 +64326,7 @@ pci:v00001969d00001048*
  ID_MODEL_FROM_DATABASE=Attansic L1 Gigabit Ethernet
 
 pci:v00001969d00001048sv00001043sd00008226*
- ID_MODEL_FROM_DATABASE=Attansic L1 Gigabit Ethernet (P5KPL-VM Motherboard)
+ ID_MODEL_FROM_DATABASE=Attansic L1 Gigabit Ethernet (P5B-MX/WiFi-AP, P5KPL-VM Motherboard)
 
 pci:v00001969d00001062*
  ID_MODEL_FROM_DATABASE=AR8132 Fast Ethernet
@@ -64259,6 +64544,9 @@ pci:v00001987d00005007*
 pci:v00001987d00005012*
  ID_MODEL_FROM_DATABASE=E12 NVMe Controller
 
+pci:v00001987d00005016*
+ ID_MODEL_FROM_DATABASE=E16 PCIe4 NVMe Controller
+
 pci:v00001989*
  ID_VENDOR_FROM_DATABASE=Montilio Inc.
 
@@ -64490,27 +64778,63 @@ pci:v000019E5d00000123sv000019E5sd00003036*
 pci:v000019E5d00000200*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (2*100GE)
 
+pci:v000019E5d00000200sv000019E5sd0000D139*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (2*100GE) (Hi1822 SP572 (2*100GE))
+
 pci:v000019E5d00000202*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (2*32G FC)
 
+pci:v000019E5d00000202sv000019E5sd0000D302*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (2*32G FC) (Hi1822 SP521 (2*32G FC))
+
+pci:v000019E5d00000202sv000019E5sd0000D304*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (2*32G FC) (Hi1822 SP526 (2*32G FC))
+
 pci:v000019E5d00000203*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (2*16G FC)
 
+pci:v000019E5d00000203sv000019E5sd0000D301*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (2*16G FC) (Hi1822 SP520 (2*16G FC))
+
+pci:v000019E5d00000203sv000019E5sd0000D305*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (2*16G FC) (Hi1822 SP525 (2*16G FC))
+
 pci:v000019E5d00000205*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (2*100GE)
 
+pci:v000019E5d00000205sv000019E5sd0000DF27*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (2*100GE) (Hi1822 MZ731 MEZZ (2*100GE))
+
 pci:v000019E5d00000206*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (2*25GE)
 
+pci:v000019E5d00000206sv000019E5sd0000D138*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (2*25GE) (Hi1822 SP582 (2*25GE))
+
 pci:v000019E5d00000210*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE)
 
+pci:v000019E5d00000210sv000019E5sd0000DF2E*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE) (Hi1822 MZ532 MEZZ (4*25GE))
+
 pci:v000019E5d00000211*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE)
 
+pci:v000019E5d00000211sv000019E5sd0000D12F*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE) (Hi1822 SP571 (4*25GE))
+
+pci:v000019E5d00000211sv000019E5sd0000D137*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE) (Hi1822 SP581 (4*25GE))
+
 pci:v000019E5d00000212*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (2*8G FC)
 
+pci:v000019E5d00000212sv000019E5sd0000D303*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (2*8G FC) (Hi1822 SP522 (2*8G FC))
+
+pci:v000019E5d00000212sv000019E5sd0000D306*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (2*8G FC) (Hi1822 SP523 (2*8G FC))
+
 pci:v000019E5d00001710*
  ID_MODEL_FROM_DATABASE=iBMA Virtual Network Adapter
 
@@ -64520,6 +64844,12 @@ pci:v000019E5d00001711*
 pci:v000019E5d00001822*
  ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE)
 
+pci:v000019E5d00001822sv000019E5sd0000D129*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE) (Hi1822 SP570 (4*25GE))
+
+pci:v000019E5d00001822sv000019E5sd0000D136*
+ ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE) (Hi1822 SP580 (4*25GE))
+
 pci:v000019E5d0000371E*
  ID_MODEL_FROM_DATABASE=Hi1822 Family Virtual Bridge
 
@@ -65075,6 +65405,12 @@ pci:v00001AEA*
 pci:v00001AEAd00006601*
  ID_MODEL_FROM_DATABASE=AU6601 PCI-E Flash card reader controller
 
+pci:v00001AEAd00006621*
+ ID_MODEL_FROM_DATABASE=AU6621 PCI-E Flash card reader controller
+
+pci:v00001AEAd00006625*
+ ID_MODEL_FROM_DATABASE=AU6625 PCI-E Flash card reader controller
+
 pci:v00001AEC*
  ID_VENDOR_FROM_DATABASE=Wolfson Microelectronics
 
@@ -65564,6 +65900,9 @@ pci:v00001B6Fd00007023*
 pci:v00001B6Fd00007052*
  ID_MODEL_FROM_DATABASE=EJ188/EJ198 USB 3.0 Host Controller
 
+pci:v00001B6Fd00007052sv00001849sd00007052*
+ ID_MODEL_FROM_DATABASE=EJ188/EJ198 USB 3.0 Host Controller (QC5000-ITX/PH)
+
 pci:v00001B73*
  ID_VENDOR_FROM_DATABASE=Fresco Logic
 
@@ -65925,7 +66264,7 @@ pci:v00001C2Cd000000A6*
  ID_MODEL_FROM_DATABASE=FBC1CG Capture 1x100Gb
 
 pci:v00001C2Cd000000A9*
- ID_MODEL_FROM_DATABASE=FBC2XGHH Capture 2x10Gb
+ ID_MODEL_FROM_DATABASE=FBC2XGHH Capture 2x10Gb [Latina]
 
 pci:v00001C2Cd000000AD*
  ID_MODEL_FROM_DATABASE=FBC2CGG3HL Capture 2x100Gb [Padua]
@@ -66047,9 +66386,30 @@ pci:v00001C5Cd00001504*
 pci:v00001C5F*
  ID_VENDOR_FROM_DATABASE=Beijing Memblaze Technology Co. Ltd.
 
+pci:v00001C5Fd0000000D*
+ ID_MODEL_FROM_DATABASE=PBlaze5 520/526 AIC
+
+pci:v00001C5Fd0000003D*
+ ID_MODEL_FROM_DATABASE=PBlaze5 920/926 AIC
+
+pci:v00001C5Fd0000010D*
+ ID_MODEL_FROM_DATABASE=PBlaze5 520/526 U.2
+
+pci:v00001C5Fd0000013D*
+ ID_MODEL_FROM_DATABASE=PBlaze5 920/926 U.2
+
 pci:v00001C5Fd00000540*
  ID_MODEL_FROM_DATABASE=PBlaze4 NVMe SSD
 
+pci:v00001C5Fd00000550*
+ ID_MODEL_FROM_DATABASE=PBlaze5 700/900
+
+pci:v00001C5Fd00000555*
+ ID_MODEL_FROM_DATABASE=PBlaze5 510/516
+
+pci:v00001C5Fd00000557*
+ ID_MODEL_FROM_DATABASE=PBlaze5 910/916
+
 pci:v00001C63*
  ID_VENDOR_FROM_DATABASE=Science and Research Centre of Computer Technology (JSC "NICEVT")
 
@@ -66782,6 +67142,9 @@ pci:v00001DBF*
 pci:v00001DBFd00000401*
  ID_MODEL_FROM_DATABASE=StarDragon4800 PCI Express Root Port
 
+pci:v00001DC5*
+ ID_VENDOR_FROM_DATABASE=FADU Inc.
+
 pci:v00001DD8*
  ID_VENDOR_FROM_DATABASE=Pensando Systems Inc
 
@@ -66953,6 +67316,9 @@ pci:v00001DF3d00000203sv00001DF3sd00000002*
 pci:v00001DF3d00000203sv00001DF3sd00000003*
  ID_MODEL_FROM_DATABASE=ACE-NIC100 Programmable Network Accelerator (ENA2100F)
 
+pci:v00001DF3d00000203sv00001DF3sd00000004*
+ ID_MODEL_FROM_DATABASE=ACE-NIC100 Programmable Network Accelerator (ENA2040F)
+
 pci:v00001DF3d00000204*
  ID_MODEL_FROM_DATABASE=ACE-NIC-NID Programmable Network Accelerator
 
@@ -67011,7 +67377,7 @@ pci:v00001E26*
  ID_VENDOR_FROM_DATABASE=Fujitsu Client Computing Limited
 
 pci:v00001E38*
- ID_VENDOR_FROM_DATABASE=Thinci, Inc
+ ID_VENDOR_FROM_DATABASE=Blaize, Inc
 
 pci:v00001E3D*
  ID_VENDOR_FROM_DATABASE=Burlywood, Inc
@@ -67031,9 +67397,24 @@ pci:v00001E4Cd00000010sv00001E4Csd00000120*
 pci:v00001E57*
  ID_VENDOR_FROM_DATABASE=Beijing Panyi Technology Co., Ltd
 
+pci:v00001E57d00000100*
+ ID_MODEL_FROM_DATABASE=The device has already been deleted.
+
+pci:v00001E57d00000100sv00000000sd00000100*
+ ID_MODEL_FROM_DATABASE=The device has already been deleted. (PY8800 64GB Accelerator)
+
 pci:v00001E6B*
  ID_VENDOR_FROM_DATABASE=Axiado Corp.
 
+pci:v00001E89*
+ ID_VENDOR_FROM_DATABASE=ID Quantique SA
+
+pci:v00001E89d00000002*
+ ID_MODEL_FROM_DATABASE=Quantis-PCIe-40M
+
+pci:v00001E89d00000003*
+ ID_MODEL_FROM_DATABASE=Quantis-PCIe-240M
+
 pci:v00001FC0*
  ID_VENDOR_FROM_DATABASE=Ascom (Finland) Oy
 
@@ -69656,6 +70037,9 @@ pci:v00008086d00000154sv00001043sd00001477*
 pci:v00008086d00000154sv00001043sd00001517*
  ID_MODEL_FROM_DATABASE=3rd Gen Core processor DRAM Controller (Zenbook Prime UX31A)
 
+pci:v00008086d00000154sv000010CFsd000016BF*
+ ID_MODEL_FROM_DATABASE=3rd Gen Core processor DRAM Controller (LIFEBOOK E752)
+
 pci:v00008086d00000155*
  ID_MODEL_FROM_DATABASE=Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
 
@@ -69713,6 +70097,9 @@ pci:v00008086d00000166sv00001043sd00001517*
 pci:v00008086d00000166sv00001043sd00002103*
  ID_MODEL_FROM_DATABASE=3rd Gen Core processor Graphics Controller (N56VZ)
 
+pci:v00008086d00000166sv000010CFsd000016C1*
+ ID_MODEL_FROM_DATABASE=3rd Gen Core processor Graphics Controller (LIFEBOOK E752)
+
 pci:v00008086d0000016A*
  ID_MODEL_FROM_DATABASE=Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
 
@@ -72413,6 +72800,9 @@ pci:v00008086d0000104F*
 pci:v00008086d00001050*
  ID_MODEL_FROM_DATABASE=82562EZ 10/100 Ethernet Controller
 
+pci:v00008086d00001050sv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82562EZ 10/100 Ethernet Controller (ThinkCentre S50)
+
 pci:v00008086d00001050sv00001028sd0000019D*
  ID_MODEL_FROM_DATABASE=82562EZ 10/100 Ethernet Controller (Dimension 3000)
 
@@ -74087,6 +74477,9 @@ pci:v00008086d00001503*
 pci:v00008086d00001503sv00001043sd0000849C*
  ID_MODEL_FROM_DATABASE=82579V Gigabit Network Connection (P8P67 Deluxe Motherboard)
 
+pci:v00008086d00001503sv000010CFsd0000161C*
+ ID_MODEL_FROM_DATABASE=82579V Gigabit Network Connection (LIFEBOOK E752)
+
 pci:v00008086d00001507*
  ID_MODEL_FROM_DATABASE=Ethernet Express Module X520-P2
 
@@ -74678,6 +75071,9 @@ pci:v00008086d00001563sv0000193Dsd00001008*
 pci:v00008086d00001563sv0000193Dsd00001009*
  ID_MODEL_FROM_DATABASE=Ethernet Controller 10G X550T (560T-L)
 
+pci:v00008086d00001563sv0000193Dsd00001011*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller 10G X550T (UN-NIC-ETH563T-sL-2P)
+
 pci:v00008086d00001563sv00008086sd00000001*
  ID_MODEL_FROM_DATABASE=Ethernet Controller 10G X550T (Ethernet Converged Network Adapter X550-T2)
 
@@ -75071,6 +75467,30 @@ pci:v00008086d0000158Bsv00001137sd00000225*
 pci:v00008086d0000158Bsv00001137sd000002B4*
  ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Ethernet Network Adapter XXV710 OCP 2.0)
 
+pci:v00008086d0000158Bsv00001374sd00000230*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Single Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G1I71))
+
+pci:v00008086d0000158Bsv00001374sd00000231*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Single Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G1I71EU))
+
+pci:v00008086d0000158Bsv00001374sd00000234*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Dual Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G2I71))
+
+pci:v00008086d0000158Bsv00001374sd00000235*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Dual Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G2I71EU))
+
+pci:v00008086d0000158Bsv00001374sd00000238*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Quad Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G4I71L))
+
+pci:v00008086d0000158Bsv00001374sd00000239*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Quad Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G4I71LEU))
+
+pci:v00008086d0000158Bsv00001374sd0000023A*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Quad Port 25 Gigabit Ethernet PCI Express Server Adapter (PE31625G4I71L))
+
+pci:v00008086d0000158Bsv00001374sd0000023B*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Quad Port 25 Gigabit Ethernet PCI Express Server Adapter (PE31625G4I71LEU))
+
 pci:v00008086d0000158Bsv00001590sd00000000*
  ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Ethernet Network Adapter XXV710-2)
 
@@ -75383,9 +75803,27 @@ pci:v00008086d000015EF*
 pci:v00008086d000015F0*
  ID_MODEL_FROM_DATABASE=JHL7540 Thunderbolt 3 USB Controller [Titan Ridge DD 2018]
 
+pci:v00008086d000015F4*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (15) I219-LM
+
+pci:v00008086d000015F5*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (15) I219-V
+
 pci:v00008086d000015F6*
  ID_MODEL_FROM_DATABASE=I210 Gigabit Ethernet Connection
 
+pci:v00008086d000015F9*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (14) I219-LM
+
+pci:v00008086d000015FA*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (14) I219-V
+
+pci:v00008086d000015FB*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (13) I219-LM
+
+pci:v00008086d000015FC*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (13) I219-V
+
 pci:v00008086d000015FF*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GBASE-T
 
@@ -75926,6 +76364,18 @@ pci:v00008086d000019E0*
 pci:v00008086d000019E2*
  ID_MODEL_FROM_DATABASE=Atom Processor C3000 Series QuickAssist Technology
 
+pci:v00008086d00001A1C*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (17) I219-LM
+
+pci:v00008086d00001A1D*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (17) I219-V
+
+pci:v00008086d00001A1E*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (16) I219-LM
+
+pci:v00008086d00001A1F*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection (16) I219-V
+
 pci:v00008086d00001A21*
  ID_MODEL_FROM_DATABASE=82840 840 [Carmel] Chipset Host Bridge (Hub A)
 
@@ -76673,6 +77123,9 @@ pci:v00008086d00001E03sv00001043sd00001477*
 pci:v00008086d00001E03sv00001043sd00001517*
  ID_MODEL_FROM_DATABASE=7 Series Chipset Family 6-port SATA Controller [AHCI mode] (Zenbook Prime UX31A)
 
+pci:v00008086d00001E03sv000010CFsd000016E2*
+ ID_MODEL_FROM_DATABASE=7 Series Chipset Family 6-port SATA Controller [AHCI mode] (LIFEBOOK E752)
+
 pci:v00008086d00001E03sv0000144Dsd0000C652*
  ID_MODEL_FROM_DATABASE=7 Series Chipset Family 6-port SATA Controller [AHCI mode] (NP300E5C series laptop)
 
@@ -76715,6 +77168,9 @@ pci:v00008086d00001E10sv00001043sd00001517*
 pci:v00008086d00001E10sv00001043sd000084CA*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family PCI Express Root Port 1 (P8H77-I Motherboard)
 
+pci:v00008086d00001E10sv000010CFsd000016E9*
+ ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family PCI Express Root Port 1 (LIFEBOOK E752)
+
 pci:v00008086d00001E10sv0000144Dsd0000C652*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family PCI Express Root Port 1 (NP300E5C series laptop)
 
@@ -76736,6 +77192,9 @@ pci:v00008086d00001E12sv00001043sd00001517*
 pci:v00008086d00001E14*
  ID_MODEL_FROM_DATABASE=7 Series/C210 Series Chipset Family PCI Express Root Port 3
 
+pci:v00008086d00001E14sv000010CFsd000016E9*
+ ID_MODEL_FROM_DATABASE=7 Series/C210 Series Chipset Family PCI Express Root Port 3 (LIFEBOOK E752)
+
 pci:v00008086d00001E16*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family PCI Express Root Port 4
 
@@ -76772,6 +77231,9 @@ pci:v00008086d00001E1C*
 pci:v00008086d00001E1E*
  ID_MODEL_FROM_DATABASE=7 Series/C210 Series Chipset Family PCI Express Root Port 8
 
+pci:v00008086d00001E1Esv000010CFsd000016E9*
+ ID_MODEL_FROM_DATABASE=7 Series/C210 Series Chipset Family PCI Express Root Port 8 (LIFEBOOK E752)
+
 pci:v00008086d00001E1Esv00001849sd00001E1E*
  ID_MODEL_FROM_DATABASE=7 Series/C210 Series Chipset Family PCI Express Root Port 8 (Motherboard)
 
@@ -76796,6 +77258,9 @@ pci:v00008086d00001E20sv00001043sd00008415*
 pci:v00008086d00001E20sv00001043sd00008445*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family High Definition Audio Controller (P8Z77-V LX Motherboard)
 
+pci:v00008086d00001E20sv000010CFsd00001757*
+ ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family High Definition Audio Controller (LIFEBOOK E752)
+
 pci:v00008086d00001E20sv0000144Dsd0000C652*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family High Definition Audio Controller (NP300E5C series laptop)
 
@@ -76817,6 +77282,9 @@ pci:v00008086d00001E22sv00001043sd00001517*
 pci:v00008086d00001E22sv00001043sd000084CA*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family SMBus Controller (P8 series motherboard)
 
+pci:v00008086d00001E22sv000010CFsd000016E6*
+ ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family SMBus Controller (LIFEBOOK E752)
+
 pci:v00008086d00001E22sv0000144Dsd0000C652*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family SMBus Controller (NP300E5C series laptop)
 
@@ -76847,6 +77315,9 @@ pci:v00008086d00001E26sv00001043sd00001517*
 pci:v00008086d00001E26sv00001043sd000084CA*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family USB Enhanced Host Controller #1 (P8 series motherboard)
 
+pci:v00008086d00001E26sv000010CFsd000016E8*
+ ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family USB Enhanced Host Controller #1 (LIFEBOOK E752)
+
 pci:v00008086d00001E26sv0000144Dsd0000C652*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family USB Enhanced Host Controller #1 (NP300E5C series laptop)
 
@@ -76868,6 +77339,9 @@ pci:v00008086d00001E2Dsv00001043sd00001517*
 pci:v00008086d00001E2Dsv00001043sd000084CA*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family USB Enhanced Host Controller #2 (P8 series motherboard)
 
+pci:v00008086d00001E2Dsv000010CFsd000016E8*
+ ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family USB Enhanced Host Controller #2 (LIFEBOOK E752)
+
 pci:v00008086d00001E2Dsv0000144Dsd0000C652*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family USB Enhanced Host Controller #2 (NP300E5C series laptop)
 
@@ -76895,6 +77369,9 @@ pci:v00008086d00001E31sv00001043sd00001517*
 pci:v00008086d00001E31sv00001043sd000084CA*
  ID_MODEL_FROM_DATABASE=7 Series/C210 Series Chipset Family USB xHCI Host Controller (P8 series motherboard)
 
+pci:v00008086d00001E31sv000010CFsd000016EE*
+ ID_MODEL_FROM_DATABASE=7 Series/C210 Series Chipset Family USB xHCI Host Controller (LIFEBOOK E752)
+
 pci:v00008086d00001E31sv000017AAsd000021F3*
  ID_MODEL_FROM_DATABASE=7 Series/C210 Series Chipset Family USB xHCI Host Controller (ThinkPad T430)
 
@@ -76919,6 +77396,9 @@ pci:v00008086d00001E3Asv00001043sd00001517*
 pci:v00008086d00001E3Asv00001043sd000084CA*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family MEI Controller #1 (P8 series motherboard)
 
+pci:v00008086d00001E3Asv000010CFsd000016EA*
+ ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family MEI Controller #1 (LIFEBOOK E752)
+
 pci:v00008086d00001E3Asv0000144Dsd0000C652*
  ID_MODEL_FROM_DATABASE=7 Series/C216 Chipset Family MEI Controller #1 (NP300E5C series laptop)
 
@@ -77024,6 +77504,9 @@ pci:v00008086d00001E59sv00001043sd00001477*
 pci:v00008086d00001E59sv00001043sd00001517*
  ID_MODEL_FROM_DATABASE=HM76 Express Chipset LPC Controller (Zenbook Prime UX31A)
 
+pci:v00008086d00001E59sv000010CFsd000016E0*
+ ID_MODEL_FROM_DATABASE=HM76 Express Chipset LPC Controller (LIFEBOOK E752)
+
 pci:v00008086d00001E5A*
  ID_MODEL_FROM_DATABASE=7 Series Chipset Family LPC Controller
 
@@ -77900,6 +78383,9 @@ pci:v00008086d00002448sv0000103Csd000030A3*
 pci:v00008086d00002448sv0000103Csd000030C1*
  ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Compaq 6910p)
 
+pci:v00008086d00002448sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (X58LE)
+
 pci:v00008086d00002448sv0000104Dsd0000902D*
  ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (VAIO VGN-NR120E)
 
@@ -79016,6 +79502,9 @@ pci:v00008086d000024D1sv00008086sd0000524C*
 pci:v00008086d000024D2*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1
 
+pci:v00008086d000024D2sv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1 (ThinkCentre S50)
+
 pci:v00008086d000024D2sv00001014sd000002DD*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1 (eServer xSeries server mainboard)
 
@@ -79085,6 +79574,9 @@ pci:v00008086d000024D2sv00008086sd0000524C*
 pci:v00008086d000024D3*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) SMBus Controller
 
+pci:v00008086d000024D3sv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) SMBus Controller (ThinkCentre S50)
+
 pci:v00008086d000024D3sv00001014sd000002DD*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) SMBus Controller (eServer xSeries server mainboard)
 
@@ -79142,6 +79634,9 @@ pci:v00008086d000024D3sv00008086sd0000524C*
 pci:v00008086d000024D4*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2
 
+pci:v00008086d000024D4sv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2 (ThinkCentre S50)
+
 pci:v00008086d000024D4sv00001014sd000002DD*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2 (eServer xSeries server mainboard)
 
@@ -79217,6 +79712,9 @@ pci:v00008086d000024D5*
 pci:v00008086d000024D5sv0000100Asd0000147B*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (Abit IS7-E motherboard)
 
+pci:v00008086d000024D5sv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (ThinkCentre S50)
+
 pci:v00008086d000024D5sv00001028sd00000168*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (Precision Workstation 670 Mainboard)
 
@@ -79268,6 +79766,9 @@ pci:v00008086d000024D6sv0000103Csd0000006A*
 pci:v00008086d000024D7*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #3
 
+pci:v00008086d000024D7sv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #3 (ThinkCentre S50)
+
 pci:v00008086d000024D7sv00001014sd000002ED*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #3 (xSeries server mainboard)
 
@@ -79331,6 +79832,9 @@ pci:v00008086d000024D7sv00008086sd0000524C*
 pci:v00008086d000024DB*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) IDE Controller
 
+pci:v00008086d000024DBsv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) IDE Controller (ThinkCentre S50)
+
 pci:v00008086d000024DBsv00001014sd000002DD*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) IDE Controller (eServer xSeries server mainboard)
 
@@ -79406,6 +79910,9 @@ pci:v00008086d000024DC*
 pci:v00008086d000024DD*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller
 
+pci:v00008086d000024DDsv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller (ThinkCentre S50)
+
 pci:v00008086d000024DDsv00001014sd000002DD*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller (eServer xSeries server mainboard)
 
@@ -79469,6 +79976,9 @@ pci:v00008086d000024DDsv00008086sd0000524C*
 pci:v00008086d000024DE*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4
 
+pci:v00008086d000024DEsv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4 (ThinkCentre S50)
+
 pci:v00008086d000024DEsv00001014sd000002ED*
  ID_MODEL_FROM_DATABASE=82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4 (xSeries server mainboard)
 
@@ -79781,6 +80291,9 @@ pci:v00008086d00002571*
 pci:v00008086d00002572*
  ID_MODEL_FROM_DATABASE=82865G Integrated Graphics Controller
 
+pci:v00008086d00002572sv00001014sd00000287*
+ ID_MODEL_FROM_DATABASE=82865G Integrated Graphics Controller (ThinkCentre S50)
+
 pci:v00008086d00002572sv00001028sd0000019D*
  ID_MODEL_FROM_DATABASE=82865G Integrated Graphics Controller (Dimension 3000)
 
@@ -81366,7 +81879,7 @@ pci:v00008086d000027B8sv0000103Csd00002A8C*
  ID_MODEL_FROM_DATABASE=82801GB/GR (ICH7 Family) LPC Interface Bridge (Compaq 500B Microtower)
 
 pci:v00008086d000027B8sv00001043sd00008179*
- ID_MODEL_FROM_DATABASE=82801GB/GR (ICH7 Family) LPC Interface Bridge (P5KPL-VM Motherboard)
+ ID_MODEL_FROM_DATABASE=82801GB/GR (ICH7 Family) LPC Interface Bridge (P5B-MX/WiFi-AP, P5KPL-VM Motherboard)
 
 pci:v00008086d000027B8sv0000107Bsd00005048*
  ID_MODEL_FROM_DATABASE=82801GB/GR (ICH7 Family) LPC Interface Bridge (E4500)
@@ -81450,7 +81963,7 @@ pci:v00008086d000027C0sv0000103Csd00002A8C*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SATA Controller [IDE mode] (Compaq 500B Microtower)
 
 pci:v00008086d000027C0sv00001043sd00008179*
- ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SATA Controller [IDE mode] (P5KPL-VM Motherboard)
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SATA Controller [IDE mode] (P5B-MX/WiFi-AP, P5KPL-VM Motherboard)
 
 pci:v00008086d000027C0sv0000107Bsd00005048*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SATA Controller [IDE mode] (E4500)
@@ -81585,7 +82098,7 @@ pci:v00008086d000027C8sv00001043sd00001237*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (A6J-Q008)
 
 pci:v00008086d000027C8sv00001043sd00008179*
- ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (P5KPL-VM,P5LD2-VM Mainboard)
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard)
 
 pci:v00008086d000027C8sv00001043sd000083AD*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (Eee PC 1015PX)
@@ -81660,7 +82173,7 @@ pci:v00008086d000027C9sv00001043sd00001237*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (A6J-Q008)
 
 pci:v00008086d000027C9sv00001043sd00008179*
- ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (P5KPL-VM,P5LD2-VM Mainboard)
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard)
 
 pci:v00008086d000027C9sv00001043sd000083AD*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (Eee PC 1015PX)
@@ -81735,7 +82248,7 @@ pci:v00008086d000027CAsv00001043sd00001237*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (A6J-Q008)
 
 pci:v00008086d000027CAsv00001043sd00008179*
- ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (P5KPL-VM,P5LD2-VM Mainboard)
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard)
 
 pci:v00008086d000027CAsv00001043sd000083AD*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (Eee PC 1015PX)
@@ -81804,7 +82317,7 @@ pci:v00008086d000027CBsv00001043sd00001237*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (A6J-Q008)
 
 pci:v00008086d000027CBsv00001043sd00008179*
- ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (P5KPL-VM,P5LD2-VM Mainboard)
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard)
 
 pci:v00008086d000027CBsv00001043sd000083AD*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (Eee PC 1015PX)
@@ -81879,7 +82392,7 @@ pci:v00008086d000027CCsv00001043sd00001237*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (A6J-Q008)
 
 pci:v00008086d000027CCsv00001043sd00008179*
- ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (P5KPL-VM,P5LD2-VM Mainboard)
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard)
 
 pci:v00008086d000027CCsv00001043sd000083AD*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (Eee PC 1015PX)
@@ -82052,6 +82565,9 @@ pci:v00008086d000027D8sv00001043sd000013C4*
 pci:v00008086d000027D8sv00001043sd0000817F*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family High Definition Audio Controller (P5LD2-VM Mainboard (Realtek ALC 882 codec))
 
+pci:v00008086d000027D8sv00001043sd00008249*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family High Definition Audio Controller (P5B-MX/WiFi-AP)
+
 pci:v00008086d000027D8sv00001043sd00008290*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family High Definition Audio Controller (P5KPL-VM Motherboard)
 
@@ -82143,7 +82659,7 @@ pci:v00008086d000027DAsv0000103Csd00002A8C*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (Compaq 500B Microtower)
 
 pci:v00008086d000027DAsv00001043sd00008179*
- ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (P5KPL-VM Motherboard)
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (P5B-MX/WiFi-AP, P5KPL-VM Motherboard)
 
 pci:v00008086d000027DAsv0000105Bsd00000D7C*
  ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (D270S/D250S Motherboard)
@@ -82236,7 +82752,7 @@ pci:v00008086d000027DFsv00001043sd00001237*
  ID_MODEL_FROM_DATABASE=82801G (ICH7 Family) IDE Controller (A6J-Q008)
 
 pci:v00008086d000027DFsv00001043sd00008179*
- ID_MODEL_FROM_DATABASE=82801G (ICH7 Family) IDE Controller (P5KPL-VM Motherboard)
+ ID_MODEL_FROM_DATABASE=82801G (ICH7 Family) IDE Controller (P5B-MX/WiFi-AP, P5KPL-VM Motherboard)
 
 pci:v00008086d000027DFsv0000107Bsd00005048*
  ID_MODEL_FROM_DATABASE=82801G (ICH7 Family) IDE Controller (E4500)
@@ -82316,6 +82832,9 @@ pci:v00008086d00002815sv0000103Csd000030CC*
 pci:v00008086d00002815sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=82801HM (ICH8M) LPC Interface Controller (Presario C700)
 
+pci:v00008086d00002815sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801HM (ICH8M) LPC Interface Controller (X58LE)
+
 pci:v00008086d00002815sv0000104Dsd00009005*
  ID_MODEL_FROM_DATABASE=82801HM (ICH8M) LPC Interface Controller (Vaio VGN-FZ260E)
 
@@ -82433,6 +82952,9 @@ pci:v00008086d00002829sv0000103Csd000030CC*
 pci:v00008086d00002829sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode] (Presario C700)
 
+pci:v00008086d00002829sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode] (X58LE)
+
 pci:v00008086d00002829sv0000104Dsd00009005*
  ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode] (Vaio VGN-FZ260E)
 
@@ -82484,6 +83006,9 @@ pci:v00008086d00002830sv0000103Csd000030CC*
 pci:v00008086d00002830sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #1 (Presario C700)
 
+pci:v00008086d00002830sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #1 (X58LE)
+
 pci:v00008086d00002830sv00001043sd000081EC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #1 (P5B)
 
@@ -82532,6 +83057,9 @@ pci:v00008086d00002831sv0000103Csd000030CC*
 pci:v00008086d00002831sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #2 (Presario C700)
 
+pci:v00008086d00002831sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #2 (X58LE)
+
 pci:v00008086d00002831sv00001043sd000081EC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #2 (P5B)
 
@@ -82580,6 +83108,9 @@ pci:v00008086d00002832sv0000103Csd000030CC*
 pci:v00008086d00002832sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #3 (Presario C700)
 
+pci:v00008086d00002832sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #3 (X58LE)
+
 pci:v00008086d00002832sv00001043sd000081EC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #3 (P5B)
 
@@ -82628,6 +83159,9 @@ pci:v00008086d00002834sv0000103Csd000030C1*
 pci:v00008086d00002834sv0000103Csd000030CC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #4 (Pavilion dv6700)
 
+pci:v00008086d00002834sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #4 (X58LE)
+
 pci:v00008086d00002834sv00001043sd000081EC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #4 (P5B)
 
@@ -82673,6 +83207,9 @@ pci:v00008086d00002835sv0000103Csd000030C1*
 pci:v00008086d00002835sv0000103Csd000030CC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #5 (Pavilion dv6700)
 
+pci:v00008086d00002835sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #5 (X58LE)
+
 pci:v00008086d00002835sv00001043sd000081EC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #5 (P5B)
 
@@ -82718,6 +83255,9 @@ pci:v00008086d00002836sv0000103Csd000030CC*
 pci:v00008086d00002836sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #1 (Presario C700)
 
+pci:v00008086d00002836sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #1 (X58LE)
+
 pci:v00008086d00002836sv00001043sd000081EC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #1 (P5B)
 
@@ -82763,6 +83303,9 @@ pci:v00008086d0000283Asv0000103Csd000030C1*
 pci:v00008086d0000283Asv0000103Csd000030CC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #2 (Pavilion dv6700)
 
+pci:v00008086d0000283Asv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #2 (X58LE)
+
 pci:v00008086d0000283Asv00001043sd000081EC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #2 (P5B)
 
@@ -82799,6 +83342,9 @@ pci:v00008086d0000283Esv00001028sd0000022F*
 pci:v00008086d0000283Esv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) SMBus Controller (Presario C700)
 
+pci:v00008086d0000283Esv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) SMBus Controller (X58LE)
+
 pci:v00008086d0000283Esv00001043sd000081EC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) SMBus Controller (P5B)
 
@@ -82832,6 +83378,9 @@ pci:v00008086d0000283Fsv00001028sd000001DA*
 pci:v00008086d0000283Fsv0000103Csd000030C1*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 1 (Compaq 6910p)
 
+pci:v00008086d0000283Fsv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 1 (X58LE)
+
 pci:v00008086d0000283Fsv0000104Dsd0000902D*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 1 (VAIO VGN-NR120E)
 
@@ -82847,6 +83396,9 @@ pci:v00008086d00002841*
 pci:v00008086d00002841sv0000103Csd000030C1*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 2 (Compaq 6910p)
 
+pci:v00008086d00002841sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 2 (X58LE)
+
 pci:v00008086d00002841sv0000104Dsd0000902D*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 2 (VAIO VGN-NR120E)
 
@@ -82859,6 +83411,9 @@ pci:v00008086d00002841sv000017C0sd00004083*
 pci:v00008086d00002843*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 3
 
+pci:v00008086d00002843sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 3 (X58LE)
+
 pci:v00008086d00002843sv0000104Dsd0000902D*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 3 (VAIO VGN-NR120E)
 
@@ -82871,6 +83426,9 @@ pci:v00008086d00002843sv000017C0sd00004083*
 pci:v00008086d00002845*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 4
 
+pci:v00008086d00002845sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 4 (X58LE)
+
 pci:v00008086d00002845sv000017AAsd000020AD*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 4 (ThinkPad T61/R61)
 
@@ -82940,6 +83498,9 @@ pci:v00008086d0000284Bsv0000103Csd000030CC*
 pci:v00008086d0000284Bsv00001043sd00001339*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) HD Audio Controller (M51S series)
 
+pci:v00008086d0000284Bsv00001043sd000017F3*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) HD Audio Controller (X58LE)
+
 pci:v00008086d0000284Bsv00001043sd000081EC*
  ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) HD Audio Controller (P5B)
 
@@ -82997,6 +83558,9 @@ pci:v00008086d00002850sv0000103Csd000030CC*
 pci:v00008086d00002850sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (Presario C700)
 
+pci:v00008086d00002850sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (X58LE)
+
 pci:v00008086d00002850sv0000104Dsd00009005*
  ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (Vaio VGN-FZ260E)
 
@@ -83012,6 +83576,9 @@ pci:v00008086d00002850sv000017C0sd00004083*
 pci:v00008086d00002850sv0000E4BFsd0000CC47*
  ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (CCG-RUMBA)
 
+pci:v00008086d000028C0*
+ ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller
+
 pci:v00008086d00002912*
  ID_MODEL_FROM_DATABASE=82801IH (ICH9DH) LPC Interface Controller
 
@@ -83753,12 +84320,18 @@ pci:v00008086d0000294Csv000017AAsd0000302E*
 pci:v00008086d00002970*
  ID_MODEL_FROM_DATABASE=82946GZ/PL/GL Memory Controller Hub
 
+pci:v00008086d00002970sv00001043sd0000823B*
+ ID_MODEL_FROM_DATABASE=82946GZ/PL/GL Memory Controller Hub (P5B-MX/WiFi-AP)
+
 pci:v00008086d00002971*
  ID_MODEL_FROM_DATABASE=82946GZ/PL/GL PCI Express Root Port
 
 pci:v00008086d00002972*
  ID_MODEL_FROM_DATABASE=82946GZ/GL Integrated Graphics Controller
 
+pci:v00008086d00002972sv00001043sd0000823B*
+ ID_MODEL_FROM_DATABASE=82946GZ/GL Integrated Graphics Controller (P5B-MX/WiFi-AP)
+
 pci:v00008086d00002973*
  ID_MODEL_FROM_DATABASE=82946GZ/GL Integrated Graphics Controller
 
@@ -84056,6 +84629,9 @@ pci:v00008086d00002A00sv0000103Csd000030CC*
 pci:v00008086d00002A00sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=Mobile PM965/GM965/GL960 Memory Controller Hub (Presario C700)
 
+pci:v00008086d00002A00sv00001043sd00001017*
+ ID_MODEL_FROM_DATABASE=Mobile PM965/GM965/GL960 Memory Controller Hub (X58LE)
+
 pci:v00008086d00002A00sv0000104Dsd00009005*
  ID_MODEL_FROM_DATABASE=Mobile PM965/GM965/GL960 Memory Controller Hub (Vaio VGN-FZ260E)
 
@@ -84095,6 +84671,9 @@ pci:v00008086d00002A02sv0000103Csd000030C0*
 pci:v00008086d00002A02sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (primary) (Presario C700)
 
+pci:v00008086d00002A02sv00001043sd000014E2*
+ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (primary) (X58LE)
+
 pci:v00008086d00002A02sv0000104Dsd0000902D*
  ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (primary) (VAIO VGN-NR120E)
 
@@ -84122,6 +84701,9 @@ pci:v00008086d00002A03sv0000103Csd000030C0*
 pci:v00008086d00002A03sv0000103Csd000030D9*
  ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (Presario C700)
 
+pci:v00008086d00002A03sv00001043sd000014E2*
+ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (X58LE)
+
 pci:v00008086d00002A03sv0000104Dsd0000902D*
  ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (VAIO VGN-NR120E)
 
@@ -87617,6 +88199,9 @@ pci:v00008086d00003E1Fsv00001458sd00005000*
 pci:v00008086d00003E30*
  ID_MODEL_FROM_DATABASE=8th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
 
+pci:v00008086d00003E33*
+ ID_MODEL_FROM_DATABASE=8th/9th Gen Core Processor Host Bridge/DRAM Registers [Coffee Lake]
+
 pci:v00008086d00003E34*
  ID_MODEL_FROM_DATABASE=Coffee Lake HOST and DRAM Controller
 
@@ -88043,6 +88628,12 @@ pci:v00008086d0000423Dsv00008086sd00001316*
 pci:v00008086d0000444E*
  ID_MODEL_FROM_DATABASE=Turbo Memory Controller
 
+pci:v00008086d0000467F*
+ ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller
+
+pci:v00008086d00004C3D*
+ ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller
+
 pci:v00008086d00005001*
  ID_MODEL_FROM_DATABASE=LE80578
 
@@ -90137,6 +90728,9 @@ pci:v00008086d00009641*
 pci:v00008086d000096A1*
  ID_MODEL_FROM_DATABASE=Integrated RAID
 
+pci:v00008086d00009A0B*
+ ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller
+
 pci:v00008086d00009B41*
  ID_MODEL_FROM_DATABASE=UHD Graphics
 
@@ -90767,6 +91361,9 @@ pci:v00008086d00009DB0*
 pci:v00008086d00009DB1*
  ID_MODEL_FROM_DATABASE=Cannon Point-LP PCI Express Root Port #10
 
+pci:v00008086d00009DB2*
+ ID_MODEL_FROM_DATABASE=Cannon Point-LP PCI Express Root Port #1
+
 pci:v00008086d00009DB4*
  ID_MODEL_FROM_DATABASE=Cannon Point-LP PCI Express Root Port #13
 
@@ -90803,6 +91400,9 @@ pci:v00008086d00009DD3*
 pci:v00008086d00009DE0*
  ID_MODEL_FROM_DATABASE=Cannon Point-LP MEI Controller #1
 
+pci:v00008086d00009DE3*
+ ID_MODEL_FROM_DATABASE=Cannon Point-LP Keyboard and Text (KT) Redirection
+
 pci:v00008086d00009DE8*
  ID_MODEL_FROM_DATABASE=Cannon Point-LP Serial IO I2C Controller #0
 
@@ -91568,6 +92168,9 @@ pci:v00008086d0000A323*
 pci:v00008086d0000A324*
  ID_MODEL_FROM_DATABASE=Cannon Lake PCH SPI Controller
 
+pci:v00008086d0000A328*
+ ID_MODEL_FROM_DATABASE=Cannon Lake PCH Serial IO UART Host Controller
+
 pci:v00008086d0000A32C*
  ID_MODEL_FROM_DATABASE=Cannon Lake PCH PCI Express Root Port #21
 
@@ -91655,6 +92258,9 @@ pci:v00008086d0000A360*
 pci:v00008086d0000A363*
  ID_MODEL_FROM_DATABASE=Cannon Lake PCH Active Management Technology - SOL
 
+pci:v00008086d0000A364*
+ ID_MODEL_FROM_DATABASE=Cannon Lake PCH HECI Controller #2
+
 pci:v00008086d0000A368*
  ID_MODEL_FROM_DATABASE=Cannon Lake PCH Serial IO I2C Controller #0
 
@@ -91802,6 +92408,57 @@ pci:v00008086d0000F1A8*
 pci:v00008088*
  ID_VENDOR_FROM_DATABASE=Beijing Wangxun Technology Co., Ltd.
 
+pci:v00008088d00000101*
+ ID_MODEL_FROM_DATABASE=WX1860A2 Gigabit Ethernet Controller
+
+pci:v00008088d00000101sv00008088sd00000201*
+ ID_MODEL_FROM_DATABASE=WX1860A2 Gigabit Ethernet Controller (Dual-Port Ethernet Network Adaptor SF200T)
+
+pci:v00008088d00000102*
+ ID_MODEL_FROM_DATABASE=WX1860A2S Gigabit Ethernet Controller
+
+pci:v00008088d00000102sv00008088sd00000210*
+ ID_MODEL_FROM_DATABASE=WX1860A2S Gigabit Ethernet Controller (Dual-Port Ethernet Network Adaptor SF200T-S)
+
+pci:v00008088d00000103*
+ ID_MODEL_FROM_DATABASE=WX1860A4 Gigabit Ethernet Controller
+
+pci:v00008088d00000103sv00008088sd00000401*
+ ID_MODEL_FROM_DATABASE=WX1860A4 Gigabit Ethernet Controller (Qual-Port Ethernet Network Adaptor SF400T)
+
+pci:v00008088d00000103sv00008088sd00000440*
+ ID_MODEL_FROM_DATABASE=WX1860A4 Gigabit Ethernet Controller (Qual-Port Ethernet Network Adaptor SF400-OCP)
+
+pci:v00008088d00000104*
+ ID_MODEL_FROM_DATABASE=WX1860A4S Gigabit Ethernet Controller
+
+pci:v00008088d00000104sv00008088sd00000410*
+ ID_MODEL_FROM_DATABASE=WX1860A4S Gigabit Ethernet Controller (Qual-Port Ethernet Network Adaptor SF400T-S)
+
+pci:v00008088d00000105*
+ ID_MODEL_FROM_DATABASE=WX1860AL2 Gigabit Ethernet Controller
+
+pci:v00008088d00000105sv00008088sd00000202*
+ ID_MODEL_FROM_DATABASE=WX1860AL2 Gigabit Ethernet Controller (Dual-Port Ethernet Network Adaptor SF200HT)
+
+pci:v00008088d00000106*
+ ID_MODEL_FROM_DATABASE=WX1860AL2S Gigabit Ethernet Controller
+
+pci:v00008088d00000106sv00008088sd00000220*
+ ID_MODEL_FROM_DATABASE=WX1860AL2S Gigabit Ethernet Controller (Dual-Port Ethernet Network Adaptor SF200HT-S)
+
+pci:v00008088d00000107*
+ ID_MODEL_FROM_DATABASE=WX1860AL4 Gigabit Ethernet Controller
+
+pci:v00008088d00000107sv00008088sd00000402*
+ ID_MODEL_FROM_DATABASE=WX1860AL4 Gigabit Ethernet Controller (Qual-Port Ethernet Network Adaptor SF400HT)
+
+pci:v00008088d00000108*
+ ID_MODEL_FROM_DATABASE=WX1860AL4S Gigabit Ethernet Controller
+
+pci:v00008088d00000108sv00008088sd00000420*
+ ID_MODEL_FROM_DATABASE=WX1860AL4S Gigabit Ethernet Controller (Qual-Port Ethernet Network Adaptor SF400HT-S)
+
 pci:v00008088d00001001*
  ID_MODEL_FROM_DATABASE=Ethernet Controller RP1000 for 10GbE SFP+
 
@@ -93746,6 +94403,18 @@ pci:v0000D161d00008013*
 pci:v0000D161d0000B410*
  ID_MODEL_FROM_DATABASE=Wildcard B410 quad-BRI card
 
+pci:v0000D209*
+ ID_VENDOR_FROM_DATABASE=Ultimarc
+
+pci:v0000D209d00001500*
+ ID_MODEL_FROM_DATABASE=PAC Drive
+
+pci:v0000D209d000015A2*
+ ID_MODEL_FROM_DATABASE=SpinTrak
+
+pci:v0000D209d00001601*
+ ID_MODEL_FROM_DATABASE=AimTrak
+
 pci:v0000D4D4*
  ID_VENDOR_FROM_DATABASE=Dy4 Systems Inc
 
@@ -94253,30 +94922,102 @@ pci:v0000F1D0d0000CAFE*
 pci:v0000F1D0d0000CFEE*
  ID_MODEL_FROM_DATABASE=Xena LS/SD-22-DA/SD-DA
 
+pci:v0000F1D0d0000DAFE*
+ ID_MODEL_FROM_DATABASE=Corvid 1
+
 pci:v0000F1D0d0000DAFF*
  ID_MODEL_FROM_DATABASE=KONA LHi
 
+pci:v0000F1D0d0000DB00*
+ ID_MODEL_FROM_DATABASE=IoExpress
+
 pci:v0000F1D0d0000DB01*
  ID_MODEL_FROM_DATABASE=Corvid22
 
+pci:v0000F1D0d0000DB02*
+ ID_MODEL_FROM_DATABASE=Kona 3G
+
+pci:v0000F1D0d0000DB03*
+ ID_MODEL_FROM_DATABASE=Corvid 3G
+
+pci:v0000F1D0d0000DB04*
+ ID_MODEL_FROM_DATABASE=Kona 3G QUAD
+
+pci:v0000F1D0d0000DB05*
+ ID_MODEL_FROM_DATABASE=Kona LHe+
+
+pci:v0000F1D0d0000DB06*
+ ID_MODEL_FROM_DATABASE=IoXT
+
+pci:v0000F1D0d0000DB07*
+ ID_MODEL_FROM_DATABASE=Kona 3G P2P
+
+pci:v0000F1D0d0000DB08*
+ ID_MODEL_FROM_DATABASE=Kona 3G QUAD P2P
+
 pci:v0000F1D0d0000DB09*
  ID_MODEL_FROM_DATABASE=Corvid 24
 
+pci:v0000F1D0d0000DB11*
+ ID_MODEL_FROM_DATABASE=T-Tap
+
 pci:v0000F1D0d0000DCAF*
  ID_MODEL_FROM_DATABASE=Kona HD
 
 pci:v0000F1D0d0000DFEE*
  ID_MODEL_FROM_DATABASE=Xena HD-DA
 
+pci:v0000F1D0d0000EB07*
+ ID_MODEL_FROM_DATABASE=Io4K
+
+pci:v0000F1D0d0000EB0A*
+ ID_MODEL_FROM_DATABASE=Io4K UFC
+
+pci:v0000F1D0d0000EB0B*
+ ID_MODEL_FROM_DATABASE=Kona 4
+
+pci:v0000F1D0d0000EB0C*
+ ID_MODEL_FROM_DATABASE=Kona 4 UFC
+
 pci:v0000F1D0d0000EB0D*
  ID_MODEL_FROM_DATABASE=Corvid 88
 
 pci:v0000F1D0d0000EB0E*
  ID_MODEL_FROM_DATABASE=Corvid 44
 
+pci:v0000F1D0d0000EB16*
+ ID_MODEL_FROM_DATABASE=Corvid HEVC
+
+pci:v0000F1D0d0000EB16sv000010CFsd00001049*
+ ID_MODEL_FROM_DATABASE=Corvid HEVC (M31)
+
+pci:v0000F1D0d0000EB18*
+ ID_MODEL_FROM_DATABASE=Corvid HB-R
+
+pci:v0000F1D0d0000EB1A*
+ ID_MODEL_FROM_DATABASE=Kona IP 1SFP
+
+pci:v0000F1D0d0000EB1C*
+ ID_MODEL_FROM_DATABASE=Kona IP 2SFP
+
 pci:v0000F1D0d0000EB1D*
+ ID_MODEL_FROM_DATABASE=Io4KPlus
+
+pci:v0000F1D0d0000EB1E*
+ ID_MODEL_FROM_DATABASE=IoIP
+
+pci:v0000F1D0d0000EB1F*
  ID_MODEL_FROM_DATABASE=Kona 5
 
+pci:v0000F1D0d0000EB23*
+ ID_MODEL_FROM_DATABASE=Kona 1
+
+pci:v0000F1D0d0000EB24*
+ ID_MODEL_FROM_DATABASE=Kona HDMI
+
+pci:v0000F1D0d0000EB25*
+ ID_MODEL_FROM_DATABASE=Corvid 44 12g
+
 pci:v0000F1D0d0000EFAC*
  ID_MODEL_FROM_DATABASE=Xena SD-MM/SD-22-MM
 

diff --git a/hwdb.d/20-usb-vendor-model.hwdb b/hwdb.d/20-usb-vendor-model.hwdb
index 0de5135b24849183c02f676d234c0e8343347125..96bb472251b23135a36645ddf2607dc25cb339b8 100644 (file)
--- a/hwdb.d/20-usb-vendor-model.hwdb
+++ b/hwdb.d/20-usb-vendor-model.hwdb
@@ -57233,6 +57233,30 @@ usb:v2237*
 usb:v2237p4161*
  ID_MODEL_FROM_DATABASE=eReader White
 
+usb:v224F*
+ ID_VENDOR_FROM_DATABASE=APDM
+
+usb:v224Fp0001*
+ ID_MODEL_FROM_DATABASE=Access Point
+
+usb:v224Fp0002*
+ ID_MODEL_FROM_DATABASE=Docking Station
+
+usb:v224Fp0004*
+ ID_MODEL_FROM_DATABASE=V2 Opal ACM
+
+usb:v224Fp0005*
+ ID_MODEL_FROM_DATABASE=V2 Opal
+
+usb:v224Fp0006*
+ ID_MODEL_FROM_DATABASE=V2 Docking Station
+
+usb:v224Fp0007*
+ ID_MODEL_FROM_DATABASE=V2 Access Point ACM
+
+usb:v224Fp0008*
+ ID_MODEL_FROM_DATABASE=V2 Access Point
+
 usb:v225D*
  ID_VENDOR_FROM_DATABASE=Morpho
 

diff --git a/hwdb.d/60-evdev.hwdb b/hwdb.d/60-evdev.hwdb
index 5142ef16c3cdc46373ce758a60b5007dda4cbc70..a6a3c5c296606158a888a8bf427cbbecb27ad22b 100644 (file)
--- a/hwdb.d/60-evdev.hwdb
+++ b/hwdb.d/60-evdev.hwdb
@@ -479,6 +479,13 @@ evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoideapadY700-14ISK*
  EVDEV_ABS_35=::27
  EVDEV_ABS_36=::29
 
+# Lenovo Ideapad 310S-14ISK
+evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoideapad310S-14ISK*
+ EVDEV_ABS_00=113:3960:37
+ EVDEV_ABS_01=100:1959:27
+ EVDEV_ABS_35=113:3960:37
+ EVDEV_ABS_36=100:1959:27
+
 # Lenovo Ideapad 500S-13ISK
 evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoideapad500S-13ISK*
  EVDEV_ABS_00=125:3955:37
@@ -514,6 +521,13 @@ evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoYoga500-14IBD*
  EVDEV_ABS_35=117:3952:36
  EVDEV_ABS_36=105:1960:26
 
+# Lenovo Thinkpad T490
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:*:svnLENOVO:*pvrThinkPadT490:*
+ EVDEV_ABS_00=::57
+ EVDEV_ABS_01=::33
+ EVDEV_ABS_35=::57
+ EVDEV_ABS_36=::33
+
 #########################################
 # Razer
 #########################################

diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb
index 9227bee7ff55ae0c1b360ffd7183a249b63da3fb..1f6a8f0533473e11018403f20478b728b866d74d 100644 (file)
--- a/hwdb.d/60-keyboard.hwdb
+++ b/hwdb.d/60-keyboard.hwdb
@@ -207,6 +207,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAlienware*:pn*:pvr*
  KEYBOARD_KEY_c1=!prog2                                 #graphics amplifier, undock-button event
  KEYBOARD_KEY_c2=!power                                 #graphics amplifier, surprise undock event
 
+# Alienware M17xR3 laptops
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAlienware*:pnM17xR3:*
+ KEYBOARD_KEY_89=ejectcd
+
 ###########################################################
 # Asus
 ###########################################################

diff --git a/hwdb.d/60-sensor.hwdb b/hwdb.d/60-sensor.hwdb
index 5b06e0c7ea24a33d19a0f20ddbcfffd2c64f9f77..931e760ea584172f5399bb8874433ccb264b8f43 100644 (file)
--- a/hwdb.d/60-sensor.hwdb
+++ b/hwdb.d/60-sensor.hwdb
@@ -82,10 +82,13 @@ sensor:modalias:acpi:SMO8500:*:dmi:*Acer*:pnOneS1002*
 
 sensor:modalias:acpi:KIOX0009*:dmi:*:svnAcer:pnOneS1003:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
- 
+
 sensor:modalias:acpi:BOSC0200*:dmi:*:svnAcer*:pnSwitchSW312-31:*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
+sensor:modalias:acpi:BOSC0200*:dmi:*svn*Acer*:*pn*Spin*SP111-33*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+
 #########################################
 # Archos
 #########################################
@@ -102,20 +105,14 @@ sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:pnT300CHI*
  ACCEL_MOUNT_MATRIX=0, -1, 0; 1, 0, 0; 0, 0, 1
 
 sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:*pnT100TA*
- ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
-
 sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:pnT200TA*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
 sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:*pnTP201SA*
- ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
-
 sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:pn*E205SA*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
 sensor:modalias:acpi:INVN6500*:dmi:*svn*ASUSTeK*:*pn*TP300LA*
- ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
-
 sensor:modalias:acpi:INVN6500*:dmi:*svn*ASUSTeK*:*pn*TP300LD*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
@@ -128,6 +125,7 @@ sensor:modalias:acpi:KXJ2109*:dmi:*:svnASUSTeK*:pnME176C*
 sensor:modalias:acpi:SMO8500*:dmi:*svn*ASUSTeK*:*pn*TP300LJ*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
+sensor:modalias:acpi:SMO8500*:dmi:*svn*ASUSTeK*:*pn*TP500LAB*
 sensor:modalias:acpi:SMO8500*:dmi:*svn*ASUSTeK*:*pn*TP500LB*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
@@ -163,8 +161,12 @@ sensor:modalias:acpi:BMA250E*:dmi:bvnINSYDECorp.:bvrG1D_S165*:svnilife:pnS165:*
 sensor:modalias:acpi:BOSC0200*:dmi:*:svnHampoo:pnX1D3_C806N:*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
+# Chuwi Hi10 (CWI515)
+sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:*:svnDefaultstring:pnDefaultstring:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
 # Chuwi Hi10 (CWI1515)
-sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvrP02A_C106.60E:*:svnDefaultstring:pnDefaultstring:* 
+sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvrP02A_C106.60E:*:svnDefaultstring:pnDefaultstring:*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
 # Chuwi Hi10 Pro
@@ -223,6 +225,10 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni8-L:*
 sensor:modalias:acpi:BOSC0200*:dmi:*:svnCube:pnI15-TC:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
+# Cube iWork 11 Stylus
+sensor:modalias:acpi:KIOX000A*:dmi:*:svncube:pni8-T:*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+
 #########################################
 # Cytrix (Mytrix)
 #########################################
@@ -429,27 +435,16 @@ sensor:modalias:acpi:SMO8500*:dmi:*:svnMEDION:pnAkoyaE2212TMD99720:*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
 
 # Medion Akoya E2215T MD60198
-sensor:modalias:acpi:KIOX000A*:dmi:*svnMEDION:pnE2215TMD60198:*
- ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
-
 # Medion Akoya E3216 MD60900
-sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION*:pnE3216*:*
- ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
-
 # Medion Akoya E3221 MD61237
-sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION:pnE3221MD61237:*
- ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
-
-# Medion Akoya E3222 MD62450
-sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION*:pnE3222*:*
- ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
-
 # Medion Akoya E2292 MD63390
-sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION:pnE2292MD63390:*
- ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
-
 # Medion Akoya E2293 MD61130
-sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION:pnE2293MD61130:*
+# Medion Akoya E2293 MD61144
+# Medion Akoya E3222 MD62450
+# and presumably all other Akoya Exxxx
+sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION:pnE*:*
+# Medion Akoya E3222 MD62450
+sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION:pnMEDION*:*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
 #########################################
@@ -551,32 +546,46 @@ sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvrSCH12i.WJ210Z.Kt
 #########################################
 # Teclast
 #########################################
-sensor:modalias:acpi:KIOX000A*:dmi:*:svnTECLAST:pnX80Pro:*
+# Teclast F5
+sensor:modalias:acpi:KIOX010A*:dmi:*:svnTECLAST:pnF5:*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+
+# Teclast F6 Pro (2 sensors)
+sensor:modalias:acpi:KIOX010A*:dmi:*:svnTECLAST:pnF6Pro:*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, -1, 0; 0, 0, -1
+ ACCEL_LOCATION=display
+
+sensor:modalias:acpi:KIOX020A*:dmi:*:svnTECLAST:pnF6Pro:*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+ ACCEL_LOCATION=base
 
-#Teclast X80 PLUS (H5C5)
+# Teclast X80 Plus (H5C5)
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnTECLAST:pnDefaultstring:*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
-sensor:modalias:acpi:KIOX000A*:dmi:*:svnTECLAST:pnX98PlusII:*
+# Teclast X80 Pro (E3E6)
+sensor:modalias:acpi:KIOX000A*:dmi:*:svnTECLAST:pnX80Pro:*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+
+# Teclast X89 (E7ED), "tPAD" is too generic also match on BIOS date
+sensor:modalias:acpi:SMO8500*:dmi:*bd12/19/2014:*:rvnTECLAST:rntPAD:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
 # Teclast X98 Plus I (A5C6), generic DMI strings, match entire dmi modalias inc. bios-date
 sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.011:bd11/03/2015:svnTobefilledbyO.E.M.:pnTobefilledbyO.E.M.:pvrTobefilledbyO.E.M.:rvnAMICorporation:rnCherryTrailCR:rvrTobefilledbyO.E.M.:cvnToBeFilledByO.E.M.:ct3:cvrToBeFilledByO.E.M.:
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
-# Teclast F5
-sensor:modalias:acpi:KIOX010A*:dmi:*:svnTECLAST:pnF5:*
- ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+# Teclast X98 Plus II
+sensor:modalias:acpi:KIOX000A*:dmi:*:svnTECLAST:pnX98PlusII:*
+ ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
-# Teclast F6 Pro
-sensor:modalias:acpi:KIOX010A*:dmi:*:svnTECLAST:pnF6Pro:*
- ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, -1, 0; 0, 0, -1
- ACCEL_LOCATION=display
+#########################################
+# Thundersoft
+#########################################
 
-sensor:modalias:acpi:KIOX020A*:dmi:*:svnTECLAST:pnF6Pro:*
- ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
- ACCEL_LOCATION=base
+# Thundersoft TST168 tablet, generic DMI strings, match entire dmi modalias inc. bios-date
+sensor:modalias:acpi:BMA250E*:dmi:bvnAmericanMegatrendsInc.:bvr5.6.5:bd04/15/2014:svnTobefilledbyO.E.M.:pnTobefilledbyO.E.M.:pvrTobefilledbyO.E.M.:rvnAMICorporation:rnAptioCRB:rvrTobefilledbyO.E.M.:cvnToBeFilledByO.E.M.:ct3:cvrToBeFilledByO.E.M.:
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
 
 #########################################
 # Trekstor
@@ -585,6 +594,7 @@ sensor:modalias:acpi:BMA250*:dmi:*:bvrTREK.G.WI71C.JGBMRBA*:*:svnInsyde:pnST7041
 sensor:modalias:acpi:BMA250*:dmi:*:bvrTREK.G.WI71C.JGBMRBA*:*:svnTrekStor:pnSurfTabwintron7.0ST70416-6:*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
+sensor:modalias:acpi:KIOX000A*:dmi:*:svnTREKSTOR*:pnPrimetabS11B:*
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnTREKSTOR:pnPrimetabT13B:*
 sensor:modalias:acpi:BOSC0200*:dmi:*:svnTrekStor*:pnSurfTabtwin11.6:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1

diff --git a/hwdb.d/70-mouse.hwdb b/hwdb.d/70-mouse.hwdb
index 4336b91fba4ed1d7c634deaf227f42111b0ac77c..2e6c3bd3fc7f6a3da8a2973a488e2dc2436487de 100644 (file)
--- a/hwdb.d/70-mouse.hwdb
+++ b/hwdb.d/70-mouse.hwdb
@@ -449,7 +449,7 @@ mouse:usb:v046dp406a:name:Logitech MX Anywhere 2S:
 mouse:bluetooth:v046dpb01a:name:MX Anywhere 2S Mouse:
  MOUSE_WHEEL_CLICK_ANGLE=20
 
-# Logitech MX Master
+# Logitech MX Master (via Logitech Unifying Receiver)
 # Horiz wheel has 14 stops, angle is rounded up
 mouse:usb:v046dp4060:name:Logitech MX Master:
 mouse:usb:v046dp4041:name:Logitech MX Master:
@@ -459,6 +459,15 @@ mouse:usb:v046dp4041:name:Logitech MX Master:
  MOUSE_WHEEL_CLICK_COUNT=24
  MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL=14
 
+# Logitech MX Master (via Bluetooth)
+# Horiz wheel has 14 stops, angle is rounded up
+mouse:bluetooth:v046dpb012:name:MX Master Mouse:
+ MOUSE_DPI=1000@2000
+ MOUSE_WHEEL_CLICK_ANGLE=15
+ MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL=26
+ MOUSE_WHEEL_CLICK_COUNT=24
+ MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL=14
+
 # Logitech MX Master 2S (via Logitech Unifying Receiver)
 # Horiz wheel has 14 stops, angle is rounded up
 mouse:usb:v046dp4069:name:Logitech MX Master 2s:
@@ -471,12 +480,16 @@ mouse:usb:v046dp4069:name:Logitech MX Master 2s:
 # Logitech MX Master 2S (via Bluetooth)
 # Horiz wheel has 14 stops, angle is rounded up
 mouse:bluetooth:v046dpb019:name:MX Master 2S Mouse:
- MOUSE_DPI=2000@2000
+ MOUSE_DPI=1000@2000
  MOUSE_WHEEL_CLICK_ANGLE=15
  MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL=26
  MOUSE_WHEEL_CLICK_COUNT=24
  MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL=14
 
+# Logitech MX Ergo (via Bluetooth)
+mouse:bluetooth:v046dpb01d:name:MX Ergo Mouse:
+ ID_INPUT_TRACKBALL=1
+
 ## Other ##
 
 # Logitech M-BJ58 Optical Mouse
@@ -724,9 +737,9 @@ mouse:usb:v1038p1369:name:SteelSeries Sensei Raw Gaming Mouse:
 mouse:usb:v145fp01ac:name:HID-compliant Mouse Trust Gaming Mouse:
  MOUSE_DPI=*800@528 1200@537 1600@536 2400@521
 
- ##########################################
- # Zelotes
- ##########################################
+##########################################
+# Zelotes
+##########################################
 
 # Zelotes 5500 DPI 7 Button USB Wired Gaming Mouse
 mouse:usb:v1d57pad17:*

diff --git a/hwdb.d/ma-large.txt b/hwdb.d/ma-large.txt
index f7aa100a09b172cb1b58051c362a3e9ebebc8525..b99b3ccc7f632beb6c09b6d3706ba86a1271ae29 100644 (file)
--- a/hwdb.d/ma-large.txt
+++ b/hwdb.d/ma-large.txt
@@ -4388,12 +4388,6 @@ E820E2     (base 16)             HUMAX Co., Ltd.
                                Komagane  Nagano  399-4117\r
                                JP\r
 \r
-F4-EA-B5   (hex)               Aerohive Networks Inc.\r
-F4EAB5     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 8C-5B-F0   (hex)               ARRIS Group, Inc.\r
 8C5BF0     (base 16)           ARRIS Group, Inc.\r
                                6450 Sequence Drive\r
@@ -5096,12 +5090,6 @@ E470B8     (base 16)             Intel Corporate
                                Piscataway  NJ  08554\r
                                US\r
 \r
-00-86-9C   (hex)               Palo Alto Networks\r
-00869C     (base 16)           Palo Alto Networks\r
-                               4401 Great America Parkway\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 94-D9-B3   (hex)               TP-LINK TECHNOLOGIES CO.,LTD.\r
 94D9B3     (base 16)           TP-LINK TECHNOLOGIES CO.,LTD.\r
                                Building 24(floors 1,3,4,5)and 28(floors 1-4)Central Science and Technology Park,Shennan Road,Nanshan\r
@@ -5390,12 +5378,6 @@ F46BEF     (base 16)             Sagemcom Broadband SAS
                                Rueil Malmaison Cedex  hauts de seine  92848\r
                                FR\r
 \r
-08-30-6B   (hex)               Palo Alto Networks\r
-08306B     (base 16)           Palo Alto Networks\r
-                               4401 Great America Parkway\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 10-CD-B6   (hex)               Essential Products, Inc.\r
 10CDB6     (base 16)           Essential Products, Inc.\r
                                380 Portage Avenue\r
@@ -6110,12 +6092,6 @@ F42B48     (base 16)             Ubiqam
                                 Longhua New District, Shenzhen  Guangdong  518012\r
                                CN\r
 \r
-54-03-84   (hex)               Hangkong Nano IC Technologies Co., Ltd\r
-540384     (base 16)           Hangkong Nano IC Technologies Co., Ltd\r
-                               Rm. 19C, Lockhart Ctr., 301-307 Lockhart Rd., Wan Chai, Hong Kong\r
-                               Hong Kong  Hong Kong  999077\r
-                               CN\r
-\r
 78-C1-A7   (hex)               zte corporation\r
 78C1A7     (base 16)           zte corporation\r
                                12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
@@ -8495,12 +8471,6 @@ F0EE58     (base 16)             PACE Telematics GmbH
                                Karlsruhe    76131\r
                                DE\r
 \r
-4C-A0-03   (hex)               T-21 Technologies LLC\r
-4CA003     (base 16)           T-21 Technologies LLC\r
-                               3733 University Blvd West Suite 307B\r
-                               Jacksonville  FL  32217\r
-                               US\r
-\r
 08-3F-BC   (hex)               zte corporation\r
 083FBC     (base 16)           zte corporation\r
                                12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
@@ -8693,12 +8663,6 @@ B0E2E5     (base 16)             Fiberhome Telecommunication Technologies Co.,LTD
                                Wuhan City  Hubei Province  430074\r
                                CN\r
 \r
-40-47-6A   (hex)               AG Acquisition Corp. d.b.a. ASTRO Gaming\r
-40476A     (base 16)           AG Acquisition Corp. d.b.a. ASTRO Gaming\r
-                               655 4th St.\r
-                               San Francisco  CA  94107\r
-                               US\r
-\r
 00-1F-A7   (hex)               Sony Interactive Entertainment Inc.\r
 001FA7     (base 16)           Sony Interactive Entertainment Inc.\r
                                1-7-1 Konan\r
@@ -10571,18 +10535,6 @@ C056E3     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.
                                Hangzhou  Zhejiang  310052\r
                                CN\r
 \r
-00-19-77   (hex)               Aerohive Networks Inc.\r
-001977     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
-08-EA-44   (hex)               Aerohive Networks Inc.\r
-08EA44     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 EC-3E-F7   (hex)               Juniper Networks\r
 EC3EF7     (base 16)           Juniper Networks\r
                                1133 Innovation Way\r
@@ -13550,12 +13502,6 @@ ECE512     (base 16)           tado GmbH
                                Seongnam-si  Gyeonggi-do  463-400\r
                                KR\r
 \r
-D4-CF-F9   (hex)               Shenzhen Sen5 Technology Co., Ltd.\r
-D4CFF9     (base 16)           Shenzhen Sen5 Technology Co., Ltd.\r
-                               3F (East), Block D, SDG Infoport, No.2 Kefeng Road,Nanshan District\r
-                               Shenzhen  Guangdong  518057\r
-                               CN\r
-\r
 48-82-44   (hex)               Life Fitness / Div. of Brunswick\r
 488244     (base 16)           Life Fitness / Div. of Brunswick\r
                                10601 W. Belmont Ave\r
@@ -13577,12 +13523,6 @@ C83168     (base 16)           eZEX corporation
 24-33-6C   (hex)               Private\r
 24336C     (base 16)           Private\r
 \r
-B8-7C-F2   (hex)               Aerohive Networks Inc.\r
-B87CF2     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 20-25-64   (hex)               PEGATRON CORPORATION\r
 202564     (base 16)           PEGATRON CORPORATION\r
                                5F No. 76, Ligong St., Beitou District\r
@@ -23726,12 +23666,6 @@ D4C766     (base 16)           Acentic GmbH
                                seoul    137-874\r
                                KR\r
 \r
-00-12-58   (hex)               Activis Polska\r
-001258     (base 16)           Activis Polska\r
-                               Swierzawska 5\r
-                               Poznan  Wielkopolska  60-321\r
-                               PL\r
-\r
 00-12-50   (hex)               Tokyo Aircaft Instrument Co., Ltd.\r
 001250     (base 16)           Tokyo Aircaft Instrument Co., Ltd.\r
                                1-35-1, Izumi-Honcho\r
@@ -33065,6 +32999,408 @@ A4FA76     (base 16)          New H3C Technologies Co., Ltd
                                NO.68, Qinghe Middle Street  Haidian District, Beijing  100085\r
                                CN\r
 \r
+D8-4D-B9   (hex)               Wu Qi Technologies,Inc.\r
+D84DB9     (base 16)           Wu Qi Technologies,Inc.\r
+                               14/F, 107 Middle Road, Xiantao Big Data Valley, Yubei District\r
+                               Chongqing  Chongqing  401120\r
+                               CN\r
+\r
+A0-4F-85   (hex)               LG Electronics (Mobile Communications)\r
+A04F85     (base 16)           LG Electronics (Mobile Communications)\r
+                               60-39, Gasan-dong, Geumcheon-gu\r
+                               Seoul    153-801\r
+                               KR\r
+\r
+D8-07-B6   (hex)               TP-LINK TECHNOLOGIES CO.,LTD.\r
+D807B6     (base 16)           TP-LINK TECHNOLOGIES CO.,LTD.\r
+                               Building 24(floors 1,3,4,5)and 28(floors 1-4)Central Science and Technology Park,Shennan Road,Nanshan\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+64-6E-97   (hex)               TP-LINK TECHNOLOGIES CO.,LTD.\r
+646E97     (base 16)           TP-LINK TECHNOLOGIES CO.,LTD.\r
+                               Building 24(floors 1,3,4,5)and 28(floors 1-4)Central Science and Technology Park,Shennan Road,Nanshan\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+78-50-7C   (hex)               Juniper Networks\r
+78507C     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+00-12-58   (hex)               TechVoIP Sp z o.o.\r
+001258     (base 16)           TechVoIP Sp z o.o.\r
+                               Os. Boleslawa Chrobrego 117 \r
+                               Poznan  Wielkopolska  60-681\r
+                               PL\r
+\r
+6C-16-32   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+6C1632     (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-1A-01   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+2C1A01     (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-78-39   (hex)               zte corporation\r
+347839     (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-16-9D   (hex)               Cisco Systems, Inc\r
+24169D     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+F4-19-E2   (hex)               Volterra\r
+F419E2     (base 16)           Volterra\r
+                               2550 Great America Way #350\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+4C-A0-03   (hex)               VITEC\r
+4CA003     (base 16)           VITEC\r
+                               99 rue Pierre Semard\r
+                               Chatillon    92320\r
+                               FR\r
+\r
+64-F2-FB   (hex)               Hangzhou Ezviz Software Co.,Ltd.\r
+64F2FB     (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-80-9B   (hex)               New H3C Technologies Co., Ltd\r
+30809B     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+74-22-BB   (hex)               Huawei Device Co., Ltd.\r
+7422BB     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+6C-0D-34   (hex)               Nokia\r
+6C0D34     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+4C-45-76   (hex)               China Mobile(Hangzhou) Information Technology Co.,Ltd.\r
+4C4576     (base 16)           China Mobile(Hangzhou) Information Technology Co.,Ltd.\r
+                               No. 1600 Yuhangtang Road, Wuchang Street, Yuhang District\r
+                               Hangzhou  Zhejiang  310000\r
+                               CN\r
+\r
+B4-40-A4   (hex)               Apple, Inc.\r
+B440A4     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+48-B8-A3   (hex)               Apple, Inc.\r
+48B8A3     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+F4-DB-E3   (hex)               Apple, Inc.\r
+F4DBE3     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+BC-42-8C   (hex)               ALPS ELECTRIC CO., LTD.\r
+BC428C     (base 16)           ALPS ELECTRIC CO., LTD.\r
+                               nishida  6-1 \r
+                               Kakuda-City  Miyagi-Pref  981-1595\r
+                               JP\r
+\r
+F0-7C-C7   (hex)               Juniper Networks\r
+F07CC7     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+D4-5E-EC   (hex)               Beijing Xiaomi Electronics Co., Ltd.\r
+D45EEC     (base 16)           Beijing Xiaomi Electronics Co., Ltd.\r
+                               Building C, QingHe ShunShiJiaYe Technology Park, #66 ZhuFang Rd, HaiDian District\r
+                               Beijing  Beijing  10085\r
+                               CN\r
+\r
+74-C9-29   (hex)               Zhejiang Dahua Technology Co., Ltd.\r
+74C929     (base 16)           Zhejiang Dahua Technology Co., Ltd.\r
+                               No.1199,Waterfront Road \r
+                               Hangzhou  Zhejiang  310053\r
+                               CN\r
+\r
+D4-CF-F9   (hex)               Shenzhen SEI Robotics Co.,Ltd\r
+D4CFF9     (base 16)           Shenzhen SEI Robotics Co.,Ltd\r
+                               501,Productivity Building A, #5 Hi-Tech Middle 2nd Road\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+5C-B2-9E   (hex)               ASCO Power Technologies\r
+5CB29E     (base 16)           ASCO Power Technologies\r
+                               160 Park Avenue\r
+                               Florham Park  NJ  07932\r
+                               US\r
+\r
+9C-C9-EB   (hex)               NETGEAR\r
+9CC9EB     (base 16)           NETGEAR\r
+                               350 East Plumeria Drive\r
+                               San Jose  CA  95134\r
+                               US\r
+\r
+94-CC-04   (hex)               IEEE Registration Authority\r
+94CC04     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+90-EC-77   (hex)               silicom\r
+90EC77     (base 16)           silicom\r
+                               14 Atir-Yeda St/\r
+                               Kfar-Sava  Israel  44000\r
+                               IL\r
+\r
+88-C3-97   (hex)               Beijing Xiaomi Mobile Software Co., Ltd\r
+88C397     (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
+F0-F6-C1   (hex)               Sonos, Inc.\r
+F0F6C1     (base 16)           Sonos, Inc.\r
+                               614 Chapala St\r
+                               Santa Barbara  CA  93101\r
+                               US\r
+\r
+60-68-4E   (hex)               Samsung Electronics Co.,Ltd\r
+60684E     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+80-20-FD   (hex)               Samsung Electronics Co.,Ltd\r
+8020FD     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+B4-CE-40   (hex)               Samsung Electronics Co.,Ltd\r
+B4CE40     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+54-03-84   (hex)               Hongkong Nano IC Technologies Co., Ltd\r
+540384     (base 16)           Hongkong Nano IC Technologies Co., Ltd\r
+                               Rm. 19C, Lockhart Ctr., 301-307 Lockhart Rd., Wan Chai, Hong Kong\r
+                               Hong Kong  Hong Kong  999077\r
+                               CN\r
+\r
+04-BD-BF   (hex)               Samsung Electronics Co.,Ltd\r
+04BDBF     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+BC-7A-BF   (hex)               Samsung Electronics Co.,Ltd\r
+BC7ABF     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+B4-09-31   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+B40931     (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-E7-EA   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+94E7EA     (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-E4-BA   (hex)               Huawei Device Co., Ltd.\r
+94E4BA     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+34-71-46   (hex)               Huawei Device Co., Ltd.\r
+347146     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+2C-C5-46   (hex)               Huawei Device Co., Ltd.\r
+2CC546     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+0C-83-9A   (hex)               Huawei Device Co., Ltd.\r
+0C839A     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+E0-E0-FC   (hex)               Huawei Device Co., Ltd.\r
+E0E0FC     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+E0-D4-E8   (hex)               Intel Corporate\r
+E0D4E8     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+30-50-75   (hex)               GN Audio A/S\r
+305075     (base 16)           GN Audio A/S\r
+                               Lautrupbjerg 7\r
+                               Ballerup    DK-2750\r
+                               DK\r
+\r
+F4-B7-8D   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+F4B78D     (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-16-E7   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+A416E7     (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-B9-B0   (hex)               Intracom Asia Co., Ltd\r
+30B9B0     (base 16)           Intracom Asia Co., Ltd\r
+                               4F., No77, Sec. 1, Xintai 5th Rd., Xizhi Dist.\r
+                               New Taipei City  Taiwan  221\r
+                               TW\r
+\r
+0C-35-FE   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+0C35FE     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+8C-83-DF   (hex)               Nokia\r
+8C83DF     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+AC-4B-1E   (hex)               Integri-Sys.Com LLC\r
+AC4B1E     (base 16)           Integri-Sys.Com LLC\r
+                               9130 South Dadeland Bvld. Suite 1509\r
+                               Miami  FL  33156\r
+                               US\r
+\r
+B0-E4-D5   (hex)               Google, Inc.\r
+B0E4D5     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
+D4-DA-CD   (hex)               BSkyB Ltd\r
+D4DACD     (base 16)           BSkyB Ltd\r
+                               130 Kings Road\r
+                               Brentwood  Essex  08854\r
+                               GB\r
+\r
+68-69-CA   (hex)               Hitachi, Ltd.\r
+6869CA     (base 16)           Hitachi, Ltd.\r
+                               27-18, Minami Oi 6-chome, Shinagawa-ku\r
+                               Tokyo    140-8572\r
+                               JP\r
+\r
+AC-4A-56   (hex)               Cisco Systems, Inc\r
+AC4A56     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+F4-EA-B5   (hex)               Extreme Networks, Inc.\r
+F4EAB5     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+00-19-77   (hex)               Extreme Networks, Inc.\r
+001977     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+08-EA-44   (hex)               Extreme Networks, Inc.\r
+08EA44     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+B0-B5-C3   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+B0B5C3     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+70-4A-0E   (hex)               AMPAK Technology,Inc.\r
+704A0E     (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
+08-30-6B   (hex)               Palo Alto Networks\r
+08306B     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-86-9C   (hex)               Palo Alto Networks\r
+00869C     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+4C-B9-11   (hex)               Raisecom Technology CO.,LTD\r
+4CB911     (base 16)           Raisecom Technology CO.,LTD\r
+                               No. 11, East Area, No. 10 Block, East Xibeiwang Road\r
+                               Beijing    100094\r
+                               CN\r
+\r
+40-47-6A   (hex)               Astro Gaming\r
+40476A     (base 16)           Astro Gaming\r
+                               340 Bryant St., Suite 101\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+4C-CE-2D   (hex)               Danlaw Inc\r
+4CCE2D     (base 16)           Danlaw Inc\r
+                               23700 research Dr.\r
+                               Farmington Hills  MI  48335\r
+                               US\r
+\r
+B8-7C-F2   (hex)               Extreme Networks, Inc.\r
+B87CF2     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
 9C-FF-C2   (hex)               AVI Systems GmbH\r
 9CFFC2     (base 16)           AVI Systems GmbH\r
                                Dr. Franz Wilhelmstraße 2A\r
@@ -35033,12 +35369,6 @@ FC8F7D     (base 16)           SHENZHEN GONGJIN ELECTRONICS CO.,LT
                                Kwai Chung  New Territories  000\r
                                CN\r
 \r
-BC-F3-10   (hex)               Aerohive Networks Inc.\r
-BCF310     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 B4-1D-2B   (hex)               Shenzhen YOUHUA Technology Co., Ltd\r
 B41D2B     (base 16)           Shenzhen YOUHUA Technology Co., Ltd\r
                                Room 407 Shenzhen University-town Business Park,Lishan Road,Taoyuan Street,Nanshan District\r
@@ -37187,12 +37517,6 @@ F079E8     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
-08-66-1F   (hex)               Palo Alto Networks\r
-08661F     (base 16)           Palo Alto Networks\r
-                               4401 Great America Parkway\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 64-FB-50   (hex)               RoomReady/Zdi, Inc.\r
 64FB50     (base 16)           RoomReady/Zdi, Inc.\r
                                2200 N. Main Street\r
@@ -37475,12 +37799,6 @@ DCEB53     (base 16)           Wuhan QianXiao Elecronic Technology CO.,LTD
                                wuhan  hubei  430000\r
                                CN\r
 \r
-0C-B9-37   (hex)               Ubee Interactive Co., Limited\r
-0CB937     (base 16)           Ubee Interactive Co., Limited\r
-                               Room 1607 Dominion Centre, 43 Queen’s Road East\r
-                               Wanchai  Hong Kong  302\r
-                               HK\r
-\r
 EC-8A-C7   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
 EC8AC7     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
                                No.5 DongXin Road\r
@@ -38993,12 +39311,6 @@ E4186B     (base 16)           Zyxel Communications Corporation
                                Zory    44-240\r
                                PL\r
 \r
-D4-1D-71   (hex)               Palo Alto Networks\r
-D41D71     (base 16)           Palo Alto Networks\r
-                               4401 Great America Parkway\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 00-21-D1   (hex)               Samsung Electronics Co.,Ltd\r
 0021D1     (base 16)           Samsung Electronics Co.,Ltd\r
                                #94-1, Imsoo-Dong\r
@@ -39905,12 +40217,6 @@ E8886C     (base 16)           Shenzhen SC Technologies Co.,LTD
                                Shenzhen   Guangdong Province  518112\r
                                CN\r
 \r
-DC-35-F1   (hex)               Positivo Informática SA.\r
-DC35F1     (base 16)           Positivo Informática SA.\r
-                               Rua João Bettega, 5200\r
-                               Curitiba  Paraná  80730000\r
-                               BR\r
-\r
 00-24-FF   (hex)               QLogic Corporation\r
 0024FF     (base 16)           QLogic Corporation\r
                                26650 Aliso Viejo Parkway\r
@@ -42539,24 +42845,12 @@ B436A9     (base 16)          Fibocom Wireless Inc.
                                Dongguan  Guangdong  523808 \r
                                CN\r
 \r
-C8-66-5D   (hex)               Aerohive Networks Inc.\r
-C8665D     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 C8-47-8C   (hex)               Beken Corporation\r
 C8478C     (base 16)           Beken Corporation\r
                                Building 41, Capital of Tech Leaders, 1387 Zhangdong Road, Zhangjiang High-Tech Park, Pudong New District\r
                                Shanghai    201203\r
                                CN\r
 \r
-D8-54-A2   (hex)               Aerohive Networks Inc.\r
-D854A2     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 9C-EF-D5   (hex)               Panda Wireless, Inc.\r
 9CEFD5     (base 16)           Panda Wireless, Inc.\r
                                15559 Union Ave, Suite 300\r
@@ -42623,12 +42917,6 @@ E498D6     (base 16)           Apple, Inc.
                                Sunnyvale  CA  94089\r
                                US\r
 \r
-E0-1C-41   (hex)               Aerohive Networks Inc.\r
-E01C41     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 CC-A4-62   (hex)               ARRIS Group, Inc.\r
 CCA462     (base 16)           ARRIS Group, Inc.\r
                                6450 Sequence Drive\r
@@ -48152,12 +48440,6 @@ A47C14     (base 16)           ChargeStorm AB
                                Norrköping    60221\r
                                SE\r
 \r
-30-B2-16   (hex)               ABB AG - Power Grids - Grid Automation\r
-30B216     (base 16)           ABB AG - Power Grids - Grid Automation\r
-                               Kallstadter Strasse 1\r
-                               Mannheim    68309\r
-                               DE\r
-\r
 80-20-AF   (hex)               Trade FIDES, a.s.\r
 8020AF     (base 16)           Trade FIDES, a.s.\r
                                Dornych 57\r
@@ -51065,12 +51347,6 @@ D4AAFF     (base 16)           MICRO WORLD
                                Zirndorf    90513\r
                                DE\r
 \r
-00-26-74   (hex)               Electronic Solutions, Inc.\r
-002674     (base 16)           Electronic Solutions, Inc.\r
-                               1355 Horizon Avenue\r
-                               Lafayette  CO  80026\r
-                               US\r
-\r
 00-26-73   (hex)               RICOH COMPANY,LTD.\r
 002673     (base 16)           RICOH COMPANY,LTD.\r
                                810 Shimoimaizumi\r
@@ -58301,12 +58577,6 @@ D4AAFF     (base 16)           MICRO WORLD
                                Austin  TX  78730\r
                                US\r
 \r
-00-09-91   (hex)               GE Fanuc Automation Manufacturing, Inc.\r
-000991     (base 16)           GE Fanuc Automation Manufacturing, Inc.\r
-                               Route 606 & Route 29N\r
-                               Charlottesville  Virginia  22911\r
-                               US\r
-\r
 00-09-67   (hex)               Tachyon, Inc\r
 000967     (base 16)           Tachyon, Inc\r
                                9339 Carroll Park Drive\r
@@ -65096,12 +65366,6 @@ D446E1     (base 16)           Apple, Inc.
                                Qingdao  Shandong  266510\r
                                CN\r
 \r
-48-7B-5E   (hex)               Social Mobile\r
-487B5E     (base 16)           Social Mobile\r
-                               16400 NW 2nd AVE suite 201, #201\r
-                               Miami  FL  33169\r
-                               US\r
-\r
 44-A5-6E   (hex)               NETGEAR\r
 44A56E     (base 16)           NETGEAR\r
                                350 East Plumeria Drive\r
@@ -65144,30 +65408,492 @@ A87EEA     (base 16)         Intel Corporate
                                Padova    35129\r
                                IT\r
 \r
-48-4E-FC   (hex)               ARRIS Group, Inc.\r
-484EFC     (base 16)           ARRIS Group, Inc.\r
-                               6450 Sequence Drive\r
-                               San Diego  CA  92121\r
-                               US\r
-\r
 2C-57-41   (hex)               Cisco Systems, Inc\r
 2C5741     (base 16)           Cisco Systems, Inc\r
                                80 West Tasman Drive\r
                                San Jose  CA  94568\r
                                US\r
 \r
+A8-4D-4A   (hex)               Audiowise Technology Inc.\r
+A84D4A     (base 16)           Audiowise Technology Inc.\r
+                               2F, No 1-1, Innovation RD I, Hsinchu Science Park\r
+                               Hsincu  Taiwan  30076\r
+                               TW\r
+\r
+78-94-E8   (hex)               Radio Bridge\r
+7894E8     (base 16)           Radio Bridge\r
+                               8601 73rd Ave N, Suite 38\r
+                               Brooklyn Park  MN  55428\r
+                               US\r
+\r
+48-4E-FC   (hex)               ARRIS Group, Inc.\r
+484EFC     (base 16)           ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego  CA  92121\r
+                               US\r
+\r
 B0-B3-53   (hex)               IEEE Registration Authority\r
 B0B353     (base 16)           IEEE Registration Authority\r
                                445 Hoes Lane\r
                                Piscataway  NJ  08554\r
                                US\r
 \r
-A8-4D-4A   (hex)               Audiowise Technology Inc.\r
-A84D4A     (base 16)           Audiowise Technology Inc.\r
-                               2F, No 1-1, Innovation RD I, Hsinchu Science Park\r
-                               Hsincu  Taiwan  30076\r
+54-7F-BC   (hex)               iodyne\r
+547FBC     (base 16)           iodyne\r
+                               35 Miller Ave #175\r
+                               Mill Valley  CA  94941\r
+                               US\r
+\r
+7C-DF-A1   (hex)               Espressif Inc.\r
+7CDFA1     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+98-00-6A   (hex)               zte corporation\r
+98006A     (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-26-74   (hex)               Hunter Douglas\r
+002674     (base 16)           Hunter Douglas\r
+                               One Duette Way\r
+                               Broomfield  CO  80020\r
+                               US\r
+\r
+1C-97-C5   (hex)               Ynomia Pty Ltd\r
+1C97C5     (base 16)           Ynomia Pty Ltd\r
+                               153 Tooronga Rd\r
+                               Glen Iris    3146\r
+                               AU\r
+\r
+5C-C1-D7   (hex)               Samsung Electronics Co.,Ltd\r
+5CC1D7     (base 16)           Samsung Electronics Co.,Ltd\r
+                               129, Samsung-ro, Youngtongl-Gu\r
+                               Suwon  Gyeonggi-Do  16677\r
+                               KR\r
+\r
+38-01-46   (hex)               SHENZHEN BILIAN ELECTRONIC CO.，LTD\r
+380146     (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
+88-96-55   (hex)               Zitte corporation\r
+889655     (base 16)           Zitte corporation\r
+                               4F Yokohama Kusunoki-cho Building,4-7 Kusunoki-cho,Nishi-ku\r
+                               Yokohama  Kanagawa  2200003\r
+                               JP\r
+\r
+F4-A4-D6   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+F4A4D6     (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
+FC-E1-4F   (hex)               BRK Brands, Inc.\r
+FCE14F     (base 16)           BRK Brands, Inc.\r
+                               3901 Liberty Street\r
+                               Aurora  IL  60504\r
+                               US\r
+\r
+74-B6-B6   (hex)               eero inc.\r
+74B6B6     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+EC-97-B2   (hex)               SUMEC Machinery & Electric Co.,Ltd.\r
+EC97B2     (base 16)           SUMEC Machinery & Electric Co.,Ltd.\r
+                               198# ChangJiang Road, XuanWu District, 17F, SUMEC Building\r
+                               Nanjing  JiangSu  210018\r
+                               CN\r
+\r
+28-FA-7A   (hex)               Zhejiang Tmall Technology Co., Ltd.\r
+28FA7A     (base 16)           Zhejiang Tmall Technology Co., Ltd.\r
+                               Ali Center,No.3331 Keyuan South RD (Shenzhen bay), Nanshan District, Shenzhen Guangdong province\r
+                               Shenzhen  GuangDong  518000\r
+                               CN\r
+\r
+84-2E-14   (hex)               Silicon Laboratories\r
+842E14     (base 16)           Silicon Laboratories\r
+                               7000 W. William Cannon Dr.\r
+                               Austin  TX  78735\r
+                               US\r
+\r
+10-05-E1   (hex)               Nokia\r
+1005E1     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+08-F4-58   (hex)               Huawei Device Co., Ltd.\r
+08F458     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+5C-BA-2C   (hex)               Hewlett Packard Enterprise\r
+5CBA2C     (base 16)           Hewlett Packard Enterprise\r
+                               8000 Foothills Blvd.\r
+                               Roseville  CA  95747\r
+                               US\r
+\r
+34-37-94   (hex)               Hamee Corp.\r
+343794     (base 16)           Hamee Corp.\r
+                               Square O2 2-12-10 Sakae-cho\r
+                               Odawara  Kanagawa  250-0011\r
+                               JP\r
+\r
+40-EC-99   (hex)               Intel Corporate\r
+40EC99     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+6C-D9-4C   (hex)               vivo Mobile Communication Co., Ltd.\r
+6CD94C     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               #283,BBK Road\r
+                               Wusha,Chang'An  DongGuan City,Guangdong,  523860\r
+                               CN\r
+\r
+EC-31-6D   (hex)               Hansgrohe\r
+EC316D     (base 16)           Hansgrohe\r
+                               Auestraße 5-9\r
+                               Schiltach    77761\r
+                               DE\r
+\r
+BC-54-2F   (hex)               Intel Corporate\r
+BC542F     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+44-10-FE   (hex)               Huizhou Foryou General Electronics Co., Ltd.\r
+4410FE     (base 16)           Huizhou Foryou General Electronics Co., Ltd.\r
+                               North Shangxia Road, Dongjiang Hi-tech Industry Park\r
+                               Huizhou  Guangdong  516000\r
+                               CN\r
+\r
+7C-AB-60   (hex)               Apple, Inc.\r
+7CAB60     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+44-C6-5D   (hex)               Apple, Inc.\r
+44C65D     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+18-7E-B9   (hex)               Apple, Inc.\r
+187EB9     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+4C-A6-4D   (hex)               Cisco Systems, Inc\r
+4CA64D     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+CC-7F-75   (hex)               Cisco Systems, Inc\r
+CC7F75     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+20-E8-74   (hex)               Apple, Inc.\r
+20E874     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+D0-3F-AA   (hex)               Apple, Inc.\r
+D03FAA     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+0C-B9-37   (hex)               Ubee Interactive Co., Limited\r
+0CB937     (base 16)           Ubee Interactive Co., Limited\r
+                               Flat/RM 1202, 12/F, AT Tower \r
+                               North Point  Hong Kong  180\r
+                               HK\r
+\r
+D4-DC-09   (hex)               Mist Systems, Inc.\r
+D4DC09     (base 16)           Mist Systems, Inc.\r
+                               1601 South De Anza Blvd, Suite 248\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+00-88-BA   (hex)               NC&C\r
+0088BA     (base 16)           NC&C\r
+                               Gurogu\r
+                               Seoul    08390\r
+                               KR\r
+\r
+F4-73-35   (hex)               Logitech Far East\r
+F47335     (base 16)           Logitech Far East\r
+                               #2 Creation Rd. 4,\r
+                               Hsinchu    300\r
                                TW\r
 \r
+90-AD-FC   (hex)               Telechips, Inc.\r
+90ADFC     (base 16)           Telechips, Inc.\r
+                               19F~23F,Luther Bldg.42, Olympic-ro 35da-gil, Songpa-gu,\r
+                               Seoul  Seoul  05510\r
+                               KR\r
+\r
+5C-A6-2D   (hex)               Cisco Systems, Inc\r
+5CA62D     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+40-2B-69   (hex)               Kumho Electric Inc.\r
+402B69     (base 16)           Kumho Electric Inc.\r
+                               309, Bongmu-ro, Namsa-myeon, Cheoin-gu\r
+                               Yongin-si  Gyeonggi-do  17118\r
+                               KR\r
+\r
+E8-E9-8E   (hex)               SOLAR controls s.r.o.\r
+E8E98E     (base 16)           SOLAR controls s.r.o.\r
+                               Brojova 25\r
+                               Plzen    32600\r
+                               CZ\r
+\r
+64-F6-BB   (hex)               Fibocom Wireless Inc.\r
+64F6BB     (base 16)           Fibocom Wireless Inc.\r
+                               5/F,TowerA,Technology Building 2,1057 Nanhai Blvd, Nanshan\r
+                               Shenzhen  518000  Guangdong\r
+                               CN\r
+\r
+BC-16-95   (hex)               zte corporation\r
+BC1695     (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-35-F1   (hex)               Positivo Tecnologia S.A.\r
+DC35F1     (base 16)           Positivo Tecnologia S.A.\r
+                               João Bettega, 5200\r
+                               Curitiba  Paraná  81350-000\r
+                               BR\r
+\r
+A4-08-01   (hex)               Amazon Technologies Inc.\r
+A40801     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102\r
+                               Reno  NV  89507\r
+                               US\r
+\r
+AC-1E-D0   (hex)               Temic Automotive Philippines Inc.\r
+AC1ED0     (base 16)           Temic Automotive Philippines Inc.\r
+                               Bagsakan Road, FTI estate\r
+                               Taguig    1630\r
+                               PH\r
+\r
+2C-EA-7F   (hex)               Dell Inc.\r
+2CEA7F     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
+34-51-80   (hex)               TCL King Electrical Appliances (Huizhou) Co., Ltd\r
+345180     (base 16)           TCL King Electrical Appliances (Huizhou) Co., Ltd\r
+                               10F, TCL Multimedia Building, TCL International E City, No.1001 Zhongshanyuan Rd., Nanshan District\r
+                               Shenzhen  Guangdong  518052\r
+                               CN\r
+\r
+A4-CF-D2   (hex)               Ubee Interactive Co., Limited\r
+A4CFD2     (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
+A8-A0-97   (hex)               ScioTeq bvba\r
+A8A097     (base 16)           ScioTeq bvba\r
+                               President Kennedypark 35A\r
+                               Kortrijk    8500\r
+                               BE\r
+\r
+08-6B-D1   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
+086BD1     (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-3A-67   (hex)               Cisco Systems, Inc\r
+AC3A67     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+3C-B5-3D   (hex)               HUNAN GOKE MICROELECTRONICS CO.,LTD\r
+3CB53D     (base 16)           HUNAN GOKE MICROELECTRONICS CO.,LTD\r
+                               No.9, East 10th Road(South), Xingsha, Changsha\r
+                               Changsha  HUNAN  410131 \r
+                               CN\r
+\r
+98-0D-51   (hex)               Huawei Device Co., Ltd.\r
+980D51     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+00-AD-D5   (hex)               Huawei Device Co., Ltd.\r
+00ADD5     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+90-5D-7C   (hex)               New H3C Technologies Co., Ltd\r
+905D7C     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+98-FA-A7   (hex)               INNONET\r
+98FAA7     (base 16)           INNONET\r
+                               C-417, Munjeong Hyundai Knowledge Industry Center, Beobwon-ro 11-gil-7\r
+                               Songpa-gu  Seoul  05836\r
+                               KR\r
+\r
+48-7B-5E   (hex)               SMT TELECOMM HK\r
+487B5E     (base 16)           SMT TELECOMM HK\r
+                               Unit C 8/F Charmhill Centre 50 Hillwood RD.\r
+                               Tsim Sha Tsui  Kowloon  999077\r
+                               HK\r
+\r
+B8-E3-B1   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+B8E3B1     (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-B7-A8   (hex)               Heinzinger electronic GmbH\r
+00B7A8     (base 16)           Heinzinger electronic GmbH\r
+                               Anton Jakob Str.4\r
+                               Rosenheim  BY  83026\r
+                               DE\r
+\r
+34-CF-F6   (hex)               Intel Corporate\r
+34CFF6     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+EC-79-49   (hex)               FUJITSU LIMITED\r
+EC7949     (base 16)           FUJITSU LIMITED\r
+                               403, Kosugi-cho 1-chome, Nakahara-ku\r
+                               Kawasaki  Kanagawa  211-0063\r
+                               JP\r
+\r
+D4-D2-D6   (hex)               FN-LINK TECHNOLOGY LIMITED\r
+D4D2D6     (base 16)           FN-LINK TECHNOLOGY LIMITED\r
+                               A Building,HuiXin industial park,No 31, YongHe road, Fuyong town, Bao'an District\r
+                               SHENZHEN  GUANGDONG  518100\r
+                               CN\r
+\r
+10-50-72   (hex)               Sercomm Corporation.\r
+105072     (base 16)           Sercomm Corporation.\r
+                               3F,No.81,Yu-Yih Rd.,Chu-Nan Chen\r
+                               Miao-Lih Hsuan    115\r
+                               TW\r
+\r
+90-0A-84   (hex)               Mellanox Technologies, Inc.\r
+900A84     (base 16)           Mellanox Technologies, Inc.\r
+                               350 Oakmead Parkway, Suite 100 \r
+                               Sunnyvale  CA  94085\r
+                               US\r
+\r
+AC-4A-67   (hex)               Cisco Systems, Inc\r
+AC4A67     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+70-CA-97   (hex)               Ruckus Wireless\r
+70CA97     (base 16)           Ruckus Wireless\r
+                               350 West Java Drive\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+30-B2-16   (hex)               ABB Power Grids Germany AG – Grid Automation\r
+30B216     (base 16)           ABB Power Grids Germany AG – Grid Automation\r
+                               Kallstadter Strasse 1\r
+                               Mannheim    68309\r
+                               DE\r
+\r
+00-09-91   (hex)               Intelligent Platforms, LLC.\r
+000991     (base 16)           Intelligent Platforms, LLC.\r
+                               2500 Austin Drive\r
+                               Charlottesville  VA  22911\r
+                               US\r
+\r
+DC-33-3D   (hex)               Huawei Device Co., Ltd.\r
+DC333D     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+28-54-71   (hex)               Huawei Device Co., Ltd.\r
+285471     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+B8-8E-82   (hex)               Huawei Device Co., Ltd.\r
+B88E82     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+08-87-C6   (hex)               INGRAM MICRO SERVICES\r
+0887C6     (base 16)           INGRAM MICRO SERVICES\r
+                               100 CHEMIN DE BAILLOT\r
+                               MONTAUBAN    82000\r
+                               FR\r
+\r
+D4-1D-71   (hex)               Palo Alto Networks\r
+D41D71     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+08-66-1F   (hex)               Palo Alto Networks\r
+08661F     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+BC-F3-10   (hex)               Extreme Networks, Inc.\r
+BCF310     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+C8-66-5D   (hex)               Extreme Networks, Inc.\r
+C8665D     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+E0-1C-41   (hex)               Extreme Networks, Inc.\r
+E01C41     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+D8-54-A2   (hex)               Extreme Networks, Inc.\r
+D854A2     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
 84-80-94   (hex)               Meter, Inc.\r
 848094     (base 16)           Meter, Inc.\r
                                148 Townsend St\r
@@ -67190,12 +67916,6 @@ F47DEF     (base 16)           Samsung Electronics Co.,Ltd
                                Hsichu  Taiwan  300\r
                                TW\r
 \r
-98-ED-5C   (hex)               Tesla Motors, Inc\r
-98ED5C     (base 16)           Tesla Motors, Inc\r
-                               3500 Deer Creek Road\r
-                               Palo Alto  CA  94304\r
-                               US\r
-\r
 78-70-52   (hex)               Welotec GmbH\r
 787052     (base 16)           Welotec GmbH\r
                                zum Hagenbach 7\r
@@ -69314,12 +70034,6 @@ B0FC36     (base 16)           CyberTAN Technology Inc.
                                SAN DIEGO  CA  92121\r
                                US\r
 \r
-34-85-84   (hex)               Aerohive Networks Inc.\r
-348584     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 00-19-C2   (hex)               Equustek Solutions, Inc.\r
 0019C2     (base 16)           Equustek Solutions, Inc.\r
                                #286 - 5489 Byrne Road,\r
@@ -70304,12 +71018,6 @@ D8DF7A     (base 16)           Quest Software, Inc.
                                Aliso Viejo  CA  92656\r
                                US\r
 \r
-E4-A7-49   (hex)               Palo Alto Networks\r
-E4A749     (base 16)           Palo Alto Networks\r
-                               4401 Great America Pkwy\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 14-5B-E1   (hex)               nyantec GmbH\r
 145BE1     (base 16)           nyantec GmbH\r
                                Europaplatz 2\r
@@ -71444,12 +72152,6 @@ EC0D9A     (base 16)           Mellanox Technologies, Inc.
                                Shanghai  Shanghai  201203\r
                                CN\r
 \r
-20-6C-8A   (hex)               Aerohive Networks Inc.\r
-206C8A     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 3C-FA-43   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 3CFA43     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
@@ -75446,12 +76148,6 @@ E83EFC     (base 16)           ARRIS Group, Inc.
                                San Diego  CA  92121\r
                                US\r
 \r
-40-18-B1   (hex)               Aerohive Networks Inc.\r
-4018B1     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 8C-09-F4   (hex)               ARRIS Group, Inc.\r
 8C09F4     (base 16)           ARRIS Group, Inc.\r
                                6450 Sequence Drive\r
@@ -78596,12 +79292,6 @@ C89F1D     (base 16)           SHENZHEN COMMUNICATION TECHNOLOGIES CO.,LTD
                                Kunshan  Jiangsu  215300\r
                                CN\r
 \r
-88-5B-DD   (hex)               Aerohive Networks Inc.\r
-885BDD     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 08-74-F6   (hex)               Winterhalter Gastronom GmbH\r
 0874F6     (base 16)           Winterhalter Gastronom GmbH\r
                                Tettnanger Straße 72\r
@@ -80411,12 +81101,6 @@ F45214     (base 16)           Mellanox Technologies, Inc.
                                Bradenton  Florida  34203\r
                                US\r
 \r
-70-38-11   (hex)               Invensys Rail\r
-703811     (base 16)           Invensys Rail\r
-                               PO Box 79\r
-                               Chippenham  Wiltshire  SN15 1JD\r
-                               GB\r
-\r
 08-81-F4   (hex)               Juniper Networks\r
 0881F4     (base 16)           Juniper Networks\r
                                1133 Innovation Way\r
@@ -94943,12 +95627,6 @@ D8D67E     (base 16)           GSK CNC EQUIPMENT CO.,LTD
                                WARRENDALE  PA  15086\r
                                US\r
 \r
-00-E0-EC   (hex)               CELESTICA INC.\r
-00E0EC     (base 16)           CELESTICA INC.\r
-                               844 DON MILLS ROAD\r
-                               NORTH YORK  ONTARIO M3C 1V7    \r
-                               CA\r
-\r
 00-E0-6C   (hex)               Ultra Electronics Command & Control Systems\r
 00E06C     (base 16)           Ultra Electronics Command & Control Systems\r
                                Knaves Beech Business Centre\r
@@ -97835,48 +98513,456 @@ CC2D1B     (base 16)         SFR
                                ISSY LES MOULINEAUX    92130\r
                                FR\r
 \r
-80-30-49   (hex)               Liteon Technology Corporation\r
-803049     (base 16)           Liteon Technology Corporation\r
-                               4F, 90, Chien 1 Road\r
-                               New Taipei City  Taiwan  23585\r
+2C-F0-5D   (hex)               Micro-Star INTL CO., LTD.\r
+2CF05D     (base 16)           Micro-Star INTL CO., LTD.\r
+                               No.69, Lide St.,\r
+                               New Taipei City  Taiwan  235\r
                                TW\r
 \r
+94-3B-B0   (hex)               New H3C Technologies Co., Ltd\r
+943BB0     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
 90-43-E2   (hex)               Cornami, Inc\r
 9043E2     (base 16)           Cornami, Inc\r
                                300 Orchard City Dr, Suite 131\r
                                Campbell  CA  95008\r
                                US\r
 \r
+80-30-49   (hex)               Liteon Technology Corporation\r
+803049     (base 16)           Liteon Technology Corporation\r
+                               4F, 90, Chien 1 Road\r
+                               New Taipei City  Taiwan  23585\r
+                               TW\r
+\r
+E8-49-43   (hex)               YUGE Information technology Co. Ltd\r
+E84943     (base 16)           YUGE Information technology Co. Ltd\r
+                               Room 303, Building No. 6, ShengRong Rd. 88, Pudong, Shanghai\r
+                               Shanghai    201203\r
+                               CN\r
+\r
+50-14-08   (hex)               AiNET\r
+501408     (base 16)           AiNET\r
+                               11700 MONTGOMERY RD\r
+                               BELTSVILLE  MD  20705-1159\r
+                               US\r
+\r
 28-9A-F7   (hex)               ADVA Optical Networking Ltd.\r
 289AF7     (base 16)           ADVA Optical Networking Ltd.\r
                                ADVAntage House\r
                                York    YO30 4RY\r
                                GB\r
 \r
-E8-49-43   (hex)               YUGE Information technology Co. Ltd\r
-E84943     (base 16)           YUGE Information technology Co. Ltd\r
-                               Room 303, Building No. 6, ShengRong Rd. 88, Pudong, Shanghai\r
+B0-B1-94   (hex)               zte corporation\r
+B0B194     (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
+10-C3-AB   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+10C3AB     (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
+28-11-EC   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+2811EC     (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-26-86   (hex)               DWnet Technologies(Suzhou) Corporation\r
+E42686     (base 16)           DWnet Technologies(Suzhou) Corporation\r
+                               No.8,Tangzhuang Road, Suzhou Industrial Park, Jiangsu, China\r
+                               Suzhou    21500\r
+                               CN\r
+\r
+00-69-2D   (hex)               Sunnovo International Limited\r
+00692D     (base 16)           Sunnovo International Limited\r
+                               1717 Haitai Building\r
+                               Beijing  Beijing  100083\r
+                               CN\r
+\r
+38-EB-47   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+38EB47     (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
+0C-37-96   (hex)               BIZLINK TECHNOLOGY, INC.\r
+0C3796     (base 16)           BIZLINK TECHNOLOGY, INC.\r
+                               47211 BAYSIDE PARKWAY\r
+                               Fremont  CA  94538\r
+                               US\r
+\r
+F4-03-2A   (hex)               Amazon Technologies Inc.\r
+F4032A     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102\r
+                               Reno  NV  89507\r
+                               US\r
+\r
+14-77-40   (hex)               Huawei Device Co., Ltd.\r
+147740     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+B4-15-7E   (hex)               Celona Inc.\r
+B4157E     (base 16)           Celona Inc.\r
+                               10061, Bubb Road Suite 300\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+AC-CB-51   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+ACCB51     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+18-D9-8F   (hex)               Huawei Device Co., Ltd.\r
+18D98F     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+64-5E-2C   (hex)               IRay Technology Co., Ltd.\r
+645E2C     (base 16)           IRay Technology Co., Ltd.\r
+                               11th Guiyang St.,\r
+                               Yantai  Shandong  264000\r
+                               CN\r
+\r
+00-E0-EC   (hex)               CELESTICA INC.\r
+00E0EC     (base 16)           CELESTICA INC.\r
+                               1900-5140 Yonge Street PO Box 42   \r
+                               Toronto  Ontario  M2N 6L7\r
+                               CA\r
+\r
+70-38-11   (hex)               Siemens Mobility Limited\r
+703811     (base 16)           Siemens Mobility Limited\r
+                               17 Langley Park Way\r
+                               Chippenham  Wiltshire  SN15 1GG\r
+                               GB\r
+\r
+64-62-66   (hex)               IEEE Registration Authority\r
+646266     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+48-7A-F6   (hex)               NCS ELECTRICAL SDN BHD\r
+487AF6     (base 16)           NCS ELECTRICAL SDN BHD\r
+                               NO. 20, 22, 24, 26, JALAN 1/3, RAWANG INTEGRATED INDUSTRIAL PARK, 48000 Rawang Selangor, MALAYSIA\r
+                               RAWANG  SELANGOR  48000\r
+                               MY\r
+\r
+48-6E-70   (hex)               Zhejiang Tmall Technology Co., Ltd.\r
+486E70     (base 16)           Zhejiang Tmall Technology Co., Ltd.\r
+                               Ali Center,No.3331 Keyuan South RD (Shenzhen bay), Nanshan District, Shenzhen Guangdong province\r
+                               Shenzhen  GuangDong  518000\r
+                               CN\r
+\r
+60-1D-9D   (hex)               Sichuan AI-Link Technology Co., Ltd.\r
+601D9D     (base 16)           Sichuan AI-Link Technology Co., Ltd.\r
+                               Anzhou, Industrial Park\r
+                               Mianyang  Sichuan  622650\r
+                               CN\r
+\r
+D8-5F-77   (hex)               Telink Semiconductor (Shanghai) Co., Ltd.\r
+D85F77     (base 16)           Telink Semiconductor (Shanghai) Co., Ltd.\r
+                               No. 1500 Zuchongzhi Rd, Building #3\r
                                Shanghai    201203\r
                                CN\r
 \r
-2C-F0-5D   (hex)               Micro-Star INTL CO., LTD.\r
-2CF05D     (base 16)           Micro-Star INTL CO., LTD.\r
-                               No.69, Lide St.,\r
-                               New Taipei City  Taiwan  235\r
+2C-97-ED   (hex)               Sony Imaging Products & Solutions Inc.\r
+2C97ED     (base 16)           Sony Imaging Products & Solutions Inc.\r
+                               konan 1-7-1\r
+                               minato-ku  Tokyo  108-0075\r
+                               JP\r
+\r
+20-82-6A   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+20826A     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+B8-90-47   (hex)               Apple, Inc.\r
+B89047     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+90-9C-4A   (hex)               Apple, Inc.\r
+909C4A     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+90-8C-43   (hex)               Apple, Inc.\r
+908C43     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+18-8A-6A   (hex)               AVPro Global Hldgs\r
+188A6A     (base 16)           AVPro Global Hldgs\r
+                               2222 E 52nd Steeet N\r
+                               Sioux Falls  SD  57104\r
+                               US\r
+\r
+3C-7D-0A   (hex)               Apple, Inc.\r
+3C7D0A     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+D4-8A-39   (hex)               Samsung Electronics Co.,Ltd\r
+D48A39     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+E4-F3-C4   (hex)               Samsung Electronics Co.,Ltd\r
+E4F3C4     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+9C-2F-4E   (hex)               zte corporation\r
+9C2F4E     (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-10-90   (hex)               New H3C Technologies Co., Ltd\r
+F01090     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+08-BF-A0   (hex)               Samsung Electronics Co.,Ltd\r
+08BFA0     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+70-1F-3C   (hex)               Samsung Electronics Co.,Ltd\r
+701F3C     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+20-50-E7   (hex)               AMPAK Technology,Inc.\r
+2050E7     (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
-94-3B-B0   (hex)               New H3C Technologies Co., Ltd\r
-943BB0     (base 16)           New H3C Technologies Co., Ltd\r
+D8-A8-C8   (hex)               zte corporation\r
+D8A8C8     (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-22-E2   (hex)               HP Inc.\r
+3822E2     (base 16)           HP Inc.\r
+                               10300 Energy Dr\r
+                               Spring  TX  77389\r
+                               US\r
+\r
+08-C0-EB   (hex)               Mellanox Technologies, Inc.\r
+08C0EB     (base 16)           Mellanox Technologies, Inc.\r
+                               350 Oakmead Parkway, Suite 100 \r
+                               Sunnyvale  CA  94085\r
+                               US\r
+\r
+E4-E1-12   (hex)               Texas Instruments\r
+E4E112     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+34-14-B5   (hex)               Texas Instruments\r
+3414B5     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+D0-03-EB   (hex)               Texas Instruments\r
+D003EB     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+94-DB-56   (hex)               Sony Home Entertainment&Sound Products Inc\r
+94DB56     (base 16)           Sony Home Entertainment&Sound Products Inc\r
+                               Sony City Osaki 2-10-1 Osaki Shinagawa-ku\r
+                               Tokyo  Japan  141-8610\r
+                               JP\r
+\r
+88-9E-68   (hex)               Technicolor CH USA Inc.\r
+889E68     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6 \r
+                               Lawrenceville  GA  30044\r
+                               US\r
+\r
+64-09-AC   (hex)               TCT mobile ltd\r
+6409AC     (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
+74-3A-EF   (hex)               Kaonmedia CO., LTD.\r
+743AEF     (base 16)           Kaonmedia CO., LTD.\r
+                               884-3, Seongnam-daero, Bundang-gu\r
+                               Seongnam-si  Gyeonggi-do  13517\r
+                               KR\r
+\r
+54-48-E6   (hex)               Beijing Xiaomi Mobile Software Co.,Ltd\r
+5448E6     (base 16)           Beijing Xiaomi Mobile Software Co.,Ltd\r
+                               Xiaomi Campus, No. 33 Xi erqi Middle Road, Haidian District\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
+18-9E-2C   (hex)               Huawei Device Co., Ltd.\r
+189E2C     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+5C-55-78   (hex)               iryx corp\r
+5C5578     (base 16)           iryx corp\r
+                               14 Hughes\r
+                               Irvine  CA  92618\r
+                               US\r
+\r
+6C-F7-12   (hex)               Nokia\r
+6CF712     (base 16)           Nokia\r
+                               Karaportti 3\r
+                               Espoo  Finland  02610\r
+                               FI\r
+\r
+4C-C5-3E   (hex)               Zyxel Communications Corporation\r
+4CC53E     (base 16)           Zyxel Communications Corporation\r
+                               No. 6 Innovation Road II, Science Park\r
+                               Hsichu  Taiwan  300\r
+                               TW\r
+\r
+90-56-FC   (hex)               TECNO MOBILE LIMITED\r
+9056FC     (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
+B8-63-92   (hex)               GUANGDONG GENIUS TECHNOLOGY CO., LTD.\r
+B86392     (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
+68-B9-D3   (hex)               Shenzhen Trolink Technology CO, LTD\r
+68B9D3     (base 16)           Shenzhen Trolink Technology CO, LTD\r
+                               201 B building 4 shijie, Chashu industry 505 block, Baoan airport Sanwei community, Hangcheng street Baoan area.\r
+                               Shenzhen  GuangDong  518000\r
+                               CN\r
+\r
+B8-C6-AA   (hex)               Earda Technologies co Ltd\r
+B8C6AA     (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
+54-AE-D0   (hex)               DASAN Networks, Inc. \r
+54AED0     (base 16)           DASAN Networks, Inc. \r
+                               DASAN Tower, 49, Daewangpangyo-ro, 644 Beon-gil, Bundang-gu\r
+                               Seongnam-si  Gyeonggi-do  13493\r
+                               KR\r
+\r
+10-70-FD   (hex)               Mellanox Technologies, Inc.\r
+1070FD     (base 16)           Mellanox Technologies, Inc.\r
+                               350 Oakmead Parkway, Suite 100 \r
+                               Sunnyvale  CA  94085\r
+                               US\r
+\r
+38-F6-01   (hex)               Solid State Storage Technology Corporation\r
+38F601     (base 16)           Solid State Storage Technology Corporation\r
+                               21F, 392, Ruey Kuang Road, Neihu\r
+                                Taipei    11492\r
+                               TW\r
+\r
+40-DE-AD   (hex)               Juniper Networks\r
+40DEAD     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+40-F5-20   (hex)               Espressif Inc.\r
+40F520     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+78-AA-82   (hex)               New H3C Technologies Co., Ltd\r
+78AA82     (base 16)           New H3C Technologies Co., Ltd\r
                                466 Changhe Road, Binjiang District\r
                                Hangzhou  Zhejiang  310052\r
                                CN\r
 \r
-50-14-08   (hex)               AiNET\r
-501408     (base 16)           AiNET\r
-                               11700 MONTGOMERY RD\r
-                               BELTSVILLE  MD  20705-1159\r
+20-6C-8A   (hex)               Extreme Networks, Inc.\r
+206C8A     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
                                US\r
 \r
+34-85-84   (hex)               Extreme Networks, Inc.\r
+348584     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+40-18-B1   (hex)               Extreme Networks, Inc.\r
+4018B1     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+88-5B-DD   (hex)               Extreme Networks, Inc.\r
+885BDD     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+98-ED-5C   (hex)               Tesla,Inc.\r
+98ED5C     (base 16)           Tesla,Inc.\r
+                               3500 Deer Creek Road\r
+                               Palo Alto  CA  94304\r
+                               US\r
+\r
+C4-42-68   (hex)               CRESTRON ELECTRONICS, INC.\r
+C44268     (base 16)           CRESTRON ELECTRONICS, INC.\r
+                               15 Volvo Drive\r
+                               Rockleigh  NJ  07647\r
+                               US\r
+\r
+54-71-DD   (hex)               Huawei Device Co., Ltd.\r
+5471DD     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+E4-A7-49   (hex)               Palo Alto Networks\r
+E4A749     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+84-D6-C5   (hex)               SolarEdge Technologies\r
+84D6C5     (base 16)           SolarEdge Technologies\r
+                               1 Abba Eban St.\r
+                               Herzelia    46725\r
+                               IL\r
+\r
 F8-D0-27   (hex)               Seiko Epson Corporation\r
 F8D027     (base 16)           Seiko Epson Corporation\r
                                2070 Kotobuki Koaka\r
@@ -107357,12 +108443,6 @@ F88FCA     (base 16)         Google, Inc.
                                Giheung-gu, Yongin-City Kyungki-do    446-599\r
                                KR\r
 \r
-C8-67-5E   (hex)               Aerohive Networks Inc.\r
-C8675E     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 94-86-CD   (hex)               SEOUL ELECTRONICS&TELECOM\r
 9486CD     (base 16)           SEOUL ELECTRONICS&TELECOM\r
                                709, Namkwangcentrex 440-4, Cheongcheon-dong, \r
@@ -107387,24 +108467,6 @@ C8675E     (base 16)         Aerohive Networks Inc.
                                Hangzhou  Zhejiang  310052\r
                                CN\r
 \r
-F0-9C-E9   (hex)               Aerohive Networks Inc.\r
-F09CE9     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
-9C-5D-12   (hex)               Aerohive Networks Inc.\r
-9C5D12     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
-C4-13-E2   (hex)               Aerohive Networks Inc.\r
-C413E2     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 68-DB-CA   (hex)               Apple, Inc.\r
 68DBCA     (base 16)           Apple, Inc.\r
                                1 Infinite Loop\r
@@ -112676,12 +113738,6 @@ BC0200     (base 16)         Stewart Audio
                                Mountain View  CA  94041\r
                                US\r
 \r
-9C-61-1D   (hex)               Omni-ID USA, Inc.\r
-9C611D     (base 16)           Omni-ID USA, Inc.\r
-                               1200 Ridgeway Ave\r
-                               Rochester  NY  14615\r
-                               US\r
-\r
 48-91-53   (hex)               Weinmann Geräte für Medizin GmbH + Co. KG\r
 489153     (base 16)           Weinmann Geräte für Medizin GmbH + Co. KG\r
                                Kronsaalsweg 40\r
@@ -123362,12 +124418,6 @@ A07332     (base 16)         Cashmaster International Limited
                                San Jose  CA  95119\r
                                US\r
 \r
-00-0A-0D   (hex)               FCI Deutschland GmbH\r
-000A0D     (base 16)           FCI Deutschland GmbH\r
-                               Holzhauser Strasse 175\r
-                               13509 Berlin    \r
-                               DE\r
-\r
 00-09-A9   (hex)               Ikanos Communications\r
 0009A9     (base 16)           Ikanos Communications\r
                                47709 Fremont Blvd\r
@@ -129575,12 +130625,6 @@ D4F5EF     (base 16)         Hewlett Packard Enterprise
                                Roseville  CA  95747\r
                                US\r
 \r
-90-B8-32   (hex)               Aerohive Networks Inc.\r
-90B832     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 28-BD-89   (hex)               Google, Inc.\r
 28BD89     (base 16)           Google, Inc.\r
                                1600 Amphitheatre Parkway\r
@@ -130232,18 +131276,480 @@ ACF8CC     (base 16)               ARRIS Group, Inc.
                                REDMOND    98052\r
                                US\r
 \r
+CC-D4-2E   (hex)               Arcadyan Corporation\r
+CCD42E     (base 16)           Arcadyan Corporation\r
+                               No.8, Sec.2, Guangfu Rd.\r
+                               Hsinchu City  Hsinchu  30071\r
+                               TW\r
+\r
 C8-53-E1   (hex)               Beijing Bytedance Network Technology Co., Ltd\r
 C853E1     (base 16)           Beijing Bytedance Network Technology Co., Ltd\r
                                No.1 Building, Zhonghang Square, West Road of the Northern 3rd Circuit, Haidian Distrct\r
                                Beijing  Beijing  100098\r
                                CN\r
 \r
+14-16-9D   (hex)               Cisco Systems, Inc\r
+14169D     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+48-A2-E6   (hex)               Resideo\r
+48A2E6     (base 16)           Resideo\r
+                               2 Corporate Center Dr.\r
+                               Melville  NY  11747\r
+                               US\r
+\r
 90-E2-FC   (hex)               IEEE Registration Authority\r
 90E2FC     (base 16)           IEEE Registration Authority\r
                                445 Hoes Lane\r
                                Piscataway  NJ  08554\r
                                US\r
 \r
+F0-08-D1   (hex)               Espressif Inc.\r
+F008D1     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+58-94-B2   (hex)               BrainCo\r
+5894B2     (base 16)           BrainCo\r
+                               ????????????????1107?\r
+                               ???  ???  518000\r
+                               CN\r
+\r
+B0-95-75   (hex)               TP-LINK TECHNOLOGIES CO.,LTD.\r
+B09575     (base 16)           TP-LINK TECHNOLOGIES CO.,LTD.\r
+                               Building 24(floors 1,3,4,5)and 28(floors 1-4)Central Science and Technology Park,Shennan Road,Nanshan\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+B4-B0-55   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+B4B055     (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-8C-16   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+048C16     (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-DD-5B   (hex)               TAKUMI JAPAN LTD\r
+98DD5B     (base 16)           TAKUMI JAPAN LTD\r
+                               3-9-3 Uchiyama building 7F Nishishinbashi\r
+                               Minato-ku Tokyo  Tokyo  1050003\r
+                               JP\r
+\r
+3C-5C-F1   (hex)               eero inc.\r
+3C5CF1     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+14-AE-85   (hex)               IEEE Registration Authority\r
+14AE85     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+90-74-9D   (hex)               IRay Technology Co., Ltd.\r
+90749D     (base 16)           IRay Technology Co., Ltd.\r
+                               11th Guiyang St.,\r
+                               Yantai  Shandong  264000\r
+                               CN\r
+\r
+8C-3B-32   (hex)               Microfan B.V.\r
+8C3B32     (base 16)           Microfan B.V.\r
+                               Industriestraat 23\r
+                               Horst  Limburg  5961 PH\r
+                               NL\r
+\r
+D0-D3-E0   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+D0D3E0     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+3C-58-C2   (hex)               Intel Corporate\r
+3C58C2     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+CC-F9-E4   (hex)               Intel Corporate\r
+CCF9E4     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+64-5C-F3   (hex)               ParanTek Inc.\r
+645CF3     (base 16)           ParanTek Inc.\r
+                               3F, 40-15 Gilju-Ro, 411 Beon-Gil\r
+                               Wonmi-Gu, Bucheon City  Gyeonggi-Do  14488\r
+                               KR\r
+\r
+B0-CC-FE   (hex)               Huawei Device Co., Ltd.\r
+B0CCFE     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+54-0D-F9   (hex)               Huawei Device Co., Ltd.\r
+540DF9     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+00-66-19   (hex)               Huawei Device Co., Ltd.\r
+006619     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+FC-39-64   (hex)               ITEL MOBILE LIMITED\r
+FC3964     (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
+E4-5E-37   (hex)               Intel Corporate\r
+E45E37     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+14-47-2D   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+14472D     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+E4-90-FD   (hex)               Apple, Inc.\r
+E490FD     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+84-AB-1A   (hex)               Apple, Inc.\r
+84AB1A     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+20-6D-31   (hex)               FIREWALLA INC\r
+206D31     (base 16)           FIREWALLA INC\r
+                               75 E. Santa Clara St. STE 600\r
+                               San Jose  CA  95113\r
+                               US\r
+\r
+D0-65-44   (hex)               Apple, Inc.\r
+D06544     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+18-6F-2D   (hex)               Shenzhen Sundray Technologies Company Limited\r
+186F2D     (base 16)           Shenzhen Sundray Technologies Company Limited\r
+                               5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+F8-4F-AD   (hex)               Hui Zhou Gaoshengda Technology Co.,LTD\r
+F84FAD     (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
+4C-0A-3D   (hex)               ADNACOM INC.\r
+4C0A3D     (base 16)           ADNACOM INC.\r
+                               200-5050 Kingsway\r
+                               Burnaby  BC  V5H 4H2\r
+                               CA\r
+\r
+3C-80-6B   (hex)               Hunan Voc Acoustics Technology Co., Ltd.\r
+3C806B     (base 16)           Hunan Voc Acoustics Technology Co., Ltd.\r
+                               State Industrialpark, Jiulong Development Zone, Yanling County\r
+                               Zhuzhou  Hunan  412500\r
+                               CN\r
+\r
+60-DE-35   (hex)               GITSN, Inc.\r
+60DE35     (base 16)           GITSN, Inc.\r
+                                #601~602, Daerung Post Tower 1, 288, Digital-ro\r
+                               Guro-gu  Seoul  08390\r
+                               KR\r
+\r
+28-31-7E   (hex)               Hongkong Nano IC Technologies Co., Ltd\r
+28317E     (base 16)           Hongkong Nano IC Technologies Co., Ltd\r
+                                Rm. 19C, Lockhart Ctr., 301-307 Lockhart Rd., Wan Chai, Hong Kong.\r
+                               Hongkong    999077\r
+                               CN\r
+\r
+A8-41-22   (hex)               China Mobile (Hangzhou) Information Technology Co.,Ltd.\r
+A84122     (base 16)           China Mobile (Hangzhou) Information Technology Co.,Ltd.\r
+                               No. 1600 Yuhangtang Road, Wuchang Street, Yuhang District\r
+                               Hangzhou  Zhejiang  310000\r
+                               CN\r
+\r
+6C-DD-BC   (hex)               Samsung Electronics Co.,Ltd\r
+6CDDBC     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+CC-7F-76   (hex)               Cisco Systems, Inc\r
+CC7F76     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+40-BC-68   (hex)               Wuhan Funshion Online Technologies Co.,Ltd\r
+40BC68     (base 16)           Wuhan Funshion Online Technologies Co.,Ltd\r
+                               5th Floor,Financial Port Building A9,No.77 Optical Valley Avenue, East Lake High-Tech Development Zone, Wuhan\r
+                               Wuhan  CN/Hubei  430000\r
+                               CN\r
+\r
+DC-98-40   (hex)               Microsoft Corporation\r
+DC9840     (base 16)           Microsoft Corporation\r
+                               One Microsoft Way\r
+                               REDMOND    98052\r
+                               US\r
+\r
+44-76-54   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+447654     (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-D9-A0   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+7CD9A0     (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
+F0-33-E5   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+F033E5     (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-F1-8C   (hex)               Huawei Device Co., Ltd.\r
+B4F18C     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+B8-CE-F6   (hex)               Mellanox Technologies, Inc.\r
+B8CEF6     (base 16)           Mellanox Technologies, Inc.\r
+                               350 Oakmead Parkway, Suite 100 \r
+                               Sunnyvale  CA  94085\r
+                               US\r
+\r
+B8-02-A4   (hex)               Aeonsemi, Inc.\r
+B802A4     (base 16)           Aeonsemi, Inc.\r
+                               Cassia Court, Suite 716, 10 Market Street\r
+                               Camana Bay  Grand Cayman  KY1-9006\r
+                               KY\r
+\r
+E4-83-26   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+E48326     (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-05-BB   (hex)               IEEE Registration Authority\r
+9405BB     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+8C-5F-AD   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+8C5FAD     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+AC-C2-5D   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+ACC25D     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+8C-0C-87   (hex)               Nokia\r
+8C0C87     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+18-69-D8   (hex)               HANGZHOU AIXIANGJI TECHNOLOGY CO., LTD\r
+1869D8     (base 16)           HANGZHOU AIXIANGJI TECHNOLOGY CO., LTD\r
+                               7 Floor, 3 Blvd., More Centre, 87 Gudun Rd., Xihu District\r
+                               Hangzhou  Zhejiang  310012\r
+                               CN\r
+\r
+C4-32-D1   (hex)               Farlink Technology Limited\r
+C432D1     (base 16)           Farlink Technology Limited\r
+                               Flat A&B,9/F,Wing Cheong Factory Building,121 King Lam Street,Cheung Sha Wan,Hong Kong.\r
+                               Hongkong    0000\r
+                               HK\r
+\r
+CC-41-8E   (hex)               MSA Innovation\r
+CC418E     (base 16)           MSA Innovation\r
+                               1100 Cranberry Woods Road\r
+                               Cranberry Township  PA  16066\r
+                               US\r
+\r
+6C-6A-77   (hex)               Intel Corporate\r
+6C6A77     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+CC-A7-C1   (hex)               Google, Inc.\r
+CCA7C1     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
+38-84-79   (hex)               Cisco Meraki\r
+388479     (base 16)           Cisco Meraki\r
+                               500 Terry A. Francois Blvd\r
+                               San Francisco    94158\r
+                               US\r
+\r
+7C-9E-BD   (hex)               Espressif Inc.\r
+7C9EBD     (base 16)           Espressif Inc.\r
+                               Room 204, Building 2, 690 Bibo Rd, Pudong New Area\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+1C-02-19   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+1C0219     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+C8-D7-78   (hex)               BSH Hausgeraete GmbH\r
+C8D778     (base 16)           BSH Hausgeraete GmbH\r
+                               Im Gewerbepark B10\r
+                               Regensburg    93059\r
+                               DE\r
+\r
+9C-61-1D   (hex)               Panasonic Corporation of North America\r
+9C611D     (base 16)           Panasonic Corporation of North America\r
+                               1200 Ridgeway Ave\r
+                               Rochester  NY  14615\r
+                               US\r
+\r
+C0-95-DA   (hex)               NXP India Private Limited\r
+C095DA     (base 16)           NXP India Private Limited\r
+                               1st Floor, Muttha Towers, Don Bosco Marg, Off Airport Road, Yerwada\r
+                               Pune  Maharashtra  411006\r
+                               IN\r
+\r
+B4-22-00   (hex)               Brother Industries, LTD.\r
+B42200     (base 16)           Brother Industries, LTD.\r
+                               15-1, Naeshirocho, Mizuho-ku\r
+                               NAGOYA    4678561\r
+                               JP\r
+\r
+68-49-B2   (hex)               CARLO GAVAZZI LTD\r
+6849B2     (base 16)           CARLO GAVAZZI LTD\r
+                               BLB042, Bulebel Industrial Estate \r
+                               Zejtun     ZTN 3000\r
+                               MT\r
+\r
+48-7A-FF   (hex)               ESSYS\r
+487AFF     (base 16)           ESSYS\r
+                               gaetbeol-ro\r
+                               Incheon    21999\r
+                               KR\r
+\r
+40-B6-E7   (hex)               Huawei Device Co., Ltd.\r
+40B6E7     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+D0-B4-5D   (hex)               Huawei Device Co., Ltd.\r
+D0B45D     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+88-36-CF   (hex)               Huawei Device Co., Ltd.\r
+8836CF     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+A4-C5-4E   (hex)               Huawei Device Co., Ltd.\r
+A4C54E     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+D4-BB-E6   (hex)               Huawei Device Co., Ltd.\r
+D4BBE6     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+00-9E-EE   (hex)               Positivo Tecnologia S.A.\r
+009EEE     (base 16)           Positivo Tecnologia S.A.\r
+                               João Bettega, 5200\r
+                               Curitiba  Paraná  81350-000\r
+                               BR\r
+\r
+90-B8-32   (hex)               Extreme Networks, Inc.\r
+90B832     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+40-2F-86   (hex)               LG Innotek\r
+402F86     (base 16)           LG Innotek\r
+                               26, Hanamsandan 5beon-ro\r
+                               Gwangju  Gwangsan-gu  506-731\r
+                               KR\r
+\r
+D4-22-CD   (hex)               Xsens Technologies B.V.\r
+D422CD     (base 16)           Xsens Technologies B.V.\r
+                               Pantheon 6-a\r
+                               Enschede    7521 PR\r
+                               NL\r
+\r
+C8-67-5E   (hex)               Extreme Networks, Inc.\r
+C8675E     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+9C-5D-12   (hex)               Extreme Networks, Inc.\r
+9C5D12     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+F0-9C-E9   (hex)               Extreme Networks, Inc.\r
+F09CE9     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+C4-13-E2   (hex)               Extreme Networks, Inc.\r
+C413E2     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+00-0A-0D   (hex)               Amphenol\r
+000A0D     (base 16)           Amphenol\r
+                               Holzhauser Strasse 175\r
+                               Berlin    13509\r
+                               DE\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
@@ -132338,12 +133844,6 @@ CC988B     (base 16)         SONY Visual Products Inc.
                                Jinan  Shandong  250101\r
                                CN\r
 \r
-78-7D-53   (hex)               Aerohive Networks Inc.\r
-787D53     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 E0-45-6D   (hex)               China Mobile Group Device Co.,Ltd.\r
 E0456D     (base 16)           China Mobile Group Device Co.,Ltd.\r
                                32 Xuanwumen West Street,Xicheng District\r
@@ -134315,12 +135815,6 @@ D00401     (base 16)         Motorola Mobility LLC, a Lenovo Company
                                Rueil Malmaison Cedex  hauts de seine  92848\r
                                FR\r
 \r
-28-56-C1   (hex)               Harman International\r
-2856C1     (base 16)           Harman International\r
-                               15th Fl, 400 Atlantic Street\r
-                               Stamford  CT  06901\r
-                               US\r
-\r
 B4-A3-82   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
 B4A382     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
                                No.555 Qianmo Road\r
@@ -134921,24 +136415,6 @@ A40450     (base 16)         nFore Technology Inc.
                                Taipei  Neihu District  11491\r
                                TW\r
 \r
-00-1B-17   (hex)               Palo Alto Networks\r
-001B17     (base 16)           Palo Alto Networks\r
-                               2130 Gold Street Suite 200\r
-                               Alviso  CA  95022\r
-                               US\r
-\r
-58-49-3B   (hex)               Palo Alto Networks\r
-58493B     (base 16)           Palo Alto Networks\r
-                               4401 Great America Parkway\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-78-6D-94   (hex)               Palo Alto Networks\r
-786D94     (base 16)           Palo Alto Networks\r
-                               4401 Great America Pkwy\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 FC-5A-1D   (hex)               Hitron Technologies. Inc\r
 FC5A1D     (base 16)           Hitron Technologies. Inc\r
                                No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C\r
@@ -136226,12 +137702,6 @@ C82158     (base 16)         Intel Corporate
                                Kulim  Kedah  09000\r
                                MY\r
 \r
-7C-95-B1   (hex)               Aerohive Networks Inc.\r
-7C95B1     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 24-20-C7   (hex)               Sagemcom Broadband SAS\r
 2420C7     (base 16)           Sagemcom Broadband SAS\r
                                250, route de l'Empereur\r
@@ -137666,12 +139136,6 @@ D0052A     (base 16)         Arcadyan Corporation
                                Hsinchu City  Hsinchu  30071\r
                                TW\r
 \r
-EC-68-81   (hex)               Palo Alto Networks\r
-EC6881     (base 16)           Palo Alto Networks\r
-                               4401 Great America Parkway\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 E4-50-9A   (hex)               HW Communications Ltd\r
 E4509A     (base 16)           HW Communications Ltd\r
                                Parkfield\r
@@ -139112,12 +140576,6 @@ CC6DA0     (base 16)         Roku, Inc.
                                San Diego  CA  92101\r
                                US\r
 \r
-6C-38-A1   (hex)               Ubee Interactive Co., Limited\r
-6C38A1     (base 16)           Ubee Interactive Co., Limited\r
-                               Room 1607 Dominion Centre, 43 Queen’s Road East\r
-                               Wanchai  Hong Kong  302\r
-                               HK\r
-\r
 00-17-42   (hex)               FUJITSU LIMITED\r
 001742     (base 16)           FUJITSU LIMITED\r
                                403, Kosugi-cho 1-chome, Nakahara-ku\r
@@ -145229,12 +146687,6 @@ FC0647     (base 16)         Cortland Research, LLC
                                Sunnyvale  CA  94089\r
                                US\r
 \r
-70-76-DD   (hex)               Oxyguard International A/S\r
-7076DD     (base 16)           Oxyguard International A/S\r
-                               Blokken 59\r
-                               Birkeroed    DK-3460\r
-                               DK\r
-\r
 54-61-EA   (hex)               Zaplox AB\r
 5461EA     (base 16)           Zaplox AB\r
                                Scheelev\r
@@ -145859,12 +147311,6 @@ CC14A6     (base 16)         Yichun MyEnergy Domain, Inc
                                Santa Clara  CA  95054\r
                                US\r
 \r
-64-7C-34   (hex)               Ubee Interactive Co., Limited\r
-647C34     (base 16)           Ubee Interactive Co., Limited\r
-                               Room 1607 Dominion Centre, 43 Queen’s Road East\r
-                               Wanchai  Hong Kong  302\r
-                               HK\r
-\r
 C0-A3-64   (hex)               3D Systems Massachusetts\r
 C0A364     (base 16)           3D Systems Massachusetts\r
                                19 Connector Road\r
@@ -151397,12 +152843,6 @@ EC6C9F     (base 16)         Chengdu Volans Technology CO.,LTD
                                Shindian  Taipei  231\r
                                TW\r
 \r
-00-1B-85   (hex)               MAN Diesel SE\r
-001B85     (base 16)           MAN Diesel SE\r
-                               Teglholmsgade 41\r
-                               Copenhagen    2450\r
-                               DK\r
-\r
 00-1B-89   (hex)               EMZA Visual Sense Ltd.\r
 001B89     (base 16)           EMZA Visual Sense Ltd.\r
                                20 Ha'ta'as St., Beith Hapamon\r
@@ -154370,12 +155810,6 @@ EC6C9F     (base 16)         Chengdu Volans Technology CO.,LTD
                                Seoul    135-010\r
                                KR\r
 \r
-00-0E-F3   (hex)               Smarthome\r
-000EF3     (base 16)           Smarthome\r
-                               16542 Millikan Ave.\r
-                               Irvine  CA  92606\r
-                               US\r
-\r
 00-0E-F2   (hex)               Infinico Corporation\r
 000EF2     (base 16)           Infinico Corporation\r
                                4F, F-1 Bldg., 1-2-12,\r
@@ -159464,12 +160898,6 @@ EC6C9F     (base 16)         Chengdu Volans Technology CO.,LTD
                                LENEXA  KS  66215-1239\r
                                US\r
 \r
-00-10-7F   (hex)               CRESTRON ELECTRONICS, INC.\r
-00107F     (base 16)           CRESTRON ELECTRONICS, INC.\r
-                               101 BROADWAY\r
-                               CRESSKILL  NJ  07626\r
-                               US\r
-\r
 00-10-E2   (hex)               ArrayComm, Inc.\r
 0010E2     (base 16)           ArrayComm, Inc.\r
                                3141 ZANKER ROAD\r
@@ -162101,12 +163529,6 @@ CC32E5     (base 16)         TP-LINK TECHNOLOGIES CO.,LTD.
                                Guangzhou  Guangdong  511450\r
                                CN\r
 \r
-58-59-C2   (hex)               Aerohive Networks Inc.\r
-5859C2     (base 16)           Aerohive Networks Inc.\r
-                               1011 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
 14-59-C3   (hex)               Creative Chips GmbH\r
 1459C3     (base 16)           Creative Chips GmbH\r
                                Im Bubenstück 1\r
@@ -162875,12 +164297,54 @@ A8705D     (base 16)                ARRIS Group, Inc.
                                Shenzhen  Guangdong  518055\r
                                CN\r
 \r
-F0-46-3B   (hex)               Comcast Cable Corporation\r
-F0463B     (base 16)           Comcast Cable Corporation\r
-                               1800 Arch Street\r
-                               Philadelphia  PA  19103\r
+1C-05-B7   (hex)               Chongqing Trantor Technology Co., Ltd.\r
+1C05B7     (base 16)           Chongqing Trantor Technology Co., Ltd.\r
+                               No.69,Huoju Avenue,Jiulongpo District.\r
+                               Chongqing  Chongqing  400050\r
+                               CN\r
+\r
+00-0E-F3   (hex)               Smartlabs, Inc. \r
+000EF3     (base 16)           Smartlabs, Inc. \r
+                               1621 Alton Parkway, Suite 100\r
+                               Irvine  CA  92606\r
+                               US\r
+\r
+A0-43-B0   (hex)               Hangzhou BroadLink Technology Co.,Ltd\r
+A043B0     (base 16)           Hangzhou BroadLink Technology Co.,Ltd\r
+                               Room 101,1/F,Unit C,Building 1,No.57 Jiang'er Road,Changhe Street,Binjiang District,Hangzhou,Zhejiang,P.R.China\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+74-AC-B9   (hex)               Ubiquiti Networks Inc.\r
+74ACB9     (base 16)           Ubiquiti Networks Inc.\r
+                               2580 Orchard Pkwy\r
+                               San Jose  CA  95131\r
+                               US\r
+\r
+F4-92-BF   (hex)               Ubiquiti Networks Inc.\r
+F492BF     (base 16)           Ubiquiti Networks Inc.\r
+                               2580 Orchard Pkwy\r
+                               San Jose  CA  95131\r
                                US\r
 \r
+D8-C5-61   (hex)               CommFront Communications Pte Ltd\r
+D8C561     (base 16)           CommFront Communications Pte Ltd\r
+                               No. 1 Yishun Industrial ST 1, #05-31 A'Posh BizHub\r
+                               SG  SG  768160\r
+                               SG\r
+\r
+0C-29-EF   (hex)               Dell Inc.\r
+0C29EF     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
+60-D8-9C   (hex)               HMD Global Oy\r
+60D89C     (base 16)           HMD Global Oy\r
+                               Bertel Jungin aukio 9\r
+                               Espoo    02600\r
+                               FI\r
+\r
 F8-2E-8E   (hex)               Nanjing Kechen Electric Co., Ltd.\r
 F82E8E     (base 16)           Nanjing Kechen Electric Co., Ltd.\r
                                Room 202, Building 12, No. 50 Daguang road\r
@@ -162892,3 +164356,405 @@ B4C9B9     (base 16)                Sichuan AI-Link Technology Co., Ltd.
                                Anzhou, Industrial Park\r
                                Mianyang  Sichuan  622650\r
                                CN\r
+\r
+F0-46-3B   (hex)               Comcast Cable Corporation\r
+F0463B     (base 16)           Comcast Cable Corporation\r
+                               1800 Arch Street\r
+                               Philadelphia  PA  19103\r
+                               US\r
+\r
+68-D7-9A   (hex)               Ubiquiti Networks Inc.\r
+68D79A     (base 16)           Ubiquiti Networks Inc.\r
+                               2580 Orchard Pkwy\r
+                               San Jose  CA  95131\r
+                               US\r
+\r
+1C-63-BF   (hex)               SHENZHEN BROADTEL  TELECOM CO.,LTD\r
+1C63BF     (base 16)           SHENZHEN BROADTEL  TELECOM CO.,LTD\r
+                               No.14-1, Tongqing Road, Baolong street, Longgang District\r
+                               ShenZhen  GuangDong  518116\r
+                               CN\r
+\r
+AC-36-51   (hex)               Jiangsu Hengtong Terahertz Technology Co., Ltd.\r
+AC3651     (base 16)           Jiangsu Hengtong Terahertz Technology Co., Ltd.\r
+                               Room 1312, Beiyou Technology Building, Haidian District\r
+                               Beijing  Beijing  100876\r
+                               CN\r
+\r
+68-4A-76   (hex)               eero inc.\r
+684A76     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+68-8F-C9   (hex)               Zhuolian (Shenzhen) Communication Co., Ltd\r
+688FC9     (base 16)           Zhuolian (Shenzhen) Communication Co., Ltd\r
+                               Shengli electromechanical Co., Ltd. 201, No.19, Xixiang section, Guangshen Road, Jingbei community, Xixiang street, Bao'an District\r
+                               Shenzhen  Shenzhen  518101\r
+                               CN\r
+\r
+F0-81-75   (hex)               Sagemcom Broadband SAS\r
+F08175     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+D8-47-32   (hex)               TP-LINK TECHNOLOGIES CO.,LTD.\r
+D84732     (base 16)           TP-LINK TECHNOLOGIES CO.,LTD.\r
+                               Building 24(floors 1,3,4,5)and 28(floors 1-4)Central Science and Technology Park,Shennan Road,Nanshan\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+28-64-B0   (hex)               Huawei Device Co., Ltd.\r
+2864B0     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+04-F1-69   (hex)               Huawei Device Co., Ltd.\r
+04F169     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+50-21-EC   (hex)               Huawei Device Co., Ltd.\r
+5021EC     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+8C-68-3A   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+8C683A     (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-6E-08   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+B46E08     (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-5E-0C   (hex)               HMD Global Oy\r
+005E0C     (base 16)           HMD Global Oy\r
+                               Bertel Jungin aukio 9\r
+                               Espoo    02600\r
+                               FI\r
+\r
+B4-81-07   (hex)               SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD\r
+B48107     (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
+70-66-55   (hex)               AzureWave Technology Inc.\r
+706655     (base 16)           AzureWave Technology Inc.\r
+                               8F., No. 94, Baozhong Rd.\r
+                               New Taipei City  Taiwan  231\r
+                               TW\r
+\r
+C8-58-C0   (hex)               Intel Corporate\r
+C858C0     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+64-7C-34   (hex)               Ubee Interactive Co., Limited\r
+647C34     (base 16)           Ubee Interactive Co., Limited\r
+                               Flat/RM 1202, 12/F, AT Tower \r
+                               North Point  Hong Kong  180\r
+                               HK\r
+\r
+6C-38-A1   (hex)               Ubee Interactive Co., Limited\r
+6C38A1     (base 16)           Ubee Interactive Co., Limited\r
+                               Flat/RM 1202, 12/F, AT Tower \r
+                               North Point  Hong Kong  180\r
+                               HK\r
+\r
+78-53-0D   (hex)               Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+78530D     (base 16)           Shenzhen Skyworth  Digital  Technology  CO., Ltd\r
+                               4F,Block A, Skyworth?Building,\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+0C-48-C6   (hex)               CELESTICA INC.\r
+0C48C6     (base 16)           CELESTICA INC.\r
+                               1900-5140 Yonge Street PO Box 42   \r
+                               Toronto  Ontario  M2N 6L7\r
+                               CA\r
+\r
+A4-29-85   (hex)               Sichuan AI-Link Technology Co., Ltd.\r
+A42985     (base 16)           Sichuan AI-Link Technology Co., Ltd.\r
+                               Anzhou, Industrial Park\r
+                               Mianyang  Sichuan  622650\r
+                               CN\r
+\r
+78-AC-44   (hex)               Dell Inc.\r
+78AC44     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
+98-C8-B8   (hex)               vivo Mobile Communication Co., Ltd.\r
+98C8B8     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               #283,BBK Road\r
+                               Wusha,Chang'An  DongGuan City,Guangdong,  523860\r
+                               CN\r
+\r
+B8-D4-E7   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+B8D4E7     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+D8-4C-90   (hex)               Apple, Inc.\r
+D84C90     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+24-D0-DF   (hex)               Apple, Inc.\r
+24D0DF     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+6C-4A-85   (hex)               Apple, Inc.\r
+6C4A85     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+28-F0-33   (hex)               Apple, Inc.\r
+28F033     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+20-9E-F7   (hex)               Extreme Networks, Inc.\r
+209EF7     (base 16)           Extreme Networks, Inc.\r
+                               6480 Via Del Oro\r
+                               San Jose  CA  95119\r
+                               US\r
+\r
+BC-09-63   (hex)               Apple, Inc.\r
+BC0963     (base 16)           Apple, Inc.\r
+                               1 Infinite Loop\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+18-58-69   (hex)               Sailer Electronic Co., Ltd\r
+185869     (base 16)           Sailer Electronic Co., Ltd\r
+                               No. 6, Sanxi Road, Ximagou Industrial Park, Jianxi District\r
+                               Luoyang  Henan  471000\r
+                               CN\r
+\r
+BC-2D-EF   (hex)               Realme Chongqing Mobile Telecommunications Corp.,Ltd.\r
+BC2DEF     (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
+78-81-CE   (hex)               China Mobile Iot Limited company\r
+7881CE     (base 16)           China Mobile Iot Limited company\r
+                               No. 8 Yangliu North Road, Yubei District, Chongqing, China\r
+                               Chong Qing  Chong Qing  401120\r
+                               CN\r
+\r
+BC-FF-21   (hex)               Smart Code(shenzhen)Technology Co.,Ltd\r
+BCFF21     (base 16)           Smart Code(shenzhen)Technology Co.,Ltd\r
+                               Room 1206, Satellite Building,2002 Keyuan Road, Nanshan \r
+                               Shenzhen   Guangdong (Province)   518000\r
+                               CN\r
+\r
+44-5C-E9   (hex)               Samsung Electronics Co.,Ltd\r
+445CE9     (base 16)           Samsung Electronics Co.,Ltd\r
+                               129, Samsung-ro, Youngtongl-Gu\r
+                               Suwon  Gyeonggi-Do  16677\r
+                               KR\r
+\r
+C0-16-92   (hex)               China Mobile Group Device Co.,Ltd.\r
+C01692     (base 16)           China Mobile Group Device Co.,Ltd.\r
+                               32 Xuanwumen West Street,Xicheng District\r
+                               Beijing    100053\r
+                               CN\r
+\r
+38-17-30   (hex)               Ulrich Lippert GmbH & Co KG\r
+381730     (base 16)           Ulrich Lippert GmbH & Co KG\r
+                               Christian-Henkel-Str. 12\r
+                               Berlin    12349\r
+                               DE\r
+\r
+40-2E-71   (hex)               Texas Instruments\r
+402E71     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+70-76-DD   (hex)               OxyGuard Internation A/S\r
+7076DD     (base 16)           OxyGuard Internation A/S\r
+                               Farum Gydevej 64\r
+                               Farum    DK-3520\r
+                               DK\r
+\r
+94-E9-EE   (hex)               Huawei Device Co., Ltd.\r
+94E9EE     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+28-E3-4E   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+28E34E     (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-12-03   (hex)               Intel Corporate\r
+AC1203     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+64-BC-58   (hex)               Intel Corporate\r
+64BC58     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+D4-52-EE   (hex)               BSkyB Ltd\r
+D452EE     (base 16)           BSkyB Ltd\r
+                               130 Kings Road\r
+                               Brentwood  Essex  08854\r
+                               GB\r
+\r
+E0-23-FF   (hex)               Fortinet, Inc.\r
+E023FF     (base 16)           Fortinet, Inc.\r
+                               899 Kifer Road\r
+                               Sunnyvale    94086\r
+                               US\r
+\r
+8C-59-DC   (hex)               ASR Microelectronics (Shanghai) Co., Ltd.\r
+8C59DC     (base 16)           ASR Microelectronics (Shanghai) Co., Ltd.\r
+                               Building 2, NO.399 Keyuan Road,Pudong District\r
+                               Shanghai  Shanghai  201210\r
+                               CN\r
+\r
+18-82-8C   (hex)               Arcadyan Corporation\r
+18828C     (base 16)           Arcadyan Corporation\r
+                               No.8, Sec.2, Guangfu Rd.\r
+                               Hsinchu City  Hsinchu  30071\r
+                               TW\r
+\r
+9C-F0-29   (hex)               Integrated Device Technology (Malaysia) Sdn. Bhd.\r
+9CF029     (base 16)           Integrated Device Technology (Malaysia) Sdn. Bhd.\r
+                               Phase 3, Bayan Lepas FIZ\r
+                               Bayan Lepas  Penang  11900\r
+                               MY\r
+\r
+28-56-C1   (hex)               Harman/Becker Automotive Systems GmbH\r
+2856C1     (base 16)           Harman/Becker Automotive Systems GmbH\r
+                               15th Fl, 400 Atlantic Street\r
+                               Stamford  CT  06901\r
+                               US\r
+\r
+78-B8-D6   (hex)               Zebra Technologies Inc.\r
+78B8D6     (base 16)           Zebra Technologies Inc.\r
+                               ONE ZEBRA PLAZA\r
+                               HOLTSVILLE  NY  11742\r
+                               US\r
+\r
+BC-4A-56   (hex)               Cisco Systems, Inc\r
+BC4A56     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+6C-61-F4   (hex)               SFR\r
+6C61F4     (base 16)           SFR\r
+                               12 rue jean-philippe Rameau CS 80001\r
+                               La plaine saint denis   FRANCE  93634\r
+                               FR\r
+\r
+F4-90-CB   (hex)               IEEE Registration Authority\r
+F490CB     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+00-10-7F   (hex)               CRESTRON ELECTRONICS, INC.\r
+00107F     (base 16)           CRESTRON ELECTRONICS, INC.\r
+                               15 Volvo Drive\r
+                               Rockleigh  NJ  07647\r
+                               US\r
+\r
+00-1B-85   (hex)               MAN Energy Solutions\r
+001B85     (base 16)           MAN Energy Solutions\r
+                               Teglholmsgade 41\r
+                               Copenhagen    2450\r
+                               DK\r
+\r
+58-49-3B   (hex)               Palo Alto Networks\r
+58493B     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-1B-17   (hex)               Palo Alto Networks\r
+001B17     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+58-59-C2   (hex)               Extreme Networks, Inc.\r
+5859C2     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+B8-2F-CB   (hex)               CMS Electracom\r
+B82FCB     (base 16)           CMS Electracom\r
+                               24 Binney Road\r
+                               Kings Park  NSW  2148\r
+                               AU\r
+\r
+10-CE-45   (hex)               Miromico AG\r
+10CE45     (base 16)           Miromico AG\r
+                               Gallusstrasse 4\r
+                               Zurich  Zurich  CH-8006\r
+                               CH\r
+\r
+78-7D-53   (hex)               Extreme Networks, Inc.\r
+787D53     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+7C-95-B1   (hex)               Extreme Networks, Inc.\r
+7C95B1     (base 16)           Extreme Networks, Inc.\r
+                               1011 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
+\r
+EC-68-81   (hex)               Palo Alto Networks\r
+EC6881     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+78-6D-94   (hex)               Palo Alto Networks\r
+786D94     (base 16)           Palo Alto Networks\r
+                               3000 Tannery Way\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+F8-AF-05   (hex)               Huawei Device Co., Ltd.\r
+F8AF05     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+4C-FC-AA   (hex)               Tesla,Inc.\r
+4CFCAA     (base 16)           Tesla,Inc.\r
+                               3500 Deer Creek Rd.\r
+                               PALO ALTO  CA  94304\r
+                               US\r

diff --git a/hwdb.d/ma-medium.txt b/hwdb.d/ma-medium.txt
index f389a3dd65dbce96c69b8cc0e5ff3b44af057297..b2cb19a8323014d99c676c4aac0698987e856fd3 100644 (file)
--- a/hwdb.d/ma-medium.txt
+++ b/hwdb.d/ma-medium.txt
@@ -3560,12 +3560,6 @@ E00000-EFFFFF     (base 16)              Nanjing Yining Intelligent Technology Co., Ltd.
                                Nanjing  Jiangsu  210019\r
                                CN\r
 \r
-B0-B3-53   (hex)               Blake UK\r
-000000-0FFFFF     (base 16)            Blake UK\r
-                               177-187, Rutland Road\r
-                               Sheffield  --select--  S3 9PT\r
-                               GB\r
-\r
 B0-B3-53   (hex)               Beijing Geekplus Technology Co.,Ltd.\r
 C00000-CFFFFF     (base 16)            Beijing Geekplus Technology Co.,Ltd.\r
                                1st Floor, Building 1, Chaolai High-Tech industrial Part, Chaoyang District\r
@@ -3578,12 +3572,150 @@ D00000-DFFFFF     (base 16)            IPvideo Corporation
                                Bay Shore  NY  11706\r
                                US\r
 \r
+B0-B3-53   (hex)               Blake UK\r
+000000-0FFFFF     (base 16)            Blake UK\r
+                               177-187, Rutland Road\r
+                               Sheffield  --select--  S3 9PT\r
+                               GB\r
+\r
 B0-B3-53   (hex)               Zoox\r
 B00000-BFFFFF     (base 16)            Zoox\r
                                1149 Chess Drive\r
                                Foster City  CA  94404\r
                                US\r
 \r
+14-AE-85   (hex)               Qingdao iTechene Technologies Co., Ltd.\r
+200000-2FFFFF     (base 16)            Qingdao iTechene Technologies Co., Ltd.\r
+                               UnitA3-A4,Level8,Block A ,International Innovation Park,No.1Keyuanwei Rd.,Laoshan District\r
+                               Qingdao    266100\r
+                               CN\r
+\r
+14-AE-85   (hex)               Henfred Technology Co., Ltd.\r
+100000-1FFFFF     (base 16)            Henfred Technology Co., Ltd.\r
+                               3F.-7, No.77, Sec. 1, Xintai 5th Rd\r
+                               New Taipei City  Xizhi Dist  221\r
+                               TW\r
+\r
+14-AE-85   (hex)               MTA Systems\r
+A00000-AFFFFF     (base 16)            MTA Systems\r
+                               Pemstraße 2\r
+                               Mauthausen    4310\r
+                               AT\r
+\r
+64-62-66   (hex)               MiiVii Dynamics Technology CO.,LTD\r
+000000-0FFFFF     (base 16)            MiiVii Dynamics Technology CO.,LTD\r
+                               1408-1415 Tower A BUGG Building,No.18 N. Taipingzhuang Rd,haidian District\r
+                               Beijing  Beijing  100000\r
+                               CN\r
+\r
+64-62-66   (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
+64-62-66   (hex)               Bühler AG\r
+500000-5FFFFF     (base 16)            Bühler AG\r
+                               Gupfenstrasse 5\r
+                               Uzwil    9240\r
+                               CH\r
+\r
+64-62-66   (hex)               Shenzhen Jie Shi Lian Industrial Co., LTD\r
+E00000-EFFFFF     (base 16)            Shenzhen Jie Shi Lian Industrial Co., LTD\r
+                               6F,C Building,Jinao Industrial Park,Juling Rd,Guanlan Town,Longhua\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+64-62-66   (hex)               Leontech Limited\r
+800000-8FFFFF     (base 16)            Leontech Limited\r
+                               1208 WorkingBerg Commercial Buildung, 41-47 Marble Road\r
+                               Hong Kong  Hong Kong  00000\r
+                               HK\r
+\r
+94-CC-04   (hex)               Sam Nazarko Trading Ltd\r
+600000-6FFFFF     (base 16)            Sam Nazarko Trading Ltd\r
+                               18 Watermill Way\r
+                               London  Surrey  SW19 2RD\r
+                               GB\r
+\r
+94-CC-04   (hex)               Hanzhuo Information Technology(Shanghai) Ltd.\r
+D00000-DFFFFF     (base 16)            Hanzhuo Information Technology(Shanghai) Ltd.\r
+                               Room 2085, building 2, 622 Yingyuan middle Road, Jiading Strict\r
+                               Shanghai    201200\r
+                               CN\r
+\r
+94-CC-04   (hex)               hyBee Inc.\r
+A00000-AFFFFF     (base 16)            hyBee Inc.\r
+                               #1003, Innovalley B, 253, Pangyo-ro, Bundang-gu\r
+                               Seongnam-si  Gyeonggi-do  13486\r
+                               KR\r
+\r
+94-05-BB   (hex)               iungo\r
+800000-8FFFFF     (base 16)            iungo\r
+                               Vrouwenlaan 62\r
+                               Zwolle  Overijssel  8017 HS\r
+                               NL\r
+\r
+94-CC-04   (hex)               Nanjing Yacer Communication Technology Co. Ltd.\r
+200000-2FFFFF     (base 16)            Nanjing Yacer Communication Technology Co. Ltd.\r
+                               333 Taiping South Road Jinling Yujingyuan 19nd  floor Unit K Qin Huai District\r
+                               nanjing  jiangsu  210000\r
+                               CN\r
+\r
+90-E2-FC   (hex)               Pars Ertebat Afzar Co.\r
+000000-0FFFFF     (base 16)            Pars Ertebat Afzar Co.\r
+                               1116 – Burlington Tower Business Bay\r
+                               Dubai    90072\r
+                               AE\r
+\r
+94-05-BB   (hex)               Dongguan CXWE Technology Co.,Ltd.\r
+200000-2FFFFF     (base 16)            Dongguan CXWE Technology Co.,Ltd.\r
+                               Room 805, building 1, No. 16, Keji 4th Road, Songshanhu\r
+                               Dongguan  Guangdong  523000\r
+                               CN\r
+\r
+94-05-BB   (hex)               Zimmer GmbH\r
+900000-9FFFFF     (base 16)            Zimmer GmbH\r
+                               Im Salmenkopf 5\r
+                               Rheinau  Baden-Württemberg  77866\r
+                               DE\r
+\r
+94-05-BB   (hex)               Qingdao Maotran Electronics co., ltd\r
+000000-0FFFFF     (base 16)            Qingdao Maotran Electronics co., ltd\r
+                               Room2907, Building 2 of Minghui International, No.39 of Shiling Road, Laoshan District\r
+                               Qingdao  Shandong  266000\r
+                               CN\r
+\r
+94-05-BB   (hex)               LTE-X, Inc\r
+700000-7FFFFF     (base 16)            LTE-X, Inc\r
+                               2-2-20 Higashi-Shinagawa\r
+                               Shinagawa  Tokyo  1400002\r
+                               JP\r
+\r
+94-05-BB   (hex)               BAE Systems\r
+E00000-EFFFFF     (base 16)            BAE Systems\r
+                               21 continental boulevard\r
+                               Merrimack  NH  03054\r
+                               US\r
+\r
+F4-90-CB   (hex)               Cheetah Medical\r
+C00000-CFFFFF     (base 16)            Cheetah Medical\r
+                               2A Hashlosha st.\r
+                               Tel Aviv    6706055\r
+                               IL\r
+\r
+F4-90-CB   (hex)               A-dec Inc.\r
+B00000-BFFFFF     (base 16)            A-dec Inc.\r
+                               2601 Crestview Drive\r
+                               Newberg  OR  97132\r
+                               US\r
+\r
+F4-90-CB   (hex)               TEQ SA\r
+700000-7FFFFF     (base 16)            TEQ SA\r
+                               Via al Municipio 16\r
+                               Barbengo  Ticino  6917\r
+                               CH\r
+\r
 4C-4B-F9   (hex)               Shenzhen dingsheng technology co., LTD\r
 400000-4FFFFF     (base 16)            Shenzhen dingsheng technology co., LTD\r
                                Floor 3, building 5, kaijeda industrial zone, no.97, huaxing road, langkou community, dalang street, longhua district\r
@@ -3866,12 +3998,6 @@ D0-C8-57   (hex)         Mobicon
                                Suwon-si  Gyeonggi-do  16521\r
                                KR\r
 \r
-D0-C8-57   (hex)               IFLYTEK CO.,LTD.\r
-D00000-DFFFFF     (base 16)            IFLYTEK CO.,LTD.\r
-                               National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,\r
-                               Heifei  An hui  230088\r
-                               CN\r
-\r
 60-95-CE   (hex)               Synamedia\r
 C00000-CFFFFF     (base 16)            Synamedia\r
                                Luipaardstraat 12\r
@@ -6971,6 +7097,84 @@ C00000-CFFFFF     (base 16)              Shenzhen zhong ju  Fiber optical Co.Ltd
                                Zhuhai  Guangdong  519080\r
                                CN\r
 \r
+90-E2-FC   (hex)               Huddly AS\r
+900000-9FFFFF     (base 16)            Huddly AS\r
+                               Karenslyst Allé 51\r
+                               Oslo    0279\r
+                               NO\r
+\r
+90-E2-FC   (hex)               Shenzhen Dingsheng Intelligent Technology Co., Ltd\r
+B00000-BFFFFF     (base 16)            Shenzhen Dingsheng Intelligent Technology Co., Ltd\r
+                               10/F Block C, Skyworth Building, Gaoxin South 1st Rd., Hi-Tech Park, Nanshan District\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+14-AE-85   (hex)               Veo Technologies\r
+900000-9FFFFF     (base 16)            Veo Technologies\r
+                               Aldersrogade 6c, 4. sal\r
+                               København  Denmark  2100\r
+                               DK\r
+\r
+14-AE-85   (hex)               SHENZHEN HONOR ELECTRONIC CO.,LTD\r
+700000-7FFFFF     (base 16)            SHENZHEN HONOR ELECTRONIC CO.,LTD\r
+                               No. A Building, Xinghui Industrial Park, Gushu No. 2Rd,\r
+                               SHEN ZHEN  GUANG  DONG  518000\r
+                               CN\r
+\r
+94-CC-04   (hex)               Shenzhen Link technology Co.,Ltd\r
+300000-3FFFFF     (base 16)            Shenzhen Link technology Co.,Ltd\r
+                               901,9/F,Dahong High TechIndusryPark?NO.6-18,Xinhe Road,Xinqiao Community,Baoan District\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+94-CC-04   (hex)               SHENZHEN SANRAY TECHNOLOGY CO.,LTD\r
+500000-5FFFFF     (base 16)            SHENZHEN SANRAY TECHNOLOGY CO.,LTD\r
+                               1B08 2/F Folk Culture Industrial Park,Qunli Second Road, Baoan District\r
+                               Shenzhen  GuangDong  518101\r
+                               CN\r
+\r
+94-CC-04   (hex)               GOCOAX, INC\r
+100000-1FFFFF     (base 16)            GOCOAX, INC\r
+                               15902A Halliburton Rd #662 \r
+                               Hacienda Heights  CA  91745\r
+                               US\r
+\r
+94-05-BB   (hex)               Chengdu Zhongheng Network Co.,Ltd.\r
+500000-5FFFFF     (base 16)            Chengdu Zhongheng Network Co.,Ltd.\r
+                               No.898 Baicao Road, Chengdu High-tech Zone (Western District)\r
+                               Chengdu  Sichuan  611731\r
+                               CN\r
+\r
+D0-C8-57   (hex)               IFLYTEK CO.,LTD.\r
+D00000-DFFFFF     (base 16)            IFLYTEK CO.,LTD.\r
+                               National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,\r
+                               Hefei  An hui  230088\r
+                               CN\r
+\r
+94-CC-04   (hex)               Shanxi Baixin Information Technology Co., Ltd.\r
+C00000-CFFFFF     (base 16)            Shanxi Baixin Information Technology Co., Ltd.\r
+                               Room 210-213, Room 215-217, Room 219-220, No.2, Yari Street, Taiyuan University Park, Shanxi Comprehensive Reform Demonstration Zone\r
+                               Taiyuan  Shanxi  030032\r
+                               CN\r
+\r
+94-05-BB   (hex)               ZIGPOS GmbH\r
+600000-6FFFFF     (base 16)            ZIGPOS GmbH\r
+                               Räcknitzhöhe 35a\r
+                               Dresden  Saxony  01217\r
+                               DE\r
+\r
+94-05-BB   (hex)               SolarEdge Technologies\r
+A00000-AFFFFF     (base 16)            SolarEdge Technologies\r
+                               1 Abba Eban St.\r
+                               Herzelia    46725\r
+                               IL\r
+\r
+F4-90-CB   (hex)               Airbeam Wireless Technologies Inc.\r
+600000-6FFFFF     (base 16)            Airbeam Wireless Technologies Inc.\r
+                               #125, 21320 Gordon Way\r
+                               Richmond  British Columbia  V6W 1J8\r
+                               CA\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
@@ -10406,6 +10610,78 @@ A00000-AFFFFF     (base 16)            Ledger
                                Paris    75002\r
                                FR\r
 \r
+14-AE-85   (hex)               Trimble LEM\r
+800000-8FFFFF     (base 16)            Trimble LEM\r
+                               10368 Westmoor Dr\r
+                               Westminster  CO  80021\r
+                               US\r
+\r
+14-AE-85   (hex)               Kayamatics Limited\r
+000000-0FFFFF     (base 16)            Kayamatics Limited\r
+                               Room 1209, Trend Centre, 29 Cheung Lee Street\r
+                               Chaiwan  NA  NA\r
+                               HK\r
+\r
+64-62-66   (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
+64-62-66   (hex)               Signal Hound\r
+B00000-BFFFFF     (base 16)            Signal Hound\r
+                               1502 SE Commerce Ave Suite 101\r
+                               Battle Ground  WA  98604\r
+                               US\r
+\r
+64-62-66   (hex)               Chunghwa System Integration Co., Ltd.\r
+900000-9FFFFF     (base 16)            Chunghwa System Integration Co., Ltd.\r
+                               2F., No. 35, Aiguo E. Rd.,\r
+                               Taipei    106\r
+                               TW\r
+\r
+64-62-66   (hex)               Protectli\r
+200000-2FFFFF     (base 16)            Protectli\r
+                               1315 Hot Springs Way\r
+                               Vista  CA  92081\r
+                               US\r
+\r
+64-62-66   (hex)               Redstone Systems, Inc.\r
+400000-4FFFFF     (base 16)            Redstone Systems, Inc.\r
+                               24 School Street, 2nd floor\r
+                               Boston    02108\r
+                               US\r
+\r
+64-62-66   (hex)               Kobol Innovations Pte. Ltd.\r
+D00000-DFFFFF     (base 16)            Kobol Innovations Pte. Ltd.\r
+                               101 Cecil Street, #26-01/07 Tong Eng Building\r
+                               Singapore    069533\r
+                               SG\r
+\r
+94-05-BB   (hex)               AUSTAR HEARING SCIENCE AND TECHNILIGY(XIAMEN)CO.,LTD\r
+B00000-BFFFFF     (base 16)            AUSTAR HEARING SCIENCE AND TECHNILIGY(XIAMEN)CO.,LTD\r
+                               RM201,No.2Gaoqi South 12th Road,HuliDist\r
+                               XIamen  Fujian  361006\r
+                               CN\r
+\r
+94-05-BB   (hex)               LAO INDUSTRIA LTDA\r
+C00000-CFFFFF     (base 16)            LAO INDUSTRIA LTDA\r
+                               AV DR MAURO LINDENBERG MONTEIRO, 1003\r
+                               OSASCO  SÃO PAULO  06278010\r
+                               BR\r
+\r
+F4-90-CB   (hex)               Avilution\r
+500000-5FFFFF     (base 16)            Avilution\r
+                               103 Shoreline Dr\r
+                               Madison  AL  35758\r
+                               US\r
+\r
+F4-90-CB   (hex)               OmniNet\r
+400000-4FFFFF     (base 16)            OmniNet\r
+                               6410 Del Rio Rd\r
+                               Charlotte  NC  28277\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
@@ -11186,12 +11462,6 @@ E00000-EFFFFF     (base 16)            NC-LINK Technology Co., Ltd.
                                Shenzhen  Guangdong  518101\r
                                CN\r
 \r
-7C-BC-84   (hex)               VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
-D00000-DFFFFF     (base 16)            VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
-                               B-11 SECTOR-VII\r
-                               NOIDA  UTTAR PRADESH  201301\r
-                               IN\r
-\r
 7C-BC-84   (hex)               Shanghai Yitu Technology Co. Ltd\r
 300000-3FFFFF     (base 16)            Shanghai Yitu Technology Co. Ltd\r
                                23/F, Tower 1, No.523 Loushanguan Road, Changning District\r
@@ -13874,6 +14144,90 @@ D00000-DFFFFF     (base 16)            Beijing Lanxum Computer Technology CO.,LTD.
                                Beijing  Beijing  100192\r
                                CN\r
 \r
+90-E2-FC   (hex)               ShenZhen Temwey Innovation Technology Co.,Ltd.\r
+200000-2FFFFF     (base 16)            ShenZhen Temwey Innovation Technology Co.,Ltd.\r
+                               Room 1008, 10/F, Bld.B, Bantian International Centre, No. 5 South Huancheng Road, Bantian Street of Shenzhen Longgang District\r
+                               SHENZHEN  GUANGDONG  518129\r
+                               CN\r
+\r
+90-E2-FC   (hex)               Dongguan Kangyong electronics technology Co. Ltd\r
+400000-4FFFFF     (base 16)            Dongguan Kangyong electronics technology Co. Ltd\r
+                               No 9,Yincheng 1st Road, Xiabian Village, Chang’an Town\r
+                               Dongguan  GuangDong  523877\r
+                               CN\r
+\r
+90-E2-FC   (hex)               bitsensing Inc.\r
+800000-8FFFFF     (base 16)            bitsensing Inc.\r
+                               165, Yeoksam-ro,\r
+                               Gangnam-gu, Seoul,  Republic of Korea  06247\r
+                               KR\r
+\r
+90-E2-FC   (hex)               Stanley Security\r
+C00000-CFFFFF     (base 16)            Stanley Security\r
+                               8350 Sunlight Drive\r
+                               Fishers  IN  46037\r
+                               US\r
+\r
+14-AE-85   (hex)               iSolution Technologies Co.,Ltd.\r
+D00000-DFFFFF     (base 16)            iSolution Technologies Co.,Ltd.\r
+                               5F,Bldg #6, Zhongguan Honghualing Industrial South Park\r
+                               Shenzhen  Guangdong  518055\r
+                               CN\r
+\r
+7C-BC-84   (hex)               VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
+D00000-DFFFFF     (base 16)            VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
+                               B3, Bredon House, 321, Tettenhall Road, Tettenhall\r
+                               Wolverhampton  West Midlands  WV6 0JZ\r
+                               GB\r
+\r
+64-62-66   (hex)               FaceHeart Inc.\r
+300000-3FFFFF     (base 16)            FaceHeart Inc.\r
+                               Rm. 8, 19F., No.118, Ciyun Rd., East Dist.\r
+                               Hsinchu  Taiwan  300\r
+                               TW\r
+\r
+64-62-66   (hex)               Sensoro Co., Ltd.\r
+A00000-AFFFFF     (base 16)            Sensoro Co., Ltd.\r
+                               7F D-Block, Lei Shing Hong Center, No. 8 Guangshun South Street, Chaoyang District,\r
+                               Beijing  Beijing  100102\r
+                               CN\r
+\r
+64-62-66   (hex)               Pass & Seymour, Inc d/b/a Legrand\r
+600000-6FFFFF     (base 16)            Pass & Seymour, Inc d/b/a Legrand\r
+                               50 Boyd Ave\r
+                               Syracuse  NY  13209\r
+                               US\r
+\r
+94-CC-04   (hex)               Shandong free optical technology co., ltd.\r
+B00000-BFFFFF     (base 16)            Shandong free optical technology co., ltd.\r
+                               195 East First Street, Industrial First Street, Economic Development Zone, Weifang, Weicheng District,\r
+                               Weifeng  Shandong  216000\r
+                               CN\r
+\r
+94-CC-04   (hex)               ENTEC Electric & Electronic Co., LTD.\r
+900000-9FFFFF     (base 16)            ENTEC Electric & Electronic Co., LTD.\r
+                               78-2 Buncheon-ri, Bongdam-eup\r
+                               Hwaseong-city  Gyungki-do  445-894\r
+                               KR\r
+\r
+94-CC-04   (hex)               SynchronicIT BV\r
+E00000-EFFFFF     (base 16)            SynchronicIT BV\r
+                               Spoorstraat 155, room 413\r
+                               Gennep  Nederland  6591 GT\r
+                               NL\r
+\r
+F4-90-CB   (hex)               Simavita (Aust) Pty Ltd\r
+D00000-DFFFFF     (base 16)            Simavita (Aust) Pty Ltd\r
+                               Suite 2.02, L2, 54 Miller Street\r
+                               North Sydney  NSW  2060\r
+                               AU\r
+\r
+F4-90-CB   (hex)               Ricker Lyman Robotic\r
+300000-3FFFFF     (base 16)            Ricker Lyman Robotic\r
+                               319 Main Street\r
+                               Beacon  NY  12508\r
+                               US\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
@@ -16421,12 +16775,6 @@ B0-C5-CA   (hex)               LOWOTEC GmbH
                                Oldenburg  Niedersachsen  26129\r
                                DE\r
 \r
-DC-44-27   (hex)               Tesla Motors, Inc\r
-100000-1FFFFF     (base 16)            Tesla Motors, Inc\r
-                               3500 Deer Creek Road\r
-                               Palo Alto  CA  94304\r
-                               US\r
-\r
 78-C2-C0   (hex)               ShenZhen TuLing Robot CO.,LTD\r
 500000-5FFFFF     (base 16)            ShenZhen TuLing Robot CO.,LTD\r
                                BLK 9, No 28, Langshan Road, Northern District of High Tech. Industry Park, Nanshan Dist., SZ., PRC.\r
@@ -17273,20 +17621,164 @@ B0-B3-53   (hex)             Sprocomm Technologies CO.,LTD.
                                shenzhen  guangdong  518000\r
                                CN\r
 \r
+B0-B3-53   (hex)               VOXISCOM\r
+800000-8FFFFF     (base 16)            VOXISCOM\r
+                               Rue Jules Ferry\r
+                               PORNIC    44210\r
+                               FR\r
+\r
+B0-B3-53   (hex)               Innotas Elektronik GmbH\r
+400000-4FFFFF     (base 16)            Innotas Elektronik GmbH\r
+                               Rathenaustr. 18a\r
+                               Zittau    D-02763\r
+                               DE\r
+\r
 3C-FA-D3   (hex)               Mirico\r
 E00000-EFFFFF     (base 16)            Mirico\r
                                30 DongSan Rd 9th floor Mirico\r
                                Ansan  Gyunggi  15434\r
                                KR\r
 \r
-B0-B3-53   (hex)               Innotas Elektronik GmbH\r
-400000-4FFFFF     (base 16)            Innotas Elektronik GmbH\r
-                               Rathenaustr. 18a\r
-                               Zittau    D-02763\r
+90-E2-FC   (hex)               Power Engineering & Manufacturing, Inc.\r
+A00000-AFFFFF     (base 16)            Power Engineering & Manufacturing, Inc.\r
+                               1463 94th Lane NE\r
+                               Blaine  MN  55449\r
+                               US\r
+\r
+90-E2-FC   (hex)               Sindoh Techno Co., Ltd.\r
+600000-6FFFFF     (base 16)            Sindoh Techno Co., Ltd.\r
+                               Sindoh Bldg., 6, Hyoryeong-ro 61-gil, Seocho-gu\r
+                               Seoul    06643\r
+                               KR\r
+\r
+90-E2-FC   (hex)               Shenzhen Hisource Technology Development CO.,Ltd.\r
+300000-3FFFFF     (base 16)            Shenzhen Hisource Technology Development CO.,Ltd.\r
+                               Dalang\r
+                               Shenzhen  Guangdong  518109\r
+                               CN\r
+\r
+90-E2-FC   (hex)               TOTALONE TECHNOLOGY CO., LTD.\r
+500000-5FFFFF     (base 16)            TOTALONE TECHNOLOGY CO., LTD.\r
+                               3F.-1, NO.18, LN. 48, XingShan RD.,\r
+                               Taipei  Neihu dist  11469\r
+                               TW\r
+\r
+90-E2-FC   (hex)               Yite technology\r
+100000-1FFFFF     (base 16)            Yite technology\r
+                               No. 56, Xiaobei Rd., North Dist\r
+                               tainan    70448 \r
+                               TW\r
+\r
+90-E2-FC   (hex)               DevCom spol. s r.o.\r
+E00000-EFFFFF     (base 16)            DevCom spol. s r.o.\r
+                               Božanovská 884\r
+                               Praha  Select a State  19300\r
+                               CZ\r
+\r
+14-AE-85   (hex)               IO Industries Inc.\r
+C00000-CFFFFF     (base 16)            IO Industries Inc.\r
+                               15940 Robin's Hill Rd\r
+                               London  Ontario  N5V 0A4\r
+                               CA\r
+\r
+14-AE-85   (hex)               AZ-TECHNOLOGY SDN BHD\r
+500000-5FFFFF     (base 16)            AZ-TECHNOLOGY SDN BHD\r
+                               A108 & A109 BLOCK A KELANA BUSINESS CENTRE NO: 97 JALAN SS7/2 KELANA JAYA\r
+                               PETALING JAYA  SELANGOR  47301\r
+                               MY\r
+\r
+14-AE-85   (hex)               CENTERVUE SPA\r
+400000-4FFFFF     (base 16)            CENTERVUE SPA\r
+                               VIA SAN MARCO 9/H\r
+                               PADOVA  PADOVA  35129\r
+                               IT\r
+\r
+90-E2-FC   (hex)               Fair Winds Digital srl\r
+700000-7FFFFF     (base 16)            Fair Winds Digital srl\r
+                               Via Italo Svevo 85\r
+                               Rome  Italy  00137\r
+                               IT\r
+\r
+14-AE-85   (hex)               TMG TE GmbH\r
+600000-6FFFFF     (base 16)            TMG TE GmbH\r
+                               Zur Gießerei 10\r
+                               Karlsruhe    776227\r
                                DE\r
 \r
-B0-B3-53   (hex)               VOXISCOM\r
-800000-8FFFFF     (base 16)            VOXISCOM\r
-                               Rue Jules Ferry\r
-                               PORNIC    44210\r
-                               FR\r
+14-AE-85   (hex)               NTC SOFT\r
+B00000-BFFFFF     (base 16)            NTC SOFT\r
+                               B-805, Gwangmyeong SK Techno park, 60, Haan-ro,\r
+                               Gwangmyeong-si  Gyeonggi-do  14322\r
+                               KR\r
+\r
+14-AE-85   (hex)               Sercomm Corporation.\r
+E00000-EFFFFF     (base 16)            Sercomm Corporation.\r
+                               3F,No.81,Yu-Yih Rd.,Chu-Nan Chen\r
+                               Miao-Lih Hsuan    115\r
+                               TW\r
+\r
+64-62-66   (hex)               Jiangsu Aisida Electronic Co.,Ltd\r
+C00000-CFFFFF     (base 16)            Jiangsu Aisida Electronic Co.,Ltd\r
+                               Aisida Industrial Park,Lanling Road,Danyang Development Zone\r
+                               DanYang  JiangSu  212300\r
+                               CN\r
+\r
+94-CC-04   (hex)               Hangzhou Yongkong Technology Co., Ltd.\r
+000000-0FFFFF     (base 16)            Hangzhou Yongkong Technology Co., Ltd.\r
+                               Room 503, Building 12, Lefu Zhihui Garden, 28 Xiangyuan Road, Gongshu Distric\r
+                               Hangzhou  Zhejiang  310000\r
+                               CN\r
+\r
+94-CC-04   (hex)               Gowing Business And Contracting Wenzhou Co., LTD\r
+700000-7FFFFF     (base 16)            Gowing Business And Contracting Wenzhou Co., LTD\r
+                               Room 101, No.4 Liming Industrial District, Lucheng, Wenzhou, China\r
+                               Wenzhou    325000\r
+                               CN\r
+\r
+94-CC-04   (hex)               CircuitWerkes, Inc.\r
+800000-8FFFFF     (base 16)            CircuitWerkes, Inc.\r
+                               2805 NW 6th St\r
+                               Gainesville  FL  32609\r
+                               US\r
+\r
+14-AE-85   (hex)               IFLYTEK CO.,LTD.\r
+300000-3FFFFF     (base 16)            IFLYTEK CO.,LTD.\r
+                               National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,\r
+                               Hefei  An hui  230088\r
+                               CN\r
+\r
+94-05-BB   (hex)               Shenzhen Baolijie Technology Co., Ltd.\r
+400000-4FFFFF     (base 16)            Shenzhen Baolijie Technology Co., Ltd.\r
+                               D2,No.47,Shasan Road,Sha jing Street,Baoan District\r
+                               Shenzhen  Kowloon  518104\r
+                               CN\r
+\r
+94-CC-04   (hex)               ProConnections, Inc.\r
+400000-4FFFFF     (base 16)            ProConnections, Inc.\r
+                               30 Massachusetts, Ave, Suite 301\r
+                               North Andover  MA  01845\r
+                               US\r
+\r
+94-05-BB   (hex)               Neurik AG\r
+300000-3FFFFF     (base 16)            Neurik AG\r
+                               Im alten Riet 143\r
+                               Schaan  SCHAAN  9494\r
+                               LI\r
+\r
+94-05-BB   (hex)               Dongguan Kingtron Electronics Tech Co., Ltd\r
+100000-1FFFFF     (base 16)            Dongguan Kingtron Electronics Tech Co., Ltd\r
+                               No.3 Fumin North Rd,Shu'an Industrial Park, Humen Town\r
+                               Dongguan  Guangdong China  523929\r
+                               CN\r
+\r
+94-05-BB   (hex)               Sunthink S&T Development Co.,Ltd\r
+D00000-DFFFFF     (base 16)            Sunthink S&T Development Co.,Ltd\r
+                               A3-f1, xinghezhong Technology Green Valley, No.14, luolei Industrial Avenue, Shiyan street, Bao'an District\r
+                               Shenzhen    518100\r
+                               CN\r
+\r
+DC-44-27   (hex)               Tesla,Inc.\r
+100000-1FFFFF     (base 16)            Tesla,Inc.\r
+                               3500 Deer Creek Road\r
+                               Palo Alto  CA  94304\r
+                               US\r

diff --git a/hwdb.d/ma-small.txt b/hwdb.d/ma-small.txt
index d934b186133358206204f535da5214cdbca9d1fb..31d6fce3af4ec58d2232ae348baabac8d5055373 100644 (file)
--- a/hwdb.d/ma-small.txt
+++ b/hwdb.d/ma-small.txt
@@ -2927,12 +2927,6 @@ D3F000-D3FFFF     (base 16)              GLOBALCOM ENGINEERING SPA
                                MORNAGO  VA  21020\r
                                IT\r
 \r
-70-B3-D5   (hex)               VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
-6BE000-6BEFFF     (base 16)            VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
-                               B-11 SECTOR-VII\r
-                               NOIDA  UTTAR PRADESH  201301\r
-                               IN\r
-\r
 70-B3-D5   (hex)               Precitec Optronik GmbH\r
 0C5000-0C5FFF     (base 16)            Precitec Optronik GmbH\r
                                Schleussnerstraße 54\r
@@ -4205,6 +4199,108 @@ EF1000-EF1FFF     (base 16)             Nanotok LLC
                                Hong Kong  Hong Kong  00000\r
                                HK\r
 \r
+70-B3-D5   (hex)               VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
+6BE000-6BEFFF     (base 16)            VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
+                               B3, Bredon House, 321, Tettenhall Road, Tettenhall\r
+                               Wolverhampton  West Midlands  WV6 0JZ\r
+                               GB\r
+\r
+70-B3-D5   (hex)               Todd Digital Limited\r
+C9A000-C9AFFF     (base 16)            Todd Digital Limited\r
+                               Level 15, 95 Customhouse Quay\r
+                               Wellington    6011\r
+                               NZ\r
+\r
+70-B3-D5   (hex)               JENG IoT BV\r
+5AF000-5AFFFF     (base 16)            JENG IoT BV\r
+                               Steenbokstraat 33\r
+                               APELDOORN  Gelderland  7324 AZ\r
+                               NL\r
+\r
+70-B3-D5   (hex)               TXMission Ltd.\r
+F47000-F47FFF     (base 16)            TXMission Ltd.\r
+                               CP House, Otterspool Way\r
+                               Watford  Hertfordshire  WD25 8HU\r
+                               GB\r
+\r
+70-B3-D5   (hex)               Technology Link Corporation\r
+B1B000-B1BFFF     (base 16)            Technology Link Corporation\r
+                               Shin-Yokohama Kohoku-ku\r
+                               yokohama  kanagawa  222-0033\r
+                               JP\r
+\r
+70-B3-D5   (hex)               Tucsen Photonics Co., Ltd. \r
+8A7000-8A7FFF     (base 16)            Tucsen Photonics Co., Ltd. \r
+                               6F NO.1 building Caimao Zone, 756# Qi an Road, Gaishan Town, Cangshan Area, Fuzhou, Fujian, PR, CHINA.\r
+                               fuzhou    350000\r
+                               CN\r
+\r
+70-B3-D5   (hex)               sensorway\r
+C52000-C52FFF     (base 16)            sensorway\r
+                               A-339 samsong techno valley, 140 tongilro, deockyanggu\r
+                               goyangsi  gyeonggido  10594\r
+                               KR\r
+\r
+70-B3-D5   (hex)               KDT Corp.\r
+E72000-E72FFF     (base 16)            KDT Corp.\r
+                               no1705-1, BLDG 3#, Lantian shixin plaza, keqiao zone\r
+                               shaoxing  zhejiang  312030\r
+                               CN\r
+\r
+70-B3-D5   (hex)               Beijing Yourong Runda Rechnology Development Co.Ltd.\r
+980000-980FFF     (base 16)            Beijing Yourong Runda Rechnology Development Co.Ltd.\r
+                               Changping District Science and Technology Park Advanced Road 37\r
+                               Beijing    6219650\r
+                               CN\r
+\r
+70-B3-D5   (hex)               R.C. Systems Inc\r
+52F000-52FFFF     (base 16)            R.C. Systems Inc\r
+                               8621 hwy. 6\r
+                               hitchcock  TX  77563\r
+                               US\r
+\r
+70-B3-D5   (hex)               Dalcnet srl\r
+1CF000-1CFFFF     (base 16)            Dalcnet srl\r
+                               Via Meucci 35\r
+                               Brendola  Vicenza  36040\r
+                               IT\r
+\r
+70-B3-D5   (hex)               AUTOMATICA Y REGULACION S.A.\r
+EBF000-EBFFFF     (base 16)            AUTOMATICA Y REGULACION S.A.\r
+                               Condell 1735, Nunoa\r
+                               Santiago  RM  7770331\r
+                               CL\r
+\r
+70-B3-D5   (hex)               Digital Solutions JSC\r
+D9F000-D9FFFF     (base 16)            Digital Solutions JSC\r
+                               room 4, office 1, 3rd floor, building 7, house 9a, 2nd Sinichkina Str.\r
+                               Moscow    111020\r
+                               RU\r
+\r
+70-B3-D5   (hex)               Oculii\r
+B96000-B96FFF     (base 16)            Oculii\r
+                               829 Space Dr\r
+                               Beavercreek  OH  45434\r
+                               US\r
+\r
+70-B3-D5   (hex)               XPS ELETRONICA LTDA\r
+4F3000-4F3FFF     (base 16)            XPS ELETRONICA LTDA\r
+                               AVENIDA JAÇANÃ, 470/474 - VILA NELSON\r
+                               SÃO PAULO  SÃO PAULO  02273-001\r
+                               BR\r
+\r
+70-B3-D5   (hex)               Firecom, Inc.\r
+331000-331FFF     (base 16)            Firecom, Inc.\r
+                               3927 59th Street\r
+                               Woodside  NY  11377\r
+                               US\r
+\r
+70-B3-D5   (hex)               DOGA\r
+62A000-62AFFF     (base 16)            DOGA\r
+                               11 rue Lavoisier\r
+                               MAUREPAS    78310\r
+                               FR\r
+\r
 70-B3-D5   (hex)               EVCO SPA\r
 A80000-A80FFF     (base 16)            EVCO SPA\r
                                VIA FELTRE N. 81\r
@@ -8507,6 +8603,84 @@ F80000-F80FFF     (base 16)              Guan Show Technologe Co., Ltd.
                                BRUGES    33520\r
                                FR\r
 \r
+70-B3-D5   (hex)               Newtec A/S\r
+18F000-18FFFF     (base 16)            Newtec A/S\r
+                               Stærmosegårdsvej  18\r
+                               Odense SV  Region Syd  5230\r
+                               DK\r
+\r
+70-B3-D5   (hex)               AUDIO VISUAL DIGITAL SYSTEMS\r
+A7F000-A7FFFF     (base 16)            AUDIO VISUAL DIGITAL SYSTEMS\r
+                               PLOT NO.180 PHASE V SECTOR56, HSIIDC I.E KUNDLI SONEPAT\r
+                               SONEPAT  HARYANA  131028\r
+                               IN\r
+\r
+70-B3-D5   (hex)               DEUTA-WERKE GmbH\r
+1BF000-1BFFFF     (base 16)            DEUTA-WERKE GmbH\r
+                               Paffrather Str. 140\r
+                               Bergisch Gladbach  North Rhine-Westphalia  51465\r
+                               DE\r
+\r
+70-B3-D5   (hex)               DONG IL VISION Co., Ltd.\r
+038000-038FFF     (base 16)            DONG IL VISION Co., Ltd.\r
+                               #9 Ftrek tower, 11-25, Simindaero 327 beongil,Dongan-gu\r
+                               Anyangi-Si  Gyeonggi-Do  14055\r
+                               KR\r
+\r
+70-B3-D5   (hex)               Cetitec GmbH\r
+B36000-B36FFF     (base 16)            Cetitec GmbH\r
+                               Mannheimer Strasse 17\r
+                               Pforzheim    75179\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Kamacho Scale Co., Ltd.\r
+385000-385FFF     (base 16)            Kamacho Scale Co., Ltd.\r
+                               2246 Mure\r
+                               Takamatsu-shi  Kagawa-ken  761-0196\r
+                               JP\r
+\r
+70-B3-D5   (hex)               Vessel Technology Ltd\r
+44D000-44DFFF     (base 16)            Vessel Technology Ltd\r
+                               Banchory Business Centre, Burn O'Bennie Road\r
+                               Banchory  Aberdeenshire  AB31 5ZU\r
+                               GB\r
+\r
+70-B3-D5   (hex)               Munters\r
+FA8000-FA8FFF     (base 16)            Munters\r
+                               Hasivim 18\r
+                               Pethch Tikva  Israel  4959376\r
+                               IL\r
+\r
+70-B3-D5   (hex)               Visual Robotics\r
+0F4000-0F4FFF     (base 16)            Visual Robotics\r
+                               38 Irving Rd\r
+                               Eugene  OR  97404\r
+                               US\r
+\r
+70-B3-D5   (hex)               TangRen C&S CO., Ltd\r
+3FC000-3FCFFF     (base 16)            TangRen C&S CO., Ltd\r
+                               3a-5d, Tingwei Daxia, Tingwei Industrial Park, No. 6, Liufang Road, Bao'an District\r
+                               Shenzhen  Guangdong  518052\r
+                               CN\r
+\r
+70-B3-D5   (hex)               TEX COMPUTER SRL \r
+6C2000-6C2FFF     (base 16)            TEX COMPUTER SRL \r
+                               VIA MERCADANTE 35\r
+                               CATTOLICA   RIMINI   47841\r
+                               IT\r
+\r
+70-B3-D5   (hex)               LOTES TM OOO\r
+EA5000-EA5FFF     (base 16)            LOTES TM OOO\r
+                               Barklaya 22, str.1\r
+                               Moscow    121309\r
+                               RU\r
+\r
+70-B3-D5   (hex)               Yi An Electronics Co., Ltd\r
+F28000-F28FFF     (base 16)            Yi An Electronics Co., Ltd\r
+                               5F.-2, No. 81, Sec. 1, Xintai 5th Rd., Xizhi Dist\r
+                                New Taipei City    22101\r
+                               TW\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
@@ -8939,12 +9113,6 @@ A7D000-A7DFFF     (base 16)              Prior Scientific Instruments Ltd
                                Cambridge  Cambridgeshire  CB21 5ET\r
                                GB\r
 \r
-70-B3-D5   (hex)               Taejin InforTech\r
-A75000-A75FFF     (base 16)            Taejin InforTech\r
-                               40, Imi-ro, A-411\r
-                               Uiwang-si  Gyeonggi-do  16006\r
-                               KR\r
-\r
 70-B3-D5   (hex)               AUTOMATIZACION Y CONECTIVIDAD SA DE CV\r
 59B000-59BFFF     (base 16)            AUTOMATIZACION Y CONECTIVIDAD SA DE CV\r
                                LA GARITA ANDADOR 6 DUPLEX 1 CASA 2\r
@@ -9281,12 +9449,6 @@ C05000-C05FFF     (base 16)              KST technology
                                Songpa-gu  Seoul  05636\r
                                KR\r
 \r
-70-B3-D5   (hex)               Coheros Oy\r
-D2E000-D2EFFF     (base 16)            Coheros Oy\r
-                               Korkeakoulunkatu 1\r
-                               Tampere    33720\r
-                               FI\r
-\r
 70-B3-D5   (hex)               EA Elektroautomatik GmbH & Co. KG\r
 26C000-26CFFF     (base 16)            EA Elektroautomatik GmbH & Co. KG\r
                                Helmholtzstraße 31-33\r
@@ -12722,6 +12884,12 @@ CFB000-CFBFFF     (base 16)            Screen Innovations
                                Bingen  WA  98605\r
                                US\r
 \r
+70-B3-D5   (hex)               German Power GmbH\r
+C31000-C31FFF     (base 16)            German Power GmbH\r
+                               Freiburger Strasse 7\r
+                               Pforzheim    75179\r
+                               DE\r
+\r
 70-B3-D5   (hex)               Lyse AS\r
 F23000-F23FFF     (base 16)            Lyse AS\r
                                Breiflåtveien 18\r
@@ -12734,6 +12902,162 @@ F23000-F23FFF     (base 16)           Lyse AS
                                Paris    75006\r
                                FR\r
 \r
+70-B3-D5   (hex)               Hefei STAROT Technology Co.,Ltd\r
+4D3000-4D3FFF     (base 16)            Hefei STAROT Technology Co.,Ltd\r
+                               406, 4th Floor, Quality Control Building, Saipu Science Park, No. 6 Yunfei Road, High-tech Zone\r
+                               hefei  anhui  230000\r
+                               CN\r
+\r
+70-B3-D5   (hex)               SysCom Automationstechnik GmbH\r
+117000-117FFF     (base 16)            SysCom Automationstechnik GmbH\r
+                               An der Lehmkaute 13\r
+                               Bad Marienberg  Rheinland-Pfalz  56470\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Walton Hi-Tech Industries Ltd.\r
+E5C000-E5CFFF     (base 16)            Walton Hi-Tech Industries Ltd.\r
+                               HOLDING NO. I-65/2, WARD NO-07\r
+                               CHANDRA, KALIAKOIR, GAZIPUR.    1750\r
+                               BD\r
+\r
+70-B3-D5   (hex)               Flextronics International Kft\r
+699000-699FFF     (base 16)            Flextronics International Kft\r
+                               38. Zrinyi Str.\r
+                               Zalaegerszeg  Zala  8900\r
+                               HU\r
+\r
+70-B3-D5   (hex)               JFA Electronics Industry and Commerce EIRELI\r
+5F7000-5F7FFF     (base 16)            JFA Electronics Industry and Commerce EIRELI\r
+                               Rua Flor das Pedras, 175\r
+                               Belo Horizonte  Minas Gerais  30810-000\r
+                               BR\r
+\r
+70-B3-D5   (hex)               Hubbell Power Systems\r
+858000-858FFF     (base 16)            Hubbell Power Systems\r
+                               353 Powerville Road\r
+                               Boonton Township  NJ  07005\r
+                               US\r
+\r
+70-B3-D5   (hex)               aquila biolabs GmbH\r
+7DB000-7DBFFF     (base 16)            aquila biolabs GmbH\r
+                               Arnold-Sommerfeld-Ring 2\r
+                               Baesweiler  NRW  52499\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Sicon srl\r
+C82000-C82FFF     (base 16)            Sicon srl\r
+                               Via Sila 1/3\r
+                               Isola Vicentina  Vicenza  36033\r
+                               IT\r
+\r
+70-B3-D5   (hex)               LGE\r
+DAE000-DAEFFF     (base 16)            LGE\r
+                               10, Magokjungang 10-ro, Gangseo-gu\r
+                               Seoul    07796\r
+                               KR\r
+\r
+70-B3-D5   (hex)               Jonsa Australia Pty Ltd\r
+335000-335FFF     (base 16)            Jonsa Australia Pty Ltd\r
+                               Unit D2 3-29 Birnie Ave\r
+                               Lidcombe  NSW  2141\r
+                               AU\r
+\r
+70-B3-D5   (hex)               GreenWake Technologies\r
+467000-467FFF     (base 16)            GreenWake Technologies\r
+                               56 boulevard Niels Bohr, CEI2\r
+                               Villeurbanne    69100\r
+                               FR\r
+\r
+70-B3-D5   (hex)               shenzhen suofeixiang technology Co.,Ltd\r
+EEB000-EEBFFF     (base 16)            shenzhen suofeixiang technology Co.,Ltd\r
+                               sales09@sfxhd.com\r
+                               shenzhen    518000\r
+                               CN\r
+\r
+70-B3-D5   (hex)               RCH Vietnam Limited Liability Company\r
+97D000-97DFFF     (base 16)            RCH Vietnam Limited Liability Company\r
+                               Workshop F.01B-2, Lot No. F.01B Long Hau\r
+                               Ho Chi Minh City  Ho Chi Minh  70000\r
+                               VN\r
+\r
+70-B3-D5   (hex)               SNK, Inc.\r
+E12000-E12FFF     (base 16)            SNK, Inc.\r
+                               Rm 302 Inobiz park, 1646, Yuseong-daero, Yuseong-gu\r
+                               Daejeon    34054\r
+                               KR\r
+\r
+70-B3-D5   (hex)               SYLink Technologie\r
+466000-466FFF     (base 16)            SYLink Technologie\r
+                               18 rue de la conche\r
+                               Mirefleurs  Auvergne  63730\r
+                               FR\r
+\r
+70-B3-D5   (hex)               silicom\r
+F64000-F64FFF     (base 16)            silicom\r
+                               14 Atir-Yeda St/\r
+                               Kfar-Sava  Israel  44000\r
+                               IL\r
+\r
+70-B3-D5   (hex)               NSP Europe Ltd\r
+18A000-18AFFF     (base 16)            NSP Europe Ltd\r
+                               Unit 5, Devonshire Business Park\r
+                               Borehamwood  Hert  WD6 1NA\r
+                               GB\r
+\r
+70-B3-D5   (hex)               Kospel S.A.\r
+249000-249FFF     (base 16)            Kospel S.A.\r
+                               Olchowa 1\r
+                               Koszalin    75-136\r
+                               PL\r
+\r
+70-B3-D5   (hex)               Microchip Technology Germany II GmbH&Co.KG\r
+77F000-77FFFF     (base 16)            Microchip Technology Germany II GmbH&Co.KG\r
+                               Emmy-Noether-Straße 14\r
+                               Karlsruhe    76131\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Trust Automation\r
+C98000-C98FFF     (base 16)            Trust Automation\r
+                               125 Venture Dr\r
+                               San Luis Obispo  CA  93401\r
+                               US\r
+\r
+70-B3-D5   (hex)               ARCLAN'SYSTEM\r
+25C000-25CFFF     (base 16)            ARCLAN'SYSTEM\r
+                               1140 rue Ampère - Actimart II - Lot 9\r
+                               AIX EN PROVENCE    13290\r
+                               FR\r
+\r
+70-B3-D5   (hex)               Taejin InfoTech\r
+A75000-A75FFF     (base 16)            Taejin InfoTech\r
+                               40, Imi-ro, A-411\r
+                               Uiwang-si  Gyeonggi-do  16006\r
+                               KR\r
+\r
+70-B3-D5   (hex)               Coheros Oy\r
+D2E000-D2EFFF     (base 16)            Coheros Oy\r
+                               Tammukkakatu 6\r
+                               Nokia    37130\r
+                               FI\r
+\r
+70-B3-D5   (hex)               Gogo Business Aviation\r
+E24000-E24FFF     (base 16)            Gogo Business Aviation\r
+                               105 Edgeview Dr., Suite 300\r
+                               Broomfield  CO  80021\r
+                               US\r
+\r
+70-B3-D5   (hex)               Smart Embedded Systems\r
+A09000-A09FFF     (base 16)            Smart Embedded Systems\r
+                               6701  Koll Center Parkway #250\r
+                               Pleasonton  CA  94566\r
+                               US\r
+\r
+70-B3-D5   (hex)               Guan Show Technologe Co., Ltd.\r
+F6A000-F6AFFF     (base 16)            Guan Show Technologe Co., Ltd.\r
+                               No.127, Jianguo 1st Rd., Lingya Dist.\r
+                                Kaohsiung City     802\r
+                               TW\r
+\r
 70-B3-D5   (hex)               YUYAMA MFG Co.,Ltd\r
 BBB000-BBBFFF     (base 16)            YUYAMA MFG Co.,Ltd\r
                                3-3-1\r
@@ -16859,12 +17183,6 @@ BB2000-BB2FFF     (base 16)            Mettler Toledo
                                Lutz  FL  33558\r
                                US\r
 \r
-70-B3-D5   (hex)               SFR\r
-B12000-B12FFF     (base 16)            SFR\r
-                               12 rue jean-philippe Rameau CS 80001\r
-                               La plaine saint denis   FRANCE  93634\r
-                               FR\r
-\r
 70-B3-D5   (hex)               S.E.I. CO.,LTD.\r
 12D000-12DFFF     (base 16)            S.E.I. CO.,LTD.\r
                                59 Nirayama Tada\r
@@ -16985,17 +17303,167 @@ BE0000-BE0FFF     (base 16)          Cognosos, Inc.
                                Taoyuan      330\r
                                TW\r
 \r
+70-B3-D5   (hex)               PolyTech A/S\r
+F4C000-F4CFFF     (base 16)            PolyTech A/S\r
+                               HI Park 445\r
+                               Herning  Herning  7400\r
+                               DK\r
+\r
 70-B3-D5   (hex)               Zhuhai Lonl electric Co.,Ltd.\r
 EA9000-EA9FFF     (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)               PolyTech A/S\r
-F4C000-F4CFFF     (base 16)            PolyTech A/S\r
-                               HI Park 445\r
-                               Herning  Herning  7400\r
-                               DK\r
+70-B3-D5   (hex)               Shanghai Tiancheng Communication Technology Corporation\r
+1C3000-1C3FFF     (base 16)            Shanghai Tiancheng Communication Technology Corporation\r
+                               No.618,Guangxing Rd.,Songjiang \r
+                               shanghai    200090\r
+                               CN\r
+\r
+70-B3-D5   (hex)               SAMBO HITECH\r
+282000-282FFF     (base 16)            SAMBO HITECH\r
+                               469,Seokjung-ro,Namdong-Gu\r
+                               Incheon    21501\r
+                               KR\r
+\r
+70-B3-D5   (hex)               M.A.C. Solutions (UK) Ltd\r
+F9F000-F9FFFF     (base 16)            M.A.C. Solutions (UK) Ltd\r
+                               Units 6-7 Kingfisher Business Park, Arthur Street\r
+                               Redditch  Worcestershire  B98 8LG\r
+                               GB\r
+\r
+70-B3-D5   (hex)               ERA TOYS LIMITED\r
+193000-193FFF     (base 16)            ERA TOYS LIMITED\r
+                               Room 505, 5th Floor, Beverley Commercial Centre, 87-105 Chatham Road South\r
+                               Tsim Sha Tsui  Kowloon  0000\r
+                               HK\r
+\r
+70-B3-D5   (hex)               T&M Media Pty Ltd\r
+B41000-B41FFF     (base 16)            T&M Media Pty Ltd\r
+                               6, 476 Gardeners Road\r
+                               Alexandria  NSW  2015\r
+                               AU\r
+\r
+70-B3-D5   (hex)               A&T Corporation\r
+32E000-32EFFF     (base 16)            A&T Corporation\r
+                               2023-1\r
+                               Endo, Fujisawa, Kanagawa    252-0816\r
+                               JP\r
+\r
+70-B3-D5   (hex)               Scorpion Precision Industry (HK)CO. Ltd.\r
+02B000-02BFFF     (base 16)            Scorpion Precision Industry (HK)CO. Ltd.\r
+                               16th Floor, Excelsior Industrial Building,68-76 Sha Tsui Road,\r
+                               Tsuen Wan  New Territories  999077\r
+                               HK\r
+\r
+70-B3-D5   (hex)               Shenzhen CAMERAY ELECTRONIC CO., LTD\r
+1E2000-1E2FFF     (base 16)            Shenzhen CAMERAY ELECTRONIC CO., LTD\r
+                               4-5FL, Building 1, Guanghui Science, and Technology Park; Minqing Road, Longhua Town\r
+                               shenzhen  GD  518109\r
+                               CN\r
+\r
+70-B3-D5   (hex)               Vulcan Wireless Inc.\r
+E4D000-E4DFFF     (base 16)            Vulcan Wireless Inc.\r
+                               2218 Faraday Ave Suite 110\r
+                               Carlsbad  CA  92008\r
+                               US\r
+\r
+70-B3-D5   (hex)               MIVO Technology AB\r
+1D5000-1D5FFF     (base 16)            MIVO Technology AB\r
+                               Hornsbergsvägen 28\r
+                               Stockholm    11215\r
+                               SE\r
+\r
+70-B3-D5   (hex)               Cryptotronix LLC\r
+0DB000-0DBFFF     (base 16)            Cryptotronix LLC\r
+                               P.O. Box 273029\r
+                               Fort Collins  CO  80525\r
+                               US\r
+\r
+70-B3-D5   (hex)               TOMEI TSUSHIN KOGYO CO,.LTD\r
+FB1000-FB1FFF     (base 16)            TOMEI TSUSHIN KOGYO CO,.LTD\r
+                               100-3, Amaike Kodacho\r
+                               Inazawa Shi  Aichi ken  4928274\r
+                               JP\r
+\r
+70-B3-D5   (hex)               RCH Vietnam Limited Liability Company\r
+C09000-C09FFF     (base 16)            RCH Vietnam Limited Liability Company\r
+                               Workshop F.01B-2, Lot No. F.01B Long Hau\r
+                               Ho Chi Minh City  Ho Chi Minh  70000\r
+                               VN\r
+\r
+70-B3-D5   (hex)               Copper Labs, Inc.\r
+F69000-F69FFF     (base 16)            Copper Labs, Inc.\r
+                               3015 Sterling Circle #200\r
+                               Boulder  CO  80301\r
+                               US\r
+\r
+70-B3-D5   (hex)               DogWatch Inc\r
+1E7000-1E7FFF     (base 16)            DogWatch Inc\r
+                               10 Michigan Drive\r
+                               Natick    01760\r
+                               US\r
+\r
+70-B3-D5   (hex)               Grossenbacher Systeme AG\r
+B75000-B75FFF     (base 16)            Grossenbacher Systeme AG\r
+                               Spinnereistrasse 10\r
+                               St. Gallen    9008\r
+                               CH\r
+\r
+70-B3-D5   (hex)               ITsynergy Ltd\r
+D2A000-D2AFFF     (base 16)            ITsynergy Ltd\r
+                               9 Bonhill Street\r
+                               London    EC2A 4DJ\r
+                               GB\r
+\r
+70-B3-D5   (hex)               SHENZHEN HUINENGYUAN Technology Co., Ltd\r
+A83000-A83FFF     (base 16)            SHENZHEN HUINENGYUAN Technology Co., Ltd\r
+                               Room 206, 3 Building, Hongwanchuangke Center, Gushu, Xixiang, Baoan District\r
+                               Shenzhen  Guangdong  518126\r
+                               CN\r
+\r
+70-B3-D5   (hex)               Vars Technology \r
+C94000-C94FFF     (base 16)            Vars Technology \r
+                               Squires gate industrial estate Unit 14\r
+                               Blackpool  lancashire   FY4 3RN\r
+                               GB\r
+\r
+70-B3-D5   (hex)               Burk Technology\r
+641000-641FFF     (base 16)            Burk Technology\r
+                               7 Beaver Brook road\r
+                               Littleton  MA  01460\r
+                               US\r
+\r
+70-B3-D5   (hex)               Inventeq B.V.\r
+529000-529FFF     (base 16)            Inventeq B.V.\r
+                               Ravenlaan 27\r
+                               Blaricum    1261WT\r
+                               NL\r
+\r
+70-B3-D5   (hex)               Vaunix Technology Corporation\r
+EE6000-EE6FFF     (base 16)            Vaunix Technology Corporation\r
+                               7 New Pasture Rd\r
+                               Newburyport  MA  01950\r
+                               US\r
+\r
+70-B3-D5   (hex)               Portrait Displays, Inc.\r
+D77000-D77FFF     (base 16)            Portrait Displays, Inc.\r
+                               6663 OWENS DR\r
+                               PLEASANTON  CA  94588\r
+                               US\r
+\r
+70-B3-D5   (hex)               chargeBIG\r
+869000-869FFF     (base 16)            chargeBIG\r
+                               Pragstraße 26-46\r
+                               Stuttgart    70376\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Tricom Research Inc.\r
+601000-601FFF     (base 16)            Tricom Research Inc.\r
+                               17791 Sky Park Circle Suite GHJ\r
+                               Irvine  CA  92614\r
+                               US\r
 \r
 70-B3-D5   (hex)               DISMUNTEL SAL\r
 92C000-92CFFF     (base 16)            DISMUNTEL SAL\r
@@ -21292,3 +21760,111 @@ F5D000-F5DFFF     (base 16)           Potter Electric Signal Co. LLC
                                via Cupa Vicinale S.Aniello, 88\r
                                Naples    80146\r
                                IT\r
+\r
+70-B3-D5   (hex)               ITK Dr. Kassen GmbH\r
+58A000-58AFFF     (base 16)            ITK Dr. Kassen GmbH\r
+                               Beim Eberacker 3\r
+                               D-35633 Lahnau    \r
+                               DE\r
+\r
+70-B3-D5   (hex)               RCH Vietnam Limited Liability Company\r
+88E000-88EFFF     (base 16)            RCH Vietnam Limited Liability Company\r
+                               Workshop F.01B-2, Lot No. F.01B Long Hau\r
+                               Ho Chi Minh City  Ho Chi Minh  70000\r
+                               VN\r
+\r
+70-B3-D5   (hex)               Privafy, Inc\r
+A6A000-A6AFFF     (base 16)            Privafy, Inc\r
+                               2 Burlington Woods Dr. Suite 200\r
+                               Burlington  MA  01803\r
+                               US\r
+\r
+70-B3-D5   (hex)               Contec Americas Inc.\r
+5D2000-5D2FFF     (base 16)            Contec Americas Inc.\r
+                               3991 Sarno Rd\r
+                               Melbourne  FL  32934\r
+                               US\r
+\r
+70-B3-D5   (hex)               elements\r
+62D000-62DFFF     (base 16)            elements\r
+                               Townsgate Road Suite 200 \r
+                               Westlake Village  CA  91361\r
+                               US\r
+\r
+70-B3-D5   (hex)               DAT Informatics Pvt Ltd\r
+244000-244FFF     (base 16)            DAT Informatics Pvt Ltd\r
+                               Plot No 109 HPSIDC Industria Estate Davni, Baddi\r
+                               Baddi  HIMACHAL PRADESH  173205\r
+                               IN\r
+\r
+70-B3-D5   (hex)               Abbott Diagnostics Technologies AS\r
+6C6000-6C6FFF     (base 16)            Abbott Diagnostics Technologies AS\r
+                               P. O.  Box 6863 Rodeløkka\r
+                               Oslo  Oslo  0504\r
+                               NO\r
+\r
+70-B3-D5   (hex)               RCH Vietnam Limited Liability Company\r
+6BD000-6BDFFF     (base 16)            RCH Vietnam Limited Liability Company\r
+                               Workshop F.01B-2, Lot No. F.01B Long Hau\r
+                               Ho Chi Minh City  Ho Chi Minh  70000\r
+                               VN\r
+\r
+70-B3-D5   (hex)               Gamber Johnson-LLC\r
+E34000-E34FFF     (base 16)            Gamber Johnson-LLC\r
+                               3001 Borham Ave\r
+                               Stevens Point  WI  54481\r
+                               US\r
+\r
+70-B3-D5   (hex)               YUYAMA MFG Co.,Ltd\r
+C2B000-C2BFFF     (base 16)            YUYAMA MFG Co.,Ltd\r
+                               3-3-1\r
+                               TOYONAKASHI  OSAKA  561-0841\r
+                               JP\r
+\r
+70-B3-D5   (hex)               YUYAMA MFG Co.,Ltd\r
+1F2000-1F2FFF     (base 16)            YUYAMA MFG Co.,Ltd\r
+                               3-3-1\r
+                               TOYONAKASHI  OSAKA  561-0841\r
+                               JP\r
+\r
+70-B3-D5   (hex)               QUALITTEQ LLC\r
+614000-614FFF     (base 16)            QUALITTEQ LLC\r
+                               16th Parkovaya 26/1\r
+                               Moscow    105484\r
+                               RU\r
+\r
+70-B3-D5   (hex)               Adcole Maryland Aerospace\r
+922000-922FFF     (base 16)            Adcole Maryland Aerospace\r
+                               669 Forest St\r
+                               Marlborough  MA  01752\r
+                               US\r
+\r
+70-B3-D5   (hex)               eSMART Technologies SA\r
+979000-979FFF     (base 16)            eSMART Technologies SA\r
+                               Chemin de la Rueyre, 118\r
+                               Renens VD    1020\r
+                               CH\r
+\r
+70-B3-D5   (hex)               Axnes AS\r
+65F000-65FFFF     (base 16)            Axnes AS\r
+                               Terje Løvåsvei 1\r
+                               Grimstad    4879\r
+                               NO\r
+\r
+70-B3-D5   (hex)               Duplomatic MS spa\r
+DE1000-DE1FFF     (base 16)            Duplomatic MS spa\r
+                               Via Re Depaolini 24\r
+                               Parabiago  Milan  20015\r
+                               IT\r
+\r
+70-B3-D5   (hex)               Nanjing Pingguang Electronic Technology Co., Ltd\r
+541000-541FFF     (base 16)            Nanjing Pingguang Electronic Technology Co., Ltd\r
+                               B30/B31 4th Floor, Building#11, Shengtai Road, JiangNing District\r
+                               NanJing    211100\r
+                               CN\r
+\r
+70-B3-D5   (hex)               thingdust AG\r
+3C1000-3C1FFF     (base 16)            thingdust AG\r
+                               Moosstrasse 7\r
+                               Lucerne  Lucerne  6003\r
+                               CH\r

diff --git a/hwdb.d/parse_hwdb.py b/hwdb.d/parse_hwdb.py
index 9a933b82b290869d564f2e98630c77b253df723c..b5395b11fe53627aa9f472812ee66213b7e0121d 100755 (executable)
--- a/hwdb.d/parse_hwdb.py
+++ b/hwdb.d/parse_hwdb.py
@@ -196,10 +196,11 @@ def check_one_mount_matrix(prop, value):
 def check_one_keycode(prop, value):
     if value != '!' and ecodes is not None:
         key = 'KEY_' + value.upper()
-        if key not in ecodes:
-            key = value.upper()
-            if key not in ecodes:
-                error('Keycode {} unknown', key)
+        if not (key in ecodes or
+                value.upper() in ecodes or
+                 # new keys added in kernel 5.5
+                'KBD_LCD_MENU' in key):
+            error('Keycode {} unknown', key)
 
 def check_properties(groups):
     grammar = property_grammar()

diff --git a/hwdb.d/pci.ids b/hwdb.d/pci.ids
index bb92533d91e0b0070961a0c439e8cada899be2f3..59407399fc38447739d83fd7abb6dcef85515812 100644 (file)
--- a/hwdb.d/pci.ids
+++ b/hwdb.d/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2019.11.26
-#      Date:    2019-11-26 03:15:03
+#      Version: 2020.01.25
+#      Date:    2020-01-25 03:15:02
 #
 #      Maintained by Albert Pool, Martin Mares, and other volunteers from
 #      the PCI ID Project at https://pci-ids.ucw.cz/.
@@ -643,6 +643,8 @@
                1028 1fd3  HBA330 MMZ
 # Supermicro AOC-S3008L-L8e uses 0808 for their SAS3008 SAS controller
                15d9 0808  AOC-S3008L-L8e
+               1bd4 000b  12G SAS3008IR
+               1bd4 000c  12G SAS3008IT
                1bd4 0011  Inspur 12Gb 8i-3008 IT SAS HBA
        00ab  SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
 # 8 Internal and 8 External port channel 9400 HBA
@@ -1164,6 +1166,7 @@
                1458 b002  GA-MA770-DS3rev2.0 Motherboard
                1849 4390  Motherboard (one of many)
        4391  SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode]
+               103c 1609  ProLiant MicroServer N36L
                103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
                1043 8443  M5A88-V EVO
@@ -1177,6 +1180,7 @@
        4395  SB8x0/SB9x0 SATA Controller [Storage mode]
        4396  SB7x0/SB8x0/SB9x0 USB EHCI Controller
                1019 2120  A785GM-M
+               103c 1609  ProLiant MicroServer N36L
                103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
                1043 8443  M5A88-V EVO
@@ -1185,6 +1189,7 @@
                174b 1001  PURE Fusion Mini
        4397  SB7x0/SB8x0/SB9x0 USB OHCI0 Controller
                1019 2120  A785GM-M
+               103c 1609  ProLiant MicroServer N36L
                103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
                1043 8443  M5A88-V EVO
@@ -1205,10 +1210,12 @@
        439c  SB7x0/SB8x0/SB9x0 IDE Controller
                1002 4392  MSI MS-7713 motherboard
                1019 2120  A785GM-M
+               103c 1609  ProLiant MicroServer N36L
                1043 82ef  M3A78-EH Motherboard
                105b 0e13  N15235/A74MX mainboard / AMD SB700
        439d  SB7x0/SB8x0/SB9x0 LPC host controller
                1019 2120  A785GM-M
+               103c 1609  ProLiant MicroServer N36L
                103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
                1043 8443  M5A88-V EVO
@@ -2562,6 +2569,7 @@
                1787 a470  Radeon RX 470
                1787 a480  Radeon RX 480
                1849 5001  Phantom Gaming X RX 580 OC
+               1849 5030  Phantom Gaming D Radeon RX580 8G OC
                1da2 e353  Radeon RX 570 Pulse 4GB
                1da2 e366  Nitro+ Radeon RX 570/580/590
        67e0  Baffin [Radeon Pro WX 4170]
@@ -3502,8 +3510,12 @@
                1043 04a0  Radeon R9 FURY X
                174b e329  Radeon R9 FURY
        7310  Navi 10
-       731f  Navi 10 [Radeon RX 5700 / 5700 XT]
-       7340  Navi 14 [Radeon RX 5500 / 5500M]
+       7312  Navi 10 [Radeon Pro W5700]
+       731f  Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]
+       7340  Navi 14 [Radeon RX 5500/5500M / Pro 5500M]
+       7341  Navi 14 [Radeon Pro W5500]
+       7347  Navi 14 [Radeon Pro W5500M]
+       734f  Navi 14 [Radeon Pro W5300M]
        7833  RS350 Host Bridge
        7834  RS350 [Radeon 9100 PRO/XT IGP]
        7835  RS350M [Mobility Radeon 9000 IGP]
@@ -3739,6 +3751,7 @@
                1019 2120  A785GM-M
                1043 83a2  M4A785TD Motherboard
        9712  RS880M [Mobility Radeon HD 4225/4250]
+               103c 1609  ProLiant MicroServer N36L
        9713  RS880M [Mobility Radeon HD 4100]
        9714  RS880 [Radeon HD 4290]
        9715  RS880 [Radeon HD 4250]
@@ -3757,6 +3770,7 @@
        9830  Kabini [Radeon HD 8400 / R3 Series]
        9831  Kabini [Radeon HD 8400E]
        9832  Kabini [Radeon HD 8330]
+               1849 9832  QC5000-ITX/PH
        9833  Kabini [Radeon HD 8330E]
        9834  Kabini [Radeon HD 8210]
        9835  Kabini [Radeon HD 8310E]
@@ -3766,6 +3780,7 @@
        9839  Kabini [Radeon HD 8180]
        983d  Temash [Radeon HD 8250/8280G]
        9840  Kabini HDMI/DP Audio
+               1849 9840  QC5000-ITX/PH
        9850  Mullins [Radeon R3 Graphics]
        9851  Mullins [Radeon R4/R5 Graphics]
                1179 f928  Beema [Radeon R5 Graphics]
@@ -4534,6 +4549,7 @@
        1467  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 7
        1468  Zeppelin Cryptographic Coprocessor NTBCCP
        1480  Starship/Matisse Root Complex
+               1462 7c37  X570-A PRO motherboard
        1481  Starship/Matisse IOMMU
        1482  Starship/Matisse PCIe Dummy Host Bridge
        1483  Starship/Matisse GPP Bridge
@@ -4541,6 +4557,7 @@
        1485  Starship/Matisse Reserved SPP
        1486  Starship/Matisse Cryptographic Coprocessor PSPCPP
        1487  Starship/Matisse HD Audio Controller
+               1462 9c37  X570-A PRO motherboard
        1488  Starship Reserved SSP
        1489  Starship Reserved SSP
        148a  Starship/Matisse PCIe Dummy Function
@@ -4562,6 +4579,7 @@
        149a  Starship PCIe GPP Bridge [1:0]
        149b  Starship Reserved SSP
        149c  Matisse USB 3.0 Host Controller
+               1462 7c37  X570-A PRO motherboard
        1510  Family 14h Processor Root Complex
                174b 1001  PURE Fusion Mini
        1512  Family 14h Processor Root Port
@@ -4576,6 +4594,7 @@
        1534  Family 16h Processor Function 4
        1535  Family 16h Processor Function 5
        1536  Family 16h Processor Root Complex
+               1849 1536  QC5000-ITX/PH
        1537  Kabini/Mullins PSP-Platform Security Processor
        1538  Family 16h Processor Function 0
        1539  Kabini P2P Bridge for PCIe Ports[4:0]
@@ -4810,6 +4829,9 @@
        43c7  400 Series Chipset PCIe Port
        43c8  400 Series Chipset SATA Controller
        43d5  400 Series Chipset USB 3.1 XHCI Controller
+       57a3  Matisse PCIe GPP Bridge
+       57a4  Matisse PCIe GPP Bridge
+       57ad  Matisse Switch Upstream
        7006  AMD-751 [Irongate] System Controller
        7007  AMD-751 [Irongate] AGP Bridge
        700a  AMD-IGR4 AGP Host to PCI Bridge
@@ -4868,6 +4890,7 @@
        7801  FCH SATA Controller [AHCI mode]
                103c 168b  ProBook 4535s Notebook
                103c 194e  ProBook 455 G1 Notebook
+               1849 7801  QC5000-ITX/PH
        7802  FCH SATA Controller [RAID mode]
        7803  FCH SATA Controller [RAID mode]
        7804  FCH SATA Controller [AHCI mode]
@@ -4877,32 +4900,39 @@
        7807  FCH USB OHCI Controller
                103c 194e  ProBook 455 G1 Notebook
                103c 1985  Pavilion 17-e163sg Notebook PC
+               1849 7807  QC5000-ITX/PH
        7808  FCH USB EHCI Controller
                103c 194e  ProBook 455 G1 Notebook
                103c 1985  Pavilion 17-e163sg Notebook PC
+               1849 7808  QC5000-ITX/PH
        7809  FCH USB OHCI Controller
                103c 194e  ProBook 455 G1 Notebook
        780a  Kabini/Mullins SATA Raid/AHCI Mode (DotHill driver)
        780b  FCH SMBus Controller
                103c 194e  ProBook 455 G1 Notebook
                103c 1985  Pavilion 17-e163sg Notebook PC
+               1849 780b  QC5000-ITX/PH
        780c  FCH IDE Controller
        780d  FCH Azalia Controller
                103c 194e  ProBook 455 G1 Notebook
                103c 1985  Pavilion 17-e163sg Notebook PC
                1043 8444  F2A85-M Series
+               1849 8892  QC5000-ITX/PH
        780e  FCH LPC Bridge
                103c 194e  ProBook 455 G1 Notebook
                103c 1985  Pavilion 17-e163sg Notebook PC
+               1849 780e  QC5000-ITX/PH
        780f  FCH PCI Bridge
        7812  FCH USB XHCI Controller
        7813  FCH SD Flash Controller
        7814  FCH USB XHCI Controller
                103c 194e  ProBook 455 G1 Notebook
                103c 1985  Pavilion 17-e163sg Notebook PC
+               1849 7814  QC5000-ITX/PH
        7900  FCH SATA Controller [IDE mode]
        7901  FCH SATA Controller [AHCI mode]
                103c 8615  Pavilion Laptop 15-cw1xxx
+               1462 7c37  X570-A PRO motherboard
        7902  FCH SATA Controller [RAID mode]
        7903  FCH SATA Controller [RAID mode]
        7904  FCH SATA Controller [AHCI mode]
@@ -4910,8 +4940,10 @@
        7908  FCH USB EHCI Controller
        790b  FCH SMBus Controller
                103c 8615  Pavilion Laptop 15-cw1xxx
+               1462 7c37  X570-A PRO motherboard
        790e  FCH LPC Bridge
                103c 8615  Pavilion Laptop 15-cw1xxx
+               1462 7c37  X570-A PRO motherboard
        790f  FCH PCI Bridge
        7914  FCH USB XHCI Controller
        9600  RS780 Host Bridge
@@ -4919,13 +4951,16 @@
                1043 82f1  M3A78-EH Motherboard
        9601  RS880 Host Bridge
                1019 2120  A785GM-M
+               103c 1609  ProLiant MicroServer N36L
                1043 83a2  M4A785-M Mainboard
                1043 843e  M5A88-V EVO
        9602  RS780/RS880 PCI to PCI bridge (int gfx)
        9603  RS780 PCI to PCI bridge (ext gfx port 0)
+               103c 1609  ProLiant MicroServer N36L
        9604  RS780/RS880 PCI to PCI bridge (PCIE port 0)
        9605  RS780/RS880 PCI to PCI bridge (PCIE port 1)
        9606  RS780 PCI to PCI bridge (PCIE port 2)
+               103c 1609  ProLiant MicroServer N36L
        9607  RS780/RS880 PCI to PCI bridge (PCIE port 3)
        9608  RS780/RS880 PCI to PCI bridge (PCIE port 4)
        9609  RS780/RS880 PCI to PCI bridge (PCIE port 5)
@@ -5881,6 +5916,7 @@
        4031  zx2 I/O Controller
        4037  PCIe Local Bus Adapter
        9602  AMD RS780/RS880 PCI to PCI bridge (int gfx)
+               103c 1609  ProLiant MicroServer N36L
 103e  Solliday Engineering
 103f  Synopsys/Logic Modeling Group
 1040  Accelgraphics Inc.
@@ -6974,6 +7010,13 @@
                1077 0055  QLogic 2x10GE QL41132HQCU NIC
                1077 0056  2x10GE QL41132HxRJ NIC
                1077 0057  2x25GE QL41232HxCU NIC
+               1077 0068  10GbE 2p SFP+ QL41132HLCU-HC Adapter
+               1077 0069  10GbE 2p BASE-T QL41132HQRJ-HC OCP3 Adapter
+               1077 0070  10GbE 2p BASE-T QL41132HLRJ-HC Adapter
+               1077 0071  10GbE 2p SFP+ QL41132HQCU-HC OCP3 Adapter
+               1077 0072  10GbE 4p SFP+ QL41134HLCU-HC Adapter
+               1077 0073  10/25GbE 2p SFP28 QL41232HQCU-HC OCP3 Adapter
+               1077 0074  10/25GbE 2p SFP28 QL41232HLCU-HC Adapter
                1590 021a  10GbE 2P QL41162HLRJ-HP Adapter
                1590 021b  10GbE 2P QL41162HLRJ-HP Adapter
                1590 021d  10/25GbE 2P QL41222HLCU-HP Adapter
@@ -11075,6 +11118,7 @@
        10f0  GP104 High Definition Audio Controller
        10f1  GP106 High Definition Audio Controller
        10f7  TU102 High Definition Audio Controller
+       10f8  TU104 HD Audio Controller
        10f9  TU106 High Definition Audio Controller
                1043 8673  TURBO-RTX2070-8G
        1140  GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M]
@@ -11705,6 +11749,7 @@
        1adb  TU106 USB Type-C UCSI Controller
                1043 8673  TURBO-RTX2070-8G
        1aeb  TU116 High Definition Audio Controller
+       1aed  TU116 [GeForce GTX 1650 SUPER]
        1b00  GP102 [TITAN X]
        1b01  GP102 [GeForce GTX 1080 Ti 10GB]
        1b02  GP102 [TITAN Xp]
@@ -11766,6 +11811,7 @@
                1414 0020  GTX 1060 Mobile
        1c2d  GP106M
        1c30  GP106GL [Quadro P2000]
+       1c31  GP106GL [Quadro P2200]
        1c35  GP106
        1c60  GP106BM [GeForce GTX 1060 Mobile 6GB]
                103c 8390  GeForce GTX 1060 Max-Q 6GB
@@ -11774,6 +11820,8 @@
        1c70  GP106GL
        1c81  GP107 [GeForce GTX 1050]
        1c82  GP107 [GeForce GTX 1050 Ti]
+               1043 8613  PH-GTX1050TI-4G
+               1458 3763  GV-N105TOC-4GD
        1c83  GP107 [GeForce GTX 1050 3GB]
        1c8c  GP107M [GeForce GTX 1050 Ti Mobile]
        1c8d  GP107M [GeForce GTX 1050 Mobile]
@@ -11782,6 +11830,7 @@
        1c90  GP107M [GeForce MX150]
        1c91  GP107M [GeForce GTX 1050 3 GB Max-Q]
        1c92  GP107M [GeForce GTX 1050 Mobile]
+       1c94  GP107M [GeForce MX350]
        1ca7  GP107GL
        1ca8  GP107GL
        1caa  GP107GL
@@ -11798,6 +11847,7 @@
                103c 842f  P1000 [Zbook 17 G5 mobile workstation]
                103c 8451  P1000 [Zbook Studio x360 G5 mobile workstation]
        1cbc  GP107GLM [Quadro P600 Mobile]
+       1cbd  GP107GLM [Quadro P620]
        1ccc  GP107BM [GeForce GTX 1050 Ti Mobile]
        1ccd  GP107BM [GeForce GTX 1050 Mobile]
        1d01  GP108 [GeForce GT 1030]
@@ -11807,18 +11857,24 @@
        1d12  GP108M [GeForce MX150]
                1d72 1701  Mi Notebook Pro [GeForce MX150]
        1d13  GP108M [GeForce MX250]
+       1d16  GP108M [GeForce MX330]
        1d33  GP108GLM [Quadro P500 Mobile]
+       1d34  GP108GLM [Quadro P520]
        1d52  GP108BM [GeForce MX250]
        1d81  GV100 [TITAN V]
        1db1  GV100GL [Tesla V100 SXM2 16GB]
-       1db2  GV100GL [Tesla V100-DGXS-16GB]
+       1db2  GV100GL [Tesla V100 DGXS 16GB]
        1db3  GV100GL [Tesla V100 FHHL 16GB]
        1db4  GV100GL [Tesla V100 PCIe 16GB]
        1db5  GV100GL [Tesla V100 SXM2 32GB]
        1db6  GV100GL [Tesla V100 PCIe 32GB]
        1db7  GV100GL [Tesla V100 DGXS 32GB]
+       1db8  GV100GL [Tesla V100 SXM3 32GB]
+               10de 131d  Tesla V100-SXM3-32GB-H
        1dba  GV100GL [Quadro GV100]
                10de 12eb  TITAN V CEO Edition
+       1df5  GV100GL [Tesla V100 SXM2 16GB]
+       1df6  GV100GL [Tesla V100S PCIe 32GB]
        1e02  TU102 [TITAN RTX]
        1e04  TU102 [GeForce RTX 2080 Ti]
        1e07  TU102 [GeForce RTX 2080 Ti Rev. A]
@@ -11832,10 +11888,14 @@
        1e3c  TU102GL
        1e3d  TU102GL
        1e3e  TU102GL
+       1e78  TU102GL [Quadro RTX 6000/8000]
+               10de 13d8  Quadro RTX 8000
+               10de 13d9  Quadro RTX 6000
        1e81  TU104 [GeForce RTX 2080 SUPER]
        1e82  TU104 [GeForce RTX 2080]
        1e84  TU104 [GeForce RTX 2070 SUPER]
        1e87  TU104 [GeForce RTX 2080 Rev. A]
+       1e89  TU104 [GeForce RTX 2060]
        1e90  TU104M [GeForce RTX 2080 Mobile]
        1eab  TU104M
        1eae  TU104M
@@ -11846,6 +11906,8 @@
        1eb8  TU104GL [Tesla T4]
        1eb9  TU104GL
        1ebe  TU104GL
+       1ec2  TU104 [GeForce RTX 2070 SUPER]
+       1ec7  TU104 [GeForce RTX 2070 SUPER]
        1ed0  TU104BM [GeForce RTX 2080 Mobile]
        1f02  TU106 [GeForce RTX 2070]
                1043 8673  TURBO RTX 2070
@@ -11857,11 +11919,15 @@
        1f11  TU106M [GeForce RTX 2060 Mobile]
        1f2e  TU106M
        1f36  TU106GLM [Quadro RTX 3000 Mobile / Max-Q]
+       1f42  TU106 [GeForce RTX 2060 SUPER]
+       1f47  TU106 [GeForce RTX 2060 SUPER]
        1f50  TU106BM [GeForce RTX 2070 Mobile]
        1f51  TU106BM [GeForce RTX 2060 Mobile]
        1f81  TU117
        1f82  TU117 [GeForce GTX 1650]
+       1f91  TU117M [GeForce GTX 1650 Mobile / Max-Q]
        1f92  TU117M [GeForce GTX 1650 Mobile]
+       1f96  TU117M [GeForce GTX 1650 Mobile / Max-Q]
        1fae  TU117GL
        1fb8  TU117GLM [Quadro T2000 Mobile / Max-Q]
        1fb9  TU117GLM [Quadro T1000 Mobile]
@@ -11869,9 +11935,11 @@
        2182  TU116 [GeForce GTX 1660 Ti]
        2183  TU116
        2184  TU116 [GeForce GTX 1660]
+       2187  TU116 [GeForce GTX 1650 SUPER]
        2191  TU116M [GeForce GTX 1660 Ti Mobile]
        21ae  TU116GL
        21bf  TU116GL
+       21c4  TU116 [GeForce GTX 1660 SUPER]
        21d1  TU116BM [GeForce GTX 1660 Ti Mobile]
 10df  Emulex Corporation
        0720  OneConnect NIC (Skyhawk)
@@ -12129,7 +12197,7 @@
                103c 006a  NX9500
                103c 2a20  Pavilion t3030.de Desktop PC
                103c 30d9  Presario C700
-               1043 1045  L8400B or L3C/S notebook
+               1043 1045  L8400B, L3C/S, X58LE notebook
                1043 8109  P5P800-MX Mainboard
                1071 8160  MIM2000
                10bd 0320  EP-320X-R
@@ -12204,6 +12272,7 @@
                1462 368c  K9AG Neo2
                1462 4180  Wind PC MS-7418
                1462 7522  X58 Pro-E
+               1462 7c37  X570-A PRO motherboard
                1775 11cc  CC11/CL11
                1849 8168  Motherboard (one of many)
                7470 3468  TG-3468 Gigabit PCI Express Network Adapter
@@ -12258,6 +12327,7 @@
        b822  RTL8822BE 802.11a/b/g/n/ac WiFi adapter
                103c 831b  Realtek RTL8822BE 802.11ac 2 × 2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported)
        c821  RTL8821CE 802.11ac PCIe Wireless Network Adapter
+       c822  RTL8822CE 802.11ac PCIe Wireless Network Adapter
        d723  RTL8723DE 802.11b/g/n PCIe Adapter
 10ed  Ascii Corporation
        7310  V7310
@@ -13920,7 +13990,7 @@
                1259 2975  AT-2970SX/2SC Gigabit Ethernet Adapter
                1259 2976  AT-2970LX/2SC Gigabit Ethernet Adapter
                1259 2977  AT-2970TX/2TX Gigabit Ethernet Adapter
-       4320  SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter, PCI64, Fiber ZX/SC
+       4320  SK-98xx V2.0 Gigabit Ethernet Adapter [Marvell 88E8001]
                1148 0121  Marvell RDK-8001 Adapter
                1148 0221  Marvell RDK-8002 Adapter
                1148 0321  Marvell RDK-8003 Adapter
@@ -13939,9 +14009,23 @@
                1148 5061  SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter
                1148 5071  SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
                1148 9521  SK-9521 10/100/1000Base-T Adapter
+               1259 2916  AT-2916T
        4400  SK-9Dxx Gigabit Ethernet Adapter
        4500  SK-9Mxx Gigabit Ethernet Adapter
-       9000  SK-9S21 10/100/1000Base-T Server Adapter, PCI-X, Copper RJ-45
+       9000  SK-9Sxx Gigabit Ethernet Server Adapter PCI-X [Marvell 88E8022]
+               1148 2100  SK-9S21 10/100/1000Base-T Server Adapter, PCI-X, Copper RJ-45
+               1148 2200  SK-9S22 10/100/1000Base-T Dual Port Server Adapter, PCI-X, 2 Copper RJ-45
+               1148 2210  SK-9P22 10/100/1000 Base-T Dual Port PMC card
+               1148 2220  TPMC-GBE-CO
+               1148 8100  SK-9S81 1000Base-SX Server Adapter,PCI-X, Fiber SX/LC
+               1148 8200  SK-9S82 1000Base-SX Dual Port Server Adapter, PCI-X, 2 Fiber SX/LC
+               1148 8210  SK-9P82 1000 Base-SX Dual Port PMC card
+               1148 8220  TPMC-GBE-FI
+               1148 9100  SK-9S91 1000Base-LX Server Adapter,PCI-X, Fiber LX/LC
+               1148 9200  SK-9S92 1000Base-LX Dual Port Server Adapter, PCI-X, 2 Fiber LX/LC
+               1259 2973  AT-2971SX v2 Gigabit Adapter
+               1259 2974  AT-2971T v2 Gigabit Adapter
+               1259 2978  AT-2971LX Gigabit Adapter
        9843  [Fujitsu] Gigabit Ethernet
        9e00  SK-9E21D 10/100/1000Base-T Adapter, Copper RJ-45
                1148 2100  SK-9E21 Server Adapter
@@ -14310,6 +14394,7 @@
                1028 0188  Inspiron 6000 laptop
                103c 30c0  Compaq 6710b
                103c 30c1  Compaq 6910p
+               1043 1017  X58LE
                1043 1237  A6J-Q008
                1043 1967  V6800V
                1043 1987  A4K and Z81K notebooks, possibly others ( mid-2005 machines )
@@ -14354,6 +14439,7 @@
                103c 30b7  Presario V6133CL
                103c 30cc  Pavilion dv6700
                103c 30cf  Pavilion dv95xx/96xx/97xx/98xx series
+               1043 1017  X58LE
                1043 1237  A6J-Q008
                1043 1967  V6800V
                104d 9035  VAIO VGN-FW11ZRU
@@ -14374,6 +14460,7 @@
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                103c 30cf  Pavilion dv9668eg Laptop
+               1043 1017  X58LE
                1043 1237  A6J-Q008
                1043 1967  V6800V
                10f7 8338  Panasonic CF-Y5 laptop
@@ -14405,6 +14492,7 @@
                103c 1521  HP EliteBook 8540w
                103c 30b7  Presario V6133CL
                103c 30cf  Pavilion dv9500/9600/9700 series
+               1043 1017  X58LE
                1183 0843  Alienware Aurora m9700
        0852  xD-Picture Card Controller
                1025 0121  Aspire 5920G
@@ -14747,6 +14835,8 @@
        4380  88E8057 PCI-E Gigabit Ethernet Controller
 # AVB = "Audio Video Bridging"
        4381  Yukon Optima 88E8059 [PCIe Gigabit Ethernet Controller with AVB]
+               1259 2803  AT-2814FX
+               1259 2804  AT-2874xx
        4611  GT-64115 System Controller
        4620  GT-64120/64120A/64121A System Controller
        4801  GT-48001
@@ -15359,7 +15449,7 @@
        000e  PM/PPC
 1224  Interactive Images
 1225  Power I/O, Inc.
-1227  Tech-Source
+1227  EIZO Rugged Solutions
        0006  Raptor GFX 8P
        0023  Raptor GFX [1100T]
        0045  Raptor 4000-L [Linux version]
@@ -18426,6 +18516,7 @@
                10cf 1279  LifeBook E8010D
        165f  NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
                1028 04f7  PowerEdge R320 server
+               1028 08fd  PowerEdge R6515/R7515 LOM
                1028 08ff  PowerEdge Rx5xx LOM Board
                1028 0900  PowerEdge C6525 LOM
                103c 1786  NC332T Adapter
@@ -18925,6 +19016,8 @@
        4430  BCM44xx CardBus iLine32 HomePNA 2.0
        4432  BCM4432 CardBus 10/100BaseT
        4464  BCM4364 802.11ac Wireless Network Adapter
+# brcmfmac reports it as BCM4377/4 but macOS drivers call it BCM4377b
+       4488  BCM4377b Wireless Network Adapter
        4610  BCM4610 Sentry5 PCI to SB Bridge
        4611  BCM4610 Sentry5 iLine32 HomePNA 1.0
        4612  BCM4610 Sentry5 V.90 56k Modem
@@ -19686,6 +19779,8 @@
        0263  MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN
        0264  Innova-2 Flex Burn image
        0281  NPS-600 Flash Recovery
+       0538  MT2910 Family [ConnectX-7 Flash Recovery]
+       0539  MT2910 Family [ConnectX-7 Secure Flash Recovery]
        1002  MT25400 Family [ConnectX-2 Virtual Function]
        1003  MT27500 Family [ConnectX-3]
                1014 04b5  PCIe3 40GbE RoCE Converged Host Bus Adapter for Power
@@ -19770,7 +19865,7 @@
        101e  ConnectX Family mlx5Gen Virtual Function
        101f  MT2894 Family [ConnectX-6 Lx]
        1020  MT28860
-       1021  MT28861
+       1021  MT2910 Family [ConnectX-7]
        1974  MT28800 Family [ConnectX-5 PCIe Bridge]
        1975  MT416842 Family [BlueField SoC PCIe Bridge]
        1976  MT28908 Family [ConnectX-6 PCIe Bridge]
@@ -20879,6 +20974,7 @@
                17d3 1882  ARC-1882 8/12/16/24 Port PCIe 3.0 to SAS/SATA 6Gb RAID Controller
                17d3 1883  ARC-1883 8/12/16/24 Port PCIe 3.0 to SAS/SATA 12Gb RAID Controller
        1884  ARC-1884 series PCIe 3.0 to SAS/SATA 12/6Gb RAID Controller
+       188a  ARC-1886 series PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller
 # nee Neterion Inc., previously S2io Inc.
 17d5  Exar Corp.
        5731  Xframe 10-Gigabit Ethernet PCI-X
@@ -21637,7 +21733,7 @@
        1026  AR8121/AR8113/AR8114 Gigabit or Fast Ethernet
                1043 8304  P5KPL-CM Motherboard
        1048  Attansic L1 Gigabit Ethernet
-               1043 8226  P5KPL-VM Motherboard
+               1043 8226  P5B-MX/WiFi-AP, P5KPL-VM Motherboard
        1062  AR8132 Fast Ethernet
        1063  AR8131 Gigabit Ethernet
                1458 e000  GA-G31M-ES2L Motherboard
@@ -21712,6 +21808,7 @@
 1987  Phison Electronics Corporation
        5007  E7 NVMe Controller
        5012  E12 NVMe Controller
+       5016  E16 PCIe4 NVMe Controller
 1989  Montilio Inc.
        0001  RapidFile Bridge
        8001  RapidFile
@@ -21794,16 +21891,30 @@
                19e5 3034  NVMe SSD ES3600C V3 1600GB HHHL AIC
                19e5 3036  NVMe SSD ES3600C V3 3200GB HHHL AIC
        0200  Hi1822 Family (2*100GE)
+               19e5 d139  Hi1822 SP572 (2*100GE)
        0202  Hi1822 Family (2*32G FC)
+               19e5 d302  Hi1822 SP521 (2*32G FC)
+               19e5 d304  Hi1822 SP526 (2*32G FC)
        0203  Hi1822 Family (2*16G FC)
+               19e5 d301  Hi1822 SP520 (2*16G FC)
+               19e5 d305  Hi1822 SP525 (2*16G FC)
        0205  Hi1822 Family (2*100GE)
+               19e5 df27  Hi1822 MZ731 MEZZ (2*100GE)
        0206  Hi1822 Family (2*25GE)
+               19e5 d138  Hi1822 SP582 (2*25GE)
        0210  Hi1822 Family (4*25GE)
+               19e5 df2e  Hi1822 MZ532 MEZZ (4*25GE)
        0211  Hi1822 Family (4*25GE)
+               19e5 d12f  Hi1822 SP571 (4*25GE)
+               19e5 d137  Hi1822 SP581 (4*25GE)
        0212  Hi1822 Family (2*8G FC)
+               19e5 d303  Hi1822 SP522 (2*8G FC)
+               19e5 d306  Hi1822 SP523 (2*8G FC)
        1710  iBMA Virtual Network Adapter
        1711  Hi1710 [iBMC Intelligent Management system chip w/VGA support]
        1822  Hi1822 Family (4*25GE)
+               19e5 d129  Hi1822 SP570 (4*25GE)
+               19e5 d136  Hi1822 SP580 (4*25GE)
        371e  Hi1822 Family Virtual Bridge
        375e  Hi1822 Family Virtual Function
        379e  Hi1822 Family Virtual Function
@@ -21992,6 +22103,8 @@
        0310  Wil6200 802.11ad Wireless Network Adapter
 1aea  Alcor Micro
        6601  AU6601 PCI-E Flash card reader controller
+       6621  AU6621 PCI-E Flash card reader controller
+       6625  AU6625 PCI-E Flash card reader controller
 1aec  Wolfson Microelectronics
 # nee Fusion-io
 1aed  SanDisk
@@ -22169,6 +22282,7 @@
 1b6f  Etron Technology, Inc.
        7023  EJ168 USB 3.0 Host Controller
        7052  EJ188/EJ198 USB 3.0 Host Controller
+               1849 7052  QC5000-ITX/PH
 1b73  Fresco Logic
        1000  FL1000G USB 3.0 Host Controller
                1d5c 1000  Anker USB 3.0 Express Card
@@ -22309,7 +22423,7 @@
        00a4  FBC4XGG3 Capture 4x10Gb [Livigno]
        00a5  FBC2XLG Capture 2x40Gb [Livorno]
        00a6  FBC1CG Capture 1x100Gb
-       00a9  FBC2XGHH Capture 2x10Gb
+       00a9  FBC2XGHH Capture 2x10Gb [Latina]
        00ad  FBC2CGG3HL Capture 2x100Gb [Padua]
        00af  Capture slave device
        00e0  PacketMover 2x100Gb [Savona]
@@ -22353,7 +22467,14 @@
        1285  PC300 NVMe Solid State Drive 1TB
        1504  SC300 512GB M.2 2280 SATA Solid State Drive
 1c5f  Beijing Memblaze Technology Co. Ltd.
+       000d  PBlaze5 520/526 AIC
+       003d  PBlaze5 920/926 AIC
+       010d  PBlaze5 520/526 U.2
+       013d  PBlaze5 920/926 U.2
        0540  PBlaze4 NVMe SSD
+       0550  PBlaze5 700/900
+       0555  PBlaze5 510/516
+       0557  PBlaze5 910/916
 # http://www.nicevt.ru/ (in Russian)
 1c63  Science and Research Centre of Computer Technology (JSC "NICEVT")
 # http://www.radiotec.ru/catalog.php?cat=jr8&art=14109
@@ -22603,6 +22724,7 @@
 1dbb  NGD Systems, Inc.
 1dbf  Guizhou Huaxintong Semiconductor Technology Co., Ltd
        0401  StarDragon4800 PCI Express Root Port
+1dc5  FADU Inc.
 1dd8  Pensando Systems Inc
        1000  DSC Capri Upstream Port
                1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
@@ -22660,6 +22782,7 @@
                1df3 0001  ENA2080F
                1df3 0002  ENA2080FS
                1df3 0003  ENA2100F
+               1df3 0004  ENA2040F
        0204  ACE-NIC-NID Programmable Network Accelerator
                1df3 0001  ENA1020Z
                1df3 0002  ENA1020ZS
@@ -22682,7 +22805,8 @@
 # JungleCat VU35P Module
        1635  JCM35
 1e26  Fujitsu Client Computing Limited
-1e38  Thinci, Inc
+# nee Thinci, Inc
+1e38  Blaize, Inc
 1e3d  Burlywood, Inc
 1e49  Yangtze Memory Technologies Co.,Ltd
 1e4c  GSI Technology
@@ -22690,7 +22814,12 @@
        0010  Gemini [ Lida ]
                1e4c 0120  SE120
 1e57  Beijing Panyi Technology Co., Ltd
+       0100  The device has already been deleted.
+               0000 0100  PY8800 64GB Accelerator
 1e6b  Axiado Corp.
+1e89  ID Quantique SA
+       0002  Quantis-PCIe-40M
+       0003  Quantis-PCIe-240M
 # nee Tumsan Oy
 1fc0  Ascom (Finland) Oy
        0300  E2200 Dual E1/Rawpipe Card
@@ -23575,6 +23704,7 @@
                1043 108d  VivoBook X202EV
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
+               10cf 16bf  LIFEBOOK E752
        0155  Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
                8086 2010  Server Board S1200BTS
        0156  3rd Gen Core processor Graphics Controller
@@ -23594,6 +23724,7 @@
        0166  3rd Gen Core processor Graphics Controller
                1043 1517  Zenbook Prime UX31A
                1043 2103  N56VZ
+               10cf 16c1  LIFEBOOK E752
        016a  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
                1043 844d  P8B WS Motherboard
        0172  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
@@ -24634,6 +24765,7 @@
        104e  Ethernet Controller X710 for 10 Gigabit SFP+
        104f  Ethernet Controller X710 for 10 Gigabit backplane
        1050  82562EZ 10/100 Ethernet Controller
+               1014 0287  ThinkCentre S50
                1028 019d  Dimension 3000
                1462 728c  865PE Neo2 (MS-6728)
                1462 758c  MS-6758 (875P Neo)
@@ -25193,6 +25325,7 @@
                8086 357a  Server Board S1200BTS
        1503  82579V Gigabit Network Connection
                1043 849c  P8P67 Deluxe Motherboard
+               10cf 161c  LIFEBOOK E752
        1507  Ethernet Express Module X520-P2
        1508  82598EB Gigabit BX Network Connection
        1509  82580 Gigabit Network Connection
@@ -25390,6 +25523,7 @@
                18d4 0c08  X550 10Gb 2-port RJ45 OCP Mezz Card MOP81-I-10GT2
                193d 1008  560T-B
                193d 1009  560T-L
+               193d 1011  UN-NIC-ETH563T-sL-2P
                8086 0001  Ethernet Converged Network Adapter X550-T2
                8086 001a  Ethernet Converged Network Adapter X550-T2
                8086 001b  Ethernet Server Adapter X550-T2 for OCP
@@ -25521,6 +25655,22 @@
                1137 0000  Ethernet Network Adapter XXV710
                1137 0225  Ethernet Network Adapter XXV710
                1137 02b4  Ethernet Network Adapter XXV710 OCP 2.0
+# UEFI PXE Disabled
+               1374 0230  Single Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G1I71)
+# With UEFI PXE Enabled
+               1374 0231  Single Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G1I71EU)
+# UEFI PXE Disabled
+               1374 0234  Dual Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G2I71)
+# With UEFI PXE Enabled
+               1374 0235  Dual Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G2I71EU)
+# PCIe x8 Bifurcated as x4x4, UEFI PXE Disabled, low profile
+               1374 0238  Quad Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G4I71L)
+# PCIe x8 Bifurcated as x4x4, UEFI PXE Enabled, low profile
+               1374 0239  Quad Port 25 Gigabit Ethernet PCI Express Server Adapter (PE325G4I71LEU)
+# PCIe x16 Bifurcated as x8x8, UEFI PXE Disabled, low profile
+               1374 023a  Quad Port 25 Gigabit Ethernet PCI Express Server Adapter (PE31625G4I71L)
+# PCIe x16 Bifurcated as x8x8, UEFI PXE Enabled, low profile
+               1374 023b  Quad Port 25 Gigabit Ethernet PCI Express Server Adapter (PE31625G4I71LEU)
                1590 0000  Ethernet Network Adapter XXV710-2
                1590 0253  Ethernet 10/25/Gb 2-port 661SFP28 Adapter
                8086 0000  Ethernet Network Adapter XXV710
@@ -25625,7 +25775,13 @@
        15ec  JHL7540 Thunderbolt 3 USB Controller [Titan Ridge 4C 2018]
        15ef  JHL7540 Thunderbolt 3 Bridge [Titan Ridge DD 2018]
        15f0  JHL7540 Thunderbolt 3 USB Controller [Titan Ridge DD 2018]
+       15f4  Ethernet Connection (15) I219-LM
+       15f5  Ethernet Connection (15) I219-V
        15f6  I210 Gigabit Ethernet Connection
+       15f9  Ethernet Connection (14) I219-LM
+       15fa  Ethernet Connection (14) I219-V
+       15fb  Ethernet Connection (13) I219-LM
+       15fc  Ethernet Connection (13) I219-V
        15ff  Ethernet Controller X710 for 10GBASE-T
                1137 0000  X710TLG GbE RJ45 PCIe NIC
                1137 02c1  X710T2LG 2x10 GbE RJ45 PCIe NIC
@@ -25806,6 +25962,10 @@
        19df  Atom Processor C3000 Series SMBus controller
        19e0  Atom Processor C3000 Series SPI Controller
        19e2  Atom Processor C3000 Series QuickAssist Technology
+       1a1c  Ethernet Connection (17) I219-LM
+       1a1d  Ethernet Connection (17) I219-V
+       1a1e  Ethernet Connection (16) I219-LM
+       1a1f  Ethernet Connection (16) I219-V
        1a21  82840 840 [Carmel] Chipset Host Bridge (Hub A)
        1a23  82840 840 [Carmel] Chipset AGP Bridge
        1a24  82840 840 [Carmel] Chipset PCI Bridge (Hub B)
@@ -26056,6 +26216,7 @@
                1043 108d  VivoBook X202EV
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
+               10cf 16e2  LIFEBOOK E752
                144d c652  NP300E5C series laptop
        1e04  7 Series/C210 Series Chipset Family SATA Controller [RAID mode]
        1e05  7 Series Chipset SATA Controller [RAID mode]
@@ -26070,6 +26231,7 @@
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
                1043 84ca  P8H77-I Motherboard
+               10cf 16e9  LIFEBOOK E752
                144d c652  NP300E5C series laptop
                1849 1e10  Motherboard
        1e12  7 Series/C210 Series Chipset Family PCI Express Root Port 2
@@ -26077,6 +26239,7 @@
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
        1e14  7 Series/C210 Series Chipset Family PCI Express Root Port 3
+               10cf 16e9  LIFEBOOK E752
        1e16  7 Series/C216 Chipset Family PCI Express Root Port 4
                1043 108d  VivoBook X202EV
                1043 1477  N56VZ
@@ -26089,6 +26252,7 @@
                1849 1e1a  Motherboard
        1e1c  7 Series/C210 Series Chipset Family PCI Express Root Port 7
        1e1e  7 Series/C210 Series Chipset Family PCI Express Root Port 8
+               10cf 16e9  LIFEBOOK E752
                1849 1e1e  Motherboard
        1e20  7 Series/C216 Chipset Family High Definition Audio Controller
                1028 054b  XPS One 2710
@@ -26097,6 +26261,7 @@
                1043 1517  Zenbook Prime UX31A
                1043 8415  P8H77-I Motherboard
                1043 8445  P8Z77-V LX Motherboard
+               10cf 1757  LIFEBOOK E752
                144d c652  NP300E5C series laptop
                1849 1898  Z77 Extreme4 motherboard
        1e22  7 Series/C216 Chipset Family SMBus Controller
@@ -26104,6 +26269,7 @@
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
                1043 84ca  P8 series motherboard
+               10cf 16e6  LIFEBOOK E752
                144d c652  NP300E5C series laptop
                1849 1e22  Motherboard
        1e24  7 Series/C210 Series Chipset Family Thermal Management Controller
@@ -26114,6 +26280,7 @@
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
                1043 84ca  P8 series motherboard
+               10cf 16e8  LIFEBOOK E752
                144d c652  NP300E5C series laptop
                1849 1e26  Motherboard
        1e2d  7 Series/C216 Chipset Family USB Enhanced Host Controller #2
@@ -26121,6 +26288,7 @@
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
                1043 84ca  P8 series motherboard
+               10cf 16e8  LIFEBOOK E752
                144d c652  NP300E5C series laptop
                1849 1e2d  Motherboard
        1e31  7 Series/C210 Series Chipset Family USB xHCI Host Controller
@@ -26130,6 +26298,7 @@
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
                1043 84ca  P8 series motherboard
+               10cf 16ee  LIFEBOOK E752
                17aa 21f3  ThinkPad T430
                1849 1e31  Motherboard
        1e33  7 Series/C210 Series Chipset Family LAN Controller
@@ -26138,6 +26307,7 @@
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
                1043 84ca  P8 series motherboard
+               10cf 16ea  LIFEBOOK E752
                144d c652  NP300E5C series laptop
                1849 1e3a  Motherboard
        1e3b  7 Series/C210 Series Chipset Family MEI Controller #2
@@ -26173,6 +26343,7 @@
        1e59  HM76 Express Chipset LPC Controller
                1043 1477  N56VZ
                1043 1517  Zenbook Prime UX31A
+               10cf 16e0  LIFEBOOK E752
        1e5a  7 Series Chipset Family LPC Controller
        1e5b  UM77 Express Chipset LPC Controller
        1e5c  7 Series Chipset Family LPC Controller
@@ -26465,6 +26636,7 @@
                103c 309f  Compaq nx9420 Notebook
                103c 30a3  Compaq nw8440
                103c 30c1  Compaq 6910p
+               1043 1017  X58LE
                104d 902d  VAIO VGN-NR120E
                105b 0d7c  D270S/D250S Motherboard
                1071 8209  Medion MIM 2240 Notebook PC [MD98100]
@@ -26839,6 +27011,7 @@
                8086 4c43  Desktop Board D865GLC
                8086 524c  D865PERL mainboard
        24d2  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1
+               1014 0287  ThinkCentre S50
                1014 02dd  eServer xSeries server mainboard
                1014 02ed  eServer xSeries server mainboard
                1028 0168  Precision Workstation 670 Mainboard
@@ -26862,6 +27035,7 @@
                8086 4c43  Desktop Board D865GLC
                8086 524c  D865PERL mainboard
        24d3  82801EB/ER (ICH5/ICH5R) SMBus Controller
+               1014 0287  ThinkCentre S50
                1014 02dd  eServer xSeries server mainboard
                1014 02ed  eServer xSeries server mainboard
                1028 0156  Precision 360
@@ -26881,6 +27055,7 @@
                8086 4c43  Desktop Board D865GLC
                8086 524c  D865PERL mainboard
        24d4  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2
+               1014 0287  ThinkCentre S50
                1014 02dd  eServer xSeries server mainboard
                1014 02ed  eServer xSeries server mainboard
                1028 0168  Precision Workstation 670 Mainboard
@@ -26906,6 +27081,7 @@
                8086 524c  D865PERL mainboard
        24d5  82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller
                100a 147b  Abit IS7-E motherboard
+               1014 0287  ThinkCentre S50
                1028 0168  Precision Workstation 670 Mainboard
                1028 0169  Precision 470
                103c 006a  NX9500
@@ -26923,6 +27099,7 @@
        24d6  82801EB/ER (ICH5/ICH5R) AC'97 Modem Controller
                103c 006a  NX9500
        24d7  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #3
+               1014 0287  ThinkCentre S50
                1014 02ed  xSeries server mainboard
                1028 0168  Precision Workstation 670 Mainboard
                1028 0169  Precision 470
@@ -26944,6 +27121,7 @@
                8086 4c43  Desktop Board D865GLC
                8086 524c  D865PERL mainboard
        24db  82801EB/ER (ICH5/ICH5R) IDE Controller
+               1014 0287  ThinkCentre S50
                1014 02dd  eServer xSeries server mainboard
                1014 02ed  eServer xSeries server mainboard
                1028 0168  Precision Workstation 670 Mainboard
@@ -26969,6 +27147,7 @@
                8086 524c  D865PERL mainboard
        24dc  82801EB (ICH5) LPC Interface Bridge
        24dd  82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller
+               1014 0287  ThinkCentre S50
                1014 02dd  eServer xSeries server mainboard
                1014 02ed  eServer xSeries server mainboard
                1028 0168  Precision Workstation 670 Mainboard
@@ -26990,6 +27169,7 @@
                8086 4c43  Desktop Board D865GLC
                8086 524c  D865PERL mainboard
        24de  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4
+               1014 0287  ThinkCentre S50
                1014 02ed  xSeries server mainboard
                1028 0168  Precision Workstation 670 Mainboard
                1028 0169  Precision 470
@@ -27097,6 +27277,7 @@
                1458 2570  GA-8IPE1000 Pro2 motherboard (865PE)
        2571  82865G/PE/P AGP Bridge
        2572  82865G Integrated Graphics Controller
+               1014 0287  ThinkCentre S50
                1028 019d  Dimension 3000
                103c 12bc  D530 sff(dc578av)
                1043 80a5  P5P800-MX Mainboard
@@ -27626,7 +27807,7 @@
        27b8  82801GB/GR (ICH7 Family) LPC Interface Bridge
                1028 01e6  PowerEdge 860
                103c 2a8c  Compaq 500B Microtower
-               1043 8179  P5KPL-VM Motherboard
+               1043 8179  P5B-MX/WiFi-AP, P5KPL-VM Motherboard
                107b 5048  E4500
                1462 7418  Wind PC MS-7418
                1775 11cc  CC11/CL11
@@ -27654,7 +27835,7 @@
                1028 01df  PowerEdge SC440
                1028 01e6  PowerEdge 860
                103c 2a8c  Compaq 500B Microtower
-               1043 8179  P5KPL-VM Motherboard
+               1043 8179  P5B-MX/WiFi-AP, P5KPL-VM Motherboard
                107b 5048  E4500
                1462 2310  MSI Hetis 945
                1462 7236  945P Neo3-F Rev. 2.2 motherboard
@@ -27699,7 +27880,7 @@
                103c 30a3  Compaq nw8440
                103c 30d5  530 Laptop
                1043 1237  A6J-Q008
-               1043 8179  P5KPL-VM,P5LD2-VM Mainboard
+               1043 8179  P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard
                1043 83ad  Eee PC 1015PX
                105b 0d7c  D270S/D250S Motherboard
                1071 8209  Medion MIM 2240 Notebook PC [MD98100]
@@ -27724,7 +27905,7 @@
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
                1043 1237  A6J-Q008
-               1043 8179  P5KPL-VM,P5LD2-VM Mainboard
+               1043 8179  P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard
                1043 83ad  Eee PC 1015PX
                105b 0d7c  D270S/D250S Motherboard
                1071 8209  Medion MIM 2240 Notebook PC [MD98100]
@@ -27749,7 +27930,7 @@
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
                1043 1237  A6J-Q008
-               1043 8179  P5KPL-VM,P5LD2-VM Mainboard
+               1043 8179  P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard
                1043 83ad  Eee PC 1015PX
                105b 0d7c  D270S/D250S Motherboard
                1071 8209  Medion MIM 2240 Notebook PC [MD98100]
@@ -27772,7 +27953,7 @@
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
                1043 1237  A6J-Q008
-               1043 8179  P5KPL-VM,P5LD2-VM Mainboard
+               1043 8179  P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard
                1043 83ad  Eee PC 1015PX
                105b 0d7c  D270S/D250S Motherboard
                1071 8209  Medion MIM 2240 Notebook PC [MD98100]
@@ -27797,7 +27978,7 @@
                103c 30a3  Compaq nw8440
                103c 30d5  530 Laptop
                1043 1237  A6J-Q008
-               1043 8179  P5KPL-VM,P5LD2-VM Mainboard
+               1043 8179  P5B-MX/WiFi-AP, P5KPL-VM, P5LD2-VM Mainboard
                1043 83ad  Eee PC 1015PX
                105b 0d7c  D270S/D250S Motherboard
                1071 8209  Medion MIM 2240 Notebook PC [MD98100]
@@ -27855,6 +28036,7 @@
                1043 1123  A6J-Q008
                1043 13c4  G2P
                1043 817f  P5LD2-VM Mainboard (Realtek ALC 882 codec)
+               1043 8249  P5B-MX/WiFi-AP
                1043 8290  P5KPL-VM Motherboard
                1043 82ea  P5KPL-CM Motherboard
                1043 8437  Eee PC 1015PX
@@ -27885,7 +28067,7 @@
                1028 01e6  PowerEdge 860
                103c 2a3b  Pavilion A1512X
                103c 2a8c  Compaq 500B Microtower
-               1043 8179  P5KPL-VM Motherboard
+               1043 8179  P5B-MX/WiFi-AP, P5KPL-VM Motherboard
                105b 0d7c  D270S/D250S Motherboard
                1071 8209  Medion MIM 2240 Notebook PC [MD98100]
                10f7 8338  Panasonic CF-Y5 laptop
@@ -27916,7 +28098,7 @@
                103c 30a3  Compaq nw8440
                103c 30d5  530 Laptop
                1043 1237  A6J-Q008
-               1043 8179  P5KPL-VM Motherboard
+               1043 8179  P5B-MX/WiFi-AP, P5KPL-VM Motherboard
                107b 5048  E4500
                10f7 8338  Panasonic CF-Y5 laptop
                1462 7418  Wind PC MS-7418
@@ -27943,6 +28125,7 @@
                103c 30c0  Compaq 6710b
                103c 30cc  Pavilion dv6700
                103c 30d9  Presario C700
+               1043 1017  X58LE
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
                17aa 20a5  ThinkPad R61
@@ -27982,6 +28165,7 @@
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                103c 30d9  Presario C700
+               1043 1017  X58LE
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
                17aa 20a7  ThinkPad T61/R61
@@ -27999,6 +28183,7 @@
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                103c 30d9  Presario C700
+               1043 1017  X58LE
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
@@ -28015,6 +28200,7 @@
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                103c 30d9  Presario C700
+               1043 1017  X58LE
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
@@ -28031,6 +28217,7 @@
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                103c 30d9  Presario C700
+               1043 1017  X58LE
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
@@ -28047,6 +28234,7 @@
                103c 30c0  Compaq 6710b
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
+               1043 1017  X58LE
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
@@ -28062,6 +28250,7 @@
                103c 30c0  Compaq 6710b
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
+               1043 1017  X58LE
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
@@ -28077,6 +28266,7 @@
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                103c 30d9  Presario C700
+               1043 1017  X58LE
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
@@ -28092,6 +28282,7 @@
                103c 30c0  Compaq 6710b
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
+               1043 1017  X58LE
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
@@ -28104,6 +28295,7 @@
                1028 01f3  Inspiron 1420
                1028 022f  Inspiron 1525
                103c 30d9  Presario C700
+               1043 1017  X58LE
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 9008  Vaio VGN-SZ79SN_C
@@ -28115,19 +28307,23 @@
        283f  82801H (ICH8 Family) PCI Express Port 1
                1028 01da  OptiPlex 745
                103c 30c1  Compaq 6910p
+               1043 1017  X58LE
                104d 902d  VAIO VGN-NR120E
                17aa 20ad  ThinkPad T61/R61
                17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
        2841  82801H (ICH8 Family) PCI Express Port 2
                103c 30c1  Compaq 6910p
+               1043 1017  X58LE
                104d 902d  VAIO VGN-NR120E
                17aa 20ad  ThinkPad T61/R61
                17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
        2843  82801H (ICH8 Family) PCI Express Port 3
+               1043 1017  X58LE
                104d 902d  VAIO VGN-NR120E
                17aa 20ad  ThinkPad T61/R61
                17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
        2845  82801H (ICH8 Family) PCI Express Port 4
+               1043 1017  X58LE
                17aa 20ad  ThinkPad T61/R61
                17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
        2847  82801H (ICH8 Family) PCI Express Port 5
@@ -28151,6 +28347,7 @@
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                1043 1339  M51S series
+               1043 17f3  X58LE
                1043 81ec  P5B
                104d 9005  Vaio VGN-FZ260E
                104d 9008  Vaio VGN-SZ79SN_C
@@ -28170,11 +28367,13 @@
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                103c 30d9  Presario C700
+               1043 1017  X58LE
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
                17aa 20a6  ThinkPad T61/R61
                17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
                e4bf cc47  CCG-RUMBA
+       28c0  Volume Management Device NVMe RAID Controller
        2912  82801IH (ICH9DH) LPC Interface Controller
        2914  82801IO (ICH9DO) LPC Interface Controller
                1028 0211  Optiplex 755
@@ -28422,8 +28621,10 @@
        294c  82566DC-2 Gigabit Network Connection
                17aa 302e  82566DM-2 Gigabit Network Connection
        2970  82946GZ/PL/GL Memory Controller Hub
+               1043 823b  P5B-MX/WiFi-AP
        2971  82946GZ/PL/GL PCI Express Root Port
        2972  82946GZ/GL Integrated Graphics Controller
+               1043 823b  P5B-MX/WiFi-AP
        2973  82946GZ/GL Integrated Graphics Controller
        2974  82946GZ/GL HECI Controller
        2975  82946GZ/GL HECI Controller
@@ -28523,6 +28724,7 @@
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                103c 30d9  Presario C700
+               1043 1017  X58LE
                104d 9005  Vaio VGN-FZ260E
                104d 902d  VAIO VGN-NR120E
                17aa 20b1  ThinkPad T61
@@ -28536,6 +28738,7 @@
                1028 022f  Inspiron 1525
                103c 30c0  Compaq 6710b
                103c 30d9  Presario C700
+               1043 14e2  X58LE
                104d 902d  VAIO VGN-NR120E
                17aa 20b5  GM965 [X3100] on ThinkPad T61/R61
                17c0 4082  GM965 on Medion WIM 2210 Notebook PC [MD96850]
@@ -28545,6 +28748,7 @@
                1028 022f  Inspiron 1525
                103c 30c0  Compaq 6710b
                103c 30d9  Presario C700
+               1043 14e2  X58LE
                104d 902d  VAIO VGN-NR120E
                17aa 20b5  GM965 [X3100] on ThinkPad T61/R61
                17c0 4082  GM965 on Medion WIM 2210 Notebook PC [MD96850]
@@ -29712,6 +29916,7 @@
        3e1f  8th Gen Core 4-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
                1458 5000  Z370 AORUS Gaming K3-CF
        3e30  8th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
+       3e33  8th/9th Gen Core Processor Host Bridge/DRAM Registers [Coffee Lake]
        3e34  Coffee Lake HOST and DRAM Controller
        3e81  8th Gen Core Processor PCIe Controller (x16)
        3e85  8th Gen Core Processor PCIe Controller (x8)
@@ -29854,6 +30059,8 @@
                8086 1311  WiMAX/WiFi Link 5150 AGN
                8086 1316  WiMAX/WiFi Link 5150 ABG
        444e  Turbo Memory Controller
+       467f  Volume Management Device NVMe RAID Controller
+       4c3d  Volume Management Device NVMe RAID Controller
        5001  LE80578
        5002  LE80578 Graphics Processor Unit
        5009  LE80578 Video Display Controller
@@ -30552,6 +30759,7 @@
        9622  Integrated RAID
        9641  Integrated RAID
        96a1  Integrated RAID
+       9a0b  Volume Management Device NVMe RAID Controller
        9b41  UHD Graphics
        9c00  8 Series SATA Controller 1 [IDE mode]
        9c01  8 Series SATA Controller 1 [IDE mode]
@@ -30762,6 +30970,7 @@
        9da4  Cannon Point-LP SPI Controller
        9db0  Cannon Point-LP PCI Express Root Port #9
        9db1  Cannon Point-LP PCI Express Root Port #10
+       9db2  Cannon Point-LP PCI Express Root Port #1
        9db4  Cannon Point-LP PCI Express Root Port #13
                1028 089e  Inspiron 5482
        9db6  Cannon Point-LP PCI Express Root Port #15
@@ -30774,6 +30983,7 @@
                1028 089e  Inspiron 5482
        9dd3  Cannon Point-LP SATA Controller [AHCI Mode]
        9de0  Cannon Point-LP MEI Controller #1
+       9de3  Cannon Point-LP Keyboard and Text (KT) Redirection
        9de8  Cannon Point-LP Serial IO I2C Controller #0
                1028 089e  Inspiron 5482
        9de9  Cannon Point-LP Serial IO I2C Controller #1
@@ -31029,6 +31239,7 @@
        a30c  QM370 Chipset LPC/eSPI Controller
        a323  Cannon Lake PCH SMBus Controller
        a324  Cannon Lake PCH SPI Controller
+       a328  Cannon Lake PCH Serial IO UART Host Controller
        a32c  Cannon Lake PCH PCI Express Root Port #21
        a32d  Cannon Lake PCH PCI Express Root Port #22
        a32e  Cannon Lake PCH PCI Express Root Port #23
@@ -31058,6 +31269,7 @@
        a353  Cannon Lake Mobile PCH SATA AHCI Controller
        a360  Cannon Lake PCH HECI Controller
        a363  Cannon Lake PCH Active Management Technology - SOL
+       a364  Cannon Lake PCH HECI Controller #2
        a368  Cannon Lake PCH Serial IO I2C Controller #0
        a369  Cannon Lake PCH Serial IO I2C Controller #1
        a36a  Cannon Lake PCH Serial IO I2C Controller #2
@@ -31108,6 +31320,23 @@
        f1a6  SSD Pro 7600p/760p/E 6100p Series
        f1a8  SSD 660P Series
 8088  Beijing Wangxun Technology Co., Ltd.
+       0101  WX1860A2 Gigabit Ethernet Controller
+               8088 0201  Dual-Port Ethernet Network Adaptor SF200T
+       0102  WX1860A2S Gigabit Ethernet Controller
+               8088 0210  Dual-Port Ethernet Network Adaptor SF200T-S
+       0103  WX1860A4 Gigabit Ethernet Controller
+               8088 0401  Qual-Port Ethernet Network Adaptor SF400T
+               8088 0440  Qual-Port Ethernet Network Adaptor SF400-OCP
+       0104  WX1860A4S Gigabit Ethernet Controller
+               8088 0410  Qual-Port Ethernet Network Adaptor SF400T-S
+       0105  WX1860AL2 Gigabit Ethernet Controller
+               8088 0202  Dual-Port Ethernet Network Adaptor SF200HT
+       0106  WX1860AL2S Gigabit Ethernet Controller
+               8088 0220  Dual-Port Ethernet Network Adaptor SF200HT-S
+       0107  WX1860AL4 Gigabit Ethernet Controller
+               8088 0402  Qual-Port Ethernet Network Adaptor SF400HT
+       0108  WX1860AL4S Gigabit Ethernet Controller
+               8088 0420  Qual-Port Ethernet Network Adaptor SF400HT-S
        1001  Ethernet Controller RP1000 for 10GbE SFP+
                8088 0000  Ethernet Network Adaptor RP1000 for 10GbE SFP+
        2001  Ethernet Controller RP2000 for 10GbE SFP+
@@ -31769,6 +31998,10 @@ d161  Digium, Inc.
        8010  Wildcard A4B 4-port analog card (PCI-Express)
        8013  Wildcard TE236/TE436 quad-span T1/E1/J1 card
        b410  Wildcard B410 quad-BRI card
+d209  Ultimarc
+       1500  PAC Drive
+       15a2  SpinTrak
+       1601  AimTrak
 d4d4  Dy4 Systems Inc
        0601  PCI Mezzanine Card
 d531  I+ME ACTIA GmbH
@@ -31944,14 +32177,38 @@ f1d0  AJA Video
        c0ff  Kona/Xena 2
        cafe  Kona SD
        cfee  Xena LS/SD-22-DA/SD-DA
+       dafe  Corvid 1
        daff  KONA LHi
+       db00  IoExpress
        db01  Corvid22
+       db02  Kona 3G
+       db03  Corvid 3G
+       db04  Kona 3G QUAD
+       db05  Kona LHe+
+       db06  IoXT
+       db07  Kona 3G P2P
+       db08  Kona 3G QUAD P2P
        db09  Corvid 24
+       db11  T-Tap
        dcaf  Kona HD
        dfee  Xena HD-DA
+       eb07  Io4K
+       eb0a  Io4K UFC
+       eb0b  Kona 4
+       eb0c  Kona 4 UFC
        eb0d  Corvid 88
        eb0e  Corvid 44
-       eb1d  Kona 5
+       eb16  Corvid HEVC
+               10cf 1049  Corvid HEVC M31
+       eb18  Corvid HB-R
+       eb1a  Kona IP 1SFP
+       eb1c  Kona IP 2SFP
+       eb1d  Io4KPlus
+       eb1e  IoIP
+       eb1f  Kona 5
+       eb23  Kona 1
+       eb24  Kona HDMI
+       eb25  Corvid 44 12g
        efac  Xena SD-MM/SD-22-MM
        facd  Xena HD-MM
 f5f5  F5 Networks, Inc.

diff --git a/hwdb.d/usb.ids b/hwdb.d/usb.ids
index c8e299fd023128b73cd135fb083ffa3c38b8fb2d..ad5557490d1b7bc731051c88ef321a2d56dec3fb 100644 (file)
--- a/hwdb.d/usb.ids
+++ b/hwdb.d/usb.ids
@@ -9,8 +9,8 @@
 #      The latest version can be obtained from
 #              http://www.linux-usb.org/usb.ids
 #
-# Version: 2019.11.05
-# Date:    2019-11-05 20:34:06
+# Version: 2020.01.09
+# Date:    2020-01-09 20:34:06
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -19098,6 +19098,14 @@
        6323  USB Electronic Scale
 2237  Kobo Inc.
        4161  eReader White
+224f  APDM
+       0001  Access Point
+       0002  Docking Station
+       0004  V2 Opal ACM
+       0005  V2 Opal
+       0006  V2 Docking Station
+       0007  V2 Access Point ACM
+       0008  V2 Access Point
 225d  Morpho
        0001  FINGER VP Multimodal Biometric Sensor
        0008  CBM-E3 Fingerprint Sensor

diff --git a/man/bootup.xml b/man/bootup.xml
index d3715234000365fa89efd252c9e3f94c1dd7894b..28f14891d9bbdd67df324c513d8cdb61421e58e5 100644 (file)
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -92,49 +92,59 @@
 
     <!-- note: do not use unicode ellipsis here, because docbook will replace that
          with three dots anyway, messing up alignment -->
-<programlisting>local-fs-pre.target
-         |
-         v
-(various mounts and   (various swap   (various cryptsetup
- fsck services...)     devices...)        devices...)       (various low-level   (various low-level
-         |                  |                  |             services: udevd,     API VFS mounts:
-         v                  v                  v             tmpfiles, random     mqueue, configfs,
-  local-fs.target      swap.target     cryptsetup.target    seed, sysctl, ...)      debugfs, ...)
-         |                  |                  |                    |                    |
-         \__________________|_________________ | ___________________|____________________/
-                                              \|/
-                                               v
-                                        sysinit.target
-                                               |
-          ____________________________________/|\________________________________________
-         /                  |                  |                    |                    \
-         |                  |                  |                    |                    |
-         v                  v                  |                    v                    v
-     (various           (various               |                (various          rescue.service
-    timers...)          paths...)              |               sockets...)               |
-         |                  |                  |                    |                    v
-         v                  v                  |                    v              <emphasis>rescue.target</emphasis>
-   timers.target      paths.target             |             sockets.target
-         |                  |                  |                    |
-         v                  \_________________ | ___________________/
-                                              \|/
-                                               v
-                                         basic.target
-                                               |
-          ____________________________________/|                                 emergency.service
-         /                  |                  |                                         |
-         |                  |                  |                                         v
-         v                  v                  v                                 <emphasis>emergency.target</emphasis>
-     display-        (various system    (various system
- manager.service         services           services)
-         |             required for            |
-         |            graphical UIs)           v
-         |                  |           <emphasis>multi-user.target</emphasis>
-         |                  |                  |
-         \_________________ | _________________/
-                           \|/
-                            v
-                  <emphasis>graphical.target</emphasis></programlisting>
+<programlisting>                                     cryptsetup-pre.target
+                                                  |
+(various low-level                                v
+ API VFS mounts:                 (various cryptsetup devices...)
+ mqueue, configfs,                                |    |
+ debugfs, ...)                                    v    |
+ |                                  cryptsetup.target  |
+ |  (various swap                                 |    |    remote-fs-pre.target
+ |   devices...)                                  |    |     |        |
+ |    |                                           |    |     |        v
+ |    v                       local-fs-pre.target |    |     |  (network file systems)
+ |  swap.target                       |           |    v     v                 |
+ |    |                               v           |  remote-cryptsetup.target  |
+ |    |  (various low-level  (various mounts and  |             |              |
+ |    |   services: udevd,    fsck services...)   |             |    remote-fs.target
+ |    |   tmpfiles, random            |           |             |             /
+ |    |   seed, sysctl, ...)          v           |             |            /
+ |    |      |                 local-fs.target    |             |           /
+ |    |      |                        |           |             |          /
+ \____|______|_______________   ______|___________/             |         /
+                             \ /                                |        /
+                              v                                 |       /
+                       sysinit.target                           |      /
+                              |                                 |     /
+       ______________________/|\_____________________           |    /
+      /              |        |      |               \          |   /
+      |              |        |      |               |          |  /
+      v              v        |      v               |          | /
+ (various       (various      |  (various            |          |/
+  timers...)      paths...)   |   sockets...)        |          |
+      |              |        |      |               |          |
+      v              v        |      v               |          |
+timers.target  paths.target   |  sockets.target      |          |
+      |              |        |      |               v          |
+      v              \_______ | _____/         rescue.service   |
+                             \|/                     |          |
+                              v                      v          |
+                          basic.target         <emphasis>rescue.target</emphasis>    |
+                              |                                 |
+                      ________v____________________             |
+                     /              |              \            |
+                     |              |              |            |
+                     v              v              v            |
+                 display-    (various system   (various system  |
+             manager.service     services        services)      |
+                     |         required for        |            |
+                     |        graphical UIs)       v            v
+                     |              |            <emphasis>multi-user.target</emphasis>
+emergency.service    |              |              |
+        |            \_____________ | _____________/
+        v                          \|/
+<emphasis>emergency.target</emphasis>                    v
+                              <emphasis>graphical.target</emphasis></programlisting>
 
     <para>Target units that are commonly used as boot targets are
     <emphasis>emphasized</emphasis>. These units are good choices as
@@ -150,6 +160,45 @@
     later in boot.</para>
   </refsect1>
 
+  <refsect1>
+    <title>User manager startup</title>
+
+    <para>The system manager starts the <filename>user@<replaceable>uid</replaceable>.service</filename> unit
+    for each user, which launches a separate unprivileged instance of <command>systemd</command> for each
+    user — the user manager. Similarly to the system manager, the user manager starts units which are pulled
+    in by <filename>default.target</filename>. The following chart is a structural overview of the well-known
+    user units. For non-graphical sessions, <filename>default.target</filename> is used. Whenever the user
+    logs into a graphical session, the login manager will start the
+    <filename>graphical-session.target</filename> target that is used to pull in units required for the
+    grahpical session. A number of targets (shown on the right side) are started when specific hardware is
+    available to the user.</para>
+
+<programlisting>
+    (various           (various         (various
+     timers...)         paths...)        sockets...)    (sound devices)
+         |                  |                 |               |
+         v                  v                 v               v
+   timers.target      paths.target     sockets.target    sound.target
+         |                  |                 |
+         \______________   _|_________________/         (bluetooth devices)
+                        \ /                                   |
+                         V                                    v
+                   basic.target                          bluetooth.target
+                         |
+              __________/ \_______                      (smartcard devices)
+             /                    \                           |
+             |                    |                           v
+             |                    v                      smartcard.target
+             v            graphical-session-pre.target
+ (various user services)          |                       (printers)
+             |                    v                           |
+             |        (services for the graphical sesion)     v
+             |                    |                       printer.target
+             v                    v
+      <emphasis>default.target</emphasis>      graphical-session.target</programlisting>
+
+  </refsect1>
+
   <refsect1>
     <title>Bootup in the Initial RAM Disk (initrd)</title>
     <para>The initial RAM disk implementation (initrd) can be set up

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 44fd0d2f3d7165e61a52bc7499e83c52368a85c7..7155bf7fabfec6ea229ec106f91f25eaa36869a8 100644 (file)
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -110,8 +110,11 @@
         <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or
         <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access
         control is managed per file, and the journal daemon will assign users read access to their journal files. If
-        <literal>uid</literal>, all regular users will each get their own journal files, and system users will log to
-        the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are
+        <literal>uid</literal>, all regular users (with UID outside the range of system users, dynamic service users,
+        and the nobody user) will each get their own journal files, and system users will log to the system journal.
+        See <ulink url="https://systemd.io/UIDS-GIDS">Users, Groups, UIDs and GIDs on systemd systems</ulink>
+        for more details about UID ranges.
+        If <literal>none</literal>, journal files are not split up by user and all messages are
         instead stored in the single system journal. In this mode unprivileged users generally do not have access to
         their own log data. Note that splitting up journal files by user is only available for journals stored
         persistently. If journals are stored on volatile storage (see <varname>Storage=</varname> above), only a single
@@ -317,7 +320,7 @@
         <term><varname>MaxLevelWall=</varname></term>
 
         <listitem><para>Controls the maximum log level of messages
-        that are stored on disk, forwarded to syslog, kmsg, the
+        that are stored in the journal, forwarded to syslog, kmsg, the
         console or wall (if that is enabled, see above). As argument,
         takes one of
         <literal>emerg</literal>,
@@ -333,8 +336,8 @@
         are stored/forwarded, messages above are dropped. Defaults to
         <literal>debug</literal> for <varname>MaxLevelStore=</varname>
         and <varname>MaxLevelSyslog=</varname>, to ensure that the all
-        messages are written to disk and forwarded to syslog. Defaults
-        to
+        messages are stored in the journal and forwarded to syslog.
+        Defaults to
         <literal>notice</literal> for <varname>MaxLevelKMsg=</varname>,
         <literal>info</literal> for <varname>MaxLevelConsole=</varname>,
         and <literal>emerg</literal> for

diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 911a00bc0225240e567af778cba1aa6558641d24..1106c36d0c86664cc6d40ff974bf3f65046328b6 100644 (file)
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -203,7 +203,7 @@ multi-user.target reached after 47.820s in userspace
       jobs (and in particular not jobs that timed out).</para>
 
       <example>
-        <title><command>systemd-analyze time</command></title>
+        <title><command>systemd-analyze critical-chain</command></title>
 
       <programlisting>$ systemd-analyze critical-chain
 multi-user.target @47.820s

diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index ea6fb5467397814db7543fc700b144410c4eacb6..ec9f974f2da5ea7ba164253b882a726fd1cb59ab 100644 (file)
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -200,8 +200,11 @@ systemd-tmpfiles --create --prefix /var/log/journal</programlisting>
     writable. Adding a user to this group thus enables them to read
     the journal files.</para>
 
-    <para>By default, each logged in user will get their own set of
-    journal files in <filename>/var/log/journal/</filename>. These
+    <para>By default, each user, with a UID outside the range of system users,
+    dynamic service users, and the nobody user, will get their own set of
+    journal files in <filename>/var/log/journal/</filename>. See
+    <ulink url="https://systemd.io/UIDS-GIDS">Users, Groups, UIDs and GIDs on systemd systems</ulink>
+    for more details about UID ranges. These journal
     files will not be owned by the user, however, in order to avoid
     that the user can write to them directly. Instead, file system
     ACLs are used to ensure the user gets read access only.</para>

diff --git a/man/systemd-makefs@.service.xml b/man/systemd-makefs@.service.xml
index 6b84e3fcddb10f684dbb71adb5e5b17a861aff1d..8514af67bc4835a0fdd39cfc73672382611af9c5 100644 (file)
--- a/man/systemd-makefs@.service.xml
+++ b/man/systemd-makefs@.service.xml
@@ -63,6 +63,7 @@
     <citerefentry project='man-pages'><refentrytitle>ext4</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
     btrfs (see
     <citerefentry project='man-pages'><refentrytitle>btrfs-man5</refentrytitle><manvolnum>5</manvolnum></citerefentry>),
+    <citerefentry project='man-pages'><refentrytitle>xfs</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
     <!-- yes, that's what the man page is called. -->
     and dm-crypt partitions (see
     <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>).

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index ff332e9f04f11cb19df6b7dcf5035bc865e0fe0f..5706e3e2c5ce56eb916d9133420fe2be42d6bb0b 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1902,7 +1902,8 @@ SystemCallErrorNumber=EPERM</programlisting>
 
         <para>The files listed with this directive will be read shortly before the process is executed (more
         specifically, after all processes from a previous unit state terminated.  This means you can generate these
-        files in one unit state, and read it with this option in the next).</para>
+        files in one unit state, and read it with this option in the next.  The files are read from the file
+        system of the service manager, before any file system changes like bind mounts take place).</para>
 
         <para>Settings from these files override settings made with <varname>Environment=</varname>. If the same
         variable is set twice from these files, the files will be read in the order they are specified and the later

diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index b2c9d606814f66c22d1dbb51778c861545695a6e..4e350ec55be0ac6a3231c4004a6a4d51285b882b 100644 (file)
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -211,9 +211,9 @@
         <term><option>x-systemd.before=</option></term>
         <term><option>x-systemd.after=</option></term>
 
-        <listitem><para>Configures a <varname>Before=</varname>
-        dependency or <varname>After=</varname> between the created
-        mount unit and another systemd unit, such as a mount unit.
+        <listitem><para>In the created mount unit, configures a
+        <varname>Before=</varname> or <varname>After=</varname>
+        dependency on another systemd unit, such as a mount unit.
         The argument should be a unit name or an absolute path
         to a mount point. This option may be specified more than once.
         This option is particularly useful for mount point declarations

diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
index d507f9f0012b1b7e776d8d7ead6711e08f403225..7a3673fa6f433cfae96adc537af0c2e15c6ffcf9 100644 (file)
--- a/man/systemd.net-naming-scheme.xml
+++ b/man/systemd.net-naming-scheme.xml
@@ -94,8 +94,8 @@
         <varlistentry>
           <term><varname>ID_NET_NAME_ONBOARD=<replaceable>prefix</replaceable><constant>o</constant><replaceable>number</replaceable></varname></term>
 
-          <listitem><para>This name is set based on the ordering information given by the firmware for
-          on-board devices. The name consists of the prefix, letter <constant>o</constant>, and a number
+          <listitem><para>This name is set based on the numeric ordering information given by the firmware
+          for on-board devices. The name consists of the prefix, letter <constant>o</constant>, and a number
           specified by the firmware. This is only available for PCI devices.</para>
           </listitem>
         </varlistentry>
@@ -103,8 +103,9 @@
         <varlistentry>
           <term><varname>ID_NET_LABEL_ONBOARD=<replaceable>prefix</replaceable> <replaceable>label</replaceable></varname></term>
 
-          <listitem><para>This property is set based on label given by the firmware for on-board devices. The
-          name consists of the prefix concatenated with the label. This is only available for PCI devices.
+          <listitem><para>This property is set based on textual label given by the firmware for on-board
+          devices. The name consists of the prefix concatenated with the label. This is only available for
+          PCI devices.
           </para>
           </listitem>
         </varlistentry>
@@ -121,15 +122,15 @@
 
         <varlistentry>
           <term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]</varname></term>
+          <term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable><constant>v</constant><replaceable>slot</replaceable></varname></term>
           <term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>b</constant><replaceable>number</replaceable></varname></term>
           <term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>u</constant><replaceable>port</replaceable>…[<constant>c</constant><replaceable>config</replaceable>][<constant>i</constant><replaceable>interface</replaceable>]</varname></term>
           <term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>v</constant><replaceable>slot</replaceable></varname></term>
 
           <listitem><para>This property describes the slot position. Different schemes are used depending on
-          the bus type, as described in the table below. In all cases, PCI slot information must be known. In
-          case of USB, BCMA, and SR-VIO devices, the full name consists of the prefix, PCI slot identifier,
-          and USB or BCMA or SR-VIO slot identifier. The first two parts are denoted as "…" in the table
-          below.</para>
+          the bus type, as described in the table below. In case of USB, BCMA, and SR-VIO devices, the full
+          name consists of the prefix, PCI slot identifier, and USB or BCMA or SR-VIO slot identifier. The
+          first two parts are denoted as "…" in the table below.</para>
 
           <table>
             <title>Slot naming schemes</title>
@@ -148,6 +149,11 @@
                   <entry>PCI slot number</entry>
                 </row>
 
+                <row>
+                  <entry><replaceable>prefix</replaceable> <constant>v</constant><replaceable>slot</replaceable></entry>
+                  <entry>VIO slot number (IBM PowerVM)</entry>
+                </row>
+
                 <row>
                   <entry>… <constant>b</constant><replaceable>number</replaceable></entry>
                   <entry>Broadcom bus (BCMA) core number</entry>
@@ -177,11 +183,11 @@
           <para>For USB devices the full chain of port numbers of hubs is composed. If the name gets longer
           than the maximum number of 15 characters, the name is not exported. The usual USB configuration
           number 1 and interface number 0 values are suppressed.</para>
-          </listitem>
 
           <para>SR-IOV virtual devices are named based on the name of the parent interface, with a suffix of
           <constant>v</constant> and the virtual device number, with any leading zeros removed. The bus
-          number is ignored. This device type is found in IBM PowerVMs.</para>
+          number is ignored.</para>
+          </listitem>
         </varlistentry>
 
         <varlistentry>

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 8031bc0e0b49a41471223c01062e67340251f036..c3d09d39c72862dbc7e0478099c0376211494666 100644 (file)
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -2109,7 +2109,7 @@ Endpoint=wireguard.example.com:51820</programlisting>
 
     <example>
       <title>/etc/systemd/network/27-xfrm.netdev</title>
-      <programlisting>[Xfrm]
+      <programlisting>[NetDev]
 Name=xfrm0
 Kind=xfrm
 

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index a26e08c99cc40966ddbdfbcff5fb8a8163ff6154..8254d7ca1f1101c9ddbd45b138d86b8e9a21696e 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1004,12 +1004,10 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><varname>PrefixRoute=</varname></term>
+          <term><varname>AddPrefixRoute=</varname></term>
           <listitem>
-            <para>Takes a boolean. When adding or modifying an IPv6 address, the userspace
-            application needs a way to suppress adding a prefix route. This is for example relevant
-            together with IFA_F_MANAGERTEMPADDR, where userspace creates autoconf generated addresses,
-            but depending on on-link, no route for the prefix should be added. Defaults to false.</para>
+            <para>Takes a boolean. When true, the prefix route for the address is automatically added.
+            Defaults to true.</para>
           </listitem>
         </varlistentry>
         <varlistentry>

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 42508f3059be61ac058b93965297e04239d9117c..8e2765c86001d22fe0251c04ffc68657c698abef 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -467,10 +467,12 @@
     <programlisting>systemd-analyze --user unit-paths</programlisting>
     </para>
 
-    <para>Moreover, additional units might be loaded into systemd ("linked") from
-    directories not on the unit load path. See the <command>link</command> command
-    for
-    <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+    <para>Moreover, additional units might be loaded into systemd from
+    directories not on the unit load path by creating a symlink pointing to a
+    unit file in the directories. You can use <command>systemctl link</command>
+    for this operation. See
+    <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    for its usage and precaution.
     </para>
   </refsect1>
 
@@ -1545,7 +1547,7 @@
 
     <para>Note: <varname>ConsistsOf=</varname>, <varname>BoundBy=</varname>,
     <varname>RequisiteOf=</varname>, <varname>ConflictedBy=</varname> are created
-    implicitly along with their reverse and cannot be specified directly.</para>
+    implicitly along with their reverses and cannot be specified directly.</para>
 
     <para>Note: <varname>Triggers=</varname> is created implicitly between a socket,
     path unit, or an automount unit, and the unit they activate. By default a unit
@@ -1557,7 +1559,7 @@
     <citerefentry><refentrytitle>systemd.path</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
     and
     <citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    for details. <varname>TriggersBy=</varname> is created implicitly on the
+    for details. <varname>TriggeredBy=</varname> is created implicitly on the
     triggered unit.</para>
 
     <para>Note: <varname>Following=</varname> is used to group device aliases and points to the

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index a497b9b4894770b8b5a3dd3203e475a87ee6a35f..5915012fce992b44bd2d4a2e587de6047f70b3b8 100644 (file)
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -535,7 +535,7 @@ w- /proc/sys/vm/swappiness - - - - 10</programlisting></para>
       guaranteed to be resolvable during early boot. If this field references users/groups that only become
       resolveable during later boot (i.e. after NIS, LDAP or a similar networked directory service become
       available), execution of the operations declared by the line will likely fail. Also see <ulink
-      url="https://systemd.io/UIDS-GIDS.html#notes-on-resolvability-of-user-and-group-names">Notes on
+      url="https://systemd.io/UIDS-GIDS/#notes-on-resolvability-of-user-and-group-names">Notes on
       Resolvability of User and Group Names</ulink> for more information on requirements on system user/group
       definitions.</para>
     </refsect2>

diff --git a/meson.build b/meson.build
index 21d6968abdf47e87af26e7b6a83103748f221480..1bdb9c7b32254f802014395155b1fff5a4a5c8ce 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -3170,8 +3170,8 @@ if conf.get('ENABLE_EFI') == 1
                 status += [
                         'EFI machine type:                  @0@'.format(EFI_MACHINE_TYPE_NAME),
                         'EFI CC                             @0@'.format(' '.join(efi_cc)),
-                        'EFI lib directory:                 @0@'.format(efi_libdir),
-                        'EFI lds directory:                 @0@'.format(efi_ldsdir),
+                        'EFI lds:                           @0@'.format(efi_lds),
+                        'EFI crt0:                          @0@'.format(efi_crt0),
                         'EFI include directory:             @0@'.format(efi_incdir)]
         endif
 endif

diff --git a/meson_options.txt b/meson_options.txt
index 79b09e021c3698e1c5a1488ae379d6e0f6d55cbc..44ff23f641f4a75579446c53a6e62cb58f891e00 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -309,8 +309,6 @@ option('efi-ld', type : 'string',
        description : 'the linker to use for EFI modules')
 option('efi-libdir', type : 'string',
        description : 'path to the EFI lib directory')
-option('efi-ldsdir', type : 'string',
-       description : 'path to the EFI lds directory')
 option('efi-includedir', type : 'string', value : '/usr/include/efi',
        description : 'path to the EFI header directory')
 option('tpm-pcrindex', type : 'integer', value : 8,

diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index 11960e54236a42ca309298fae17cc70212a50508..4009cbb96e659b5a0c51a73cfef0d0067ac7a2e8 100644 (file)
--- a/presets/90-systemd.preset
+++ b/presets/90-systemd.preset
@@ -7,8 +7,9 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
-# These ones should be enabled by default, even if distributions
-# generally follow a default-off policy.
+# Settings for systemd units distributed with systemd itself. Most of these
+# should be enabled by default, even if the distribution follows a general
+# default-off policy.
 
 enable remote-fs.target
 enable remote-cryptsetup.target
@@ -34,3 +35,18 @@ disable syslog.socket
 disable systemd-journal-gatewayd.*
 disable systemd-journal-remote.*
 disable systemd-journal-upload.*
+
+# Passive targets: always off by default, since they should only be pulled in
+# by dependent units.
+
+disable cryptsetup-pre.target
+disable getty-pre.target
+disable local-fs-pre.target
+disable network.target
+disable network-pre.target
+disable nss-lookup.target
+disable nss-user-lookup.target
+disable remote-fs-pre.target
+disable rpcbind.target
+disable time-set.target
+disable time-sync.target

diff --git a/presets/user/90-systemd.preset b/presets/user/90-systemd.preset
index 22fe41fc337937ac0c34c65125263923cd62be16..fd402c8c11cf04fb01c6979e8c3113dd5e4e6feb 100644 (file)
--- a/presets/user/90-systemd.preset
+++ b/presets/user/90-systemd.preset
@@ -7,8 +7,15 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
-# These ones should be enabled by default, even if distributions
-# generally follow a default-off policy.
+# Settings for systemd units distributed with systemd itself. These should be
+# enabled by default, even if the distribution follows a general default-off
+# policy.
 
 enable systemd-tmpfiles-setup.service
 enable systemd-tmpfiles-clean.timer
+
+# Passive targets: always off by default, since they should only be pulled in
+# by dependent units.
+
+disable graphical-session-pre.target
+disable graphical-session.target

diff --git a/rules.d/60-persistent-storage.rules b/rules.d/60-persistent-storage.rules
index 7802b1c94f4aee167e30bdda833e1be7d7a1e0d5..01586690bdd3642a69112858023ebfa37b936659 100644 (file)
--- a/rules.d/60-persistent-storage.rules
+++ b/rules.d/60-persistent-storage.rules
@@ -12,8 +12,22 @@ KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcac
 # ignore partitions that span the entire disk
 TEST=="whole_disk", GOTO="persistent_storage_end"
 
-# for partitions import parent information
-ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*"
+# For partitions import parent disk ID_* information, except ID_FS_*.
+#
+# This is particularly important on media where a filesystem superblock and
+# partition table are found on the same level, e.g. common Linux distro ISO
+# installation media.
+#
+# In the case where a partition device points to the same filesystem that
+# was detected on the parent disk, the ID_FS_* information is already
+# present on the partition devices as well as the parent, so no need to
+# propagate it. In the case where the partition device points to a different
+# filesystem, merging the parent ID_FS_ properties would lead to
+# inconsistencies, so we avoid doing so.
+ENV{DEVTYPE}=="partition", \
+  IMPORT{parent}="ID_[!F]*", IMPORT{parent}="ID_", \
+  IMPORT{parent}="ID_F[!S]*", IMPORT{parent}="ID_F", \
+  IMPORT{parent}="ID_FS[!_]*", IMPORT{parent}="ID_FS"
 
 # NVMe
 KERNEL=="nvme*[0-9]n*[0-9]", ATTR{wwid}=="?*", SYMLINK+="disk/by-id/nvme-$attr{wwid}"

diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index 79b099a4093a3a141e7c2a55c84f2f5bb464d901..aadc9d514ccc2e74337557d1567a7a7984d8df21 100644 (file)
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -306,7 +306,7 @@ static int assess_root_directory(
         assert(ret_description);
 
         *ret_badness =
-                empty_or_root(info->root_directory) ||
+                empty_or_root(info->root_directory) &&
                 empty_or_root(info->root_image);
         *ret_description = NULL;
 
@@ -746,7 +746,7 @@ static const struct security_assessor security_assessor_table[] = {
         {
                 .id = "ProtectControlGroups=",
                 .description_good = "Service cannot modify the control group file system",
-                .description_bad = "Service may modify to the control group file system",
+                .description_bad = "Service may modify the control group file system",
                 .url = "https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ProtectControlGroups=",
                 .weight = 1000,
                 .range = 1,

diff --git a/src/basic/efivars.c b/src/basic/efivars.c
index 7b14c062df1df251cf89c04c318663b06cce906a..a1f040c52be5a202b2317629bb020e9c61f73d89 100644 (file)
--- a/src/basic/efivars.c
+++ b/src/basic/efivars.c
@@ -20,6 +20,7 @@
 #include "strv.h"
 #include "time-util.h"
 #include "utf8.h"
+#include "virt.h"
 
 #if ENABLE_EFI
 
@@ -220,6 +221,41 @@ int efi_set_variable_string(sd_id128_t vendor, const char *name, const char *v)
         return efi_set_variable(vendor, name, u16, (char16_strlen(u16) + 1) * sizeof(char16_t));
 }
 
+bool is_efi_boot(void) {
+        if (detect_container() > 0)
+                return false;
+
+        return access("/sys/firmware/efi/", F_OK) >= 0;
+}
+
+static int read_flag(const char *varname) {
+        _cleanup_free_ void *v = NULL;
+        uint8_t b;
+        size_t s;
+        int r;
+
+        if (!is_efi_boot()) /* If this is not an EFI boot, assume the queried flags are zero */
+                return 0;
+
+        r = efi_get_variable(EFI_VENDOR_GLOBAL, varname, NULL, &v, &s);
+        if (r < 0)
+                return r;
+
+        if (s != 1)
+                return -EINVAL;
+
+        b = *(uint8_t *)v;
+        return !!b;
+}
+
+bool is_efi_secure_boot(void) {
+        return read_flag("SecureBoot") > 0;
+}
+
+bool is_efi_secure_boot_setup_mode(void) {
+        return read_flag("SetupMode") > 0;
+}
+
 int systemd_efi_options_variable(char **line) {
         const char *e;
         int r;

diff --git a/src/basic/efivars.h b/src/basic/efivars.h
index 46ca58d0a52fd2dec3119f44fbd1b2a431fbe627..13a33c66053de6c5446598b38b9761d32e9dd201 100644 (file)
--- a/src/basic/efivars.h
+++ b/src/basic/efivars.h
@@ -28,6 +28,10 @@ int efi_get_variable_string(sd_id128_t vendor, const char *name, char **p);
 int efi_set_variable(sd_id128_t vendor, const char *name, const void *value, size_t size);
 int efi_set_variable_string(sd_id128_t vendor, const char *name, const char *p);
 
+bool is_efi_boot(void);
+bool is_efi_secure_boot(void);
+bool is_efi_secure_boot_setup_mode(void);
+
 int systemd_efi_options_variable(char **line);
 
 #else
@@ -52,6 +56,18 @@ static inline int efi_set_variable_string(sd_id128_t vendor, const char *name, c
         return -EOPNOTSUPP;
 }
 
+static inline bool is_efi_boot(void) {
+        return false;
+}
+
+static inline bool is_efi_secure_boot(void) {
+        return false;
+}
+
+static inline bool is_efi_secure_boot_setup_mode(void) {
+        return false;
+}
+
 static inline int systemd_efi_options_variable(char **line) {
         return -ENODATA;
 }

diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index d3d99d9a7f90228222eaa09de6b778a048b8a95c..1af58717c6868f514cc07df7d744a4b1a39954fb 100644 (file)
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -39,6 +39,18 @@ int proc_cmdline(char **ret) {
                 return read_one_line_file("/proc/cmdline", ret);
 }
 
+/* In SecureBoot mode this is probably not what you want. As your cmdline is
+ * cryptographically signed like when using Type #2 EFI Unified Kernel Images
+ * (https://systemd.io/BOOT_LOADER_SPECIFICATION/) The user's intention is then
+ * that the cmdline should not be modified.  You want to make sure that the
+ * system starts up as exactly specified in the signed artifact. */
+static int systemd_options_variable(char **line) {
+        if (is_efi_secure_boot())
+                return -ENODATA;
+
+        return systemd_efi_options_variable(line);
+}
+
 static int proc_cmdline_extract_first(const char **p, char **ret_word, ProcCmdlineFlags flags) {
         const char *q = *p;
         int r;
@@ -119,7 +131,7 @@ int proc_cmdline_parse(proc_cmdline_parse_t parse_item, void *data, ProcCmdlineF
 
         /* We parse the EFI variable first, because later settings have higher priority. */
 
-        r = systemd_efi_options_variable(&line);
+        r = systemd_options_variable(&line);
         if (r < 0 && r != -ENODATA)
                 log_debug_errno(r, "Failed to get SystemdOptions EFI variable, ignoring: %m");
 
@@ -250,7 +262,7 @@ int proc_cmdline_get_key(const char *key, ProcCmdlineFlags flags, char **ret_val
                 return r;
 
         line = mfree(line);
-        r = systemd_efi_options_variable(&line);
+        r = systemd_options_variable(&line);
         if (r == -ENODATA)
                 return false; /* Not found */
         if (r < 0)

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index bfe2c60da173171e0ae333afe5f4cc314cc57722..105584e2e72ff91aed4369bb1503367b0085908e 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1500,8 +1500,29 @@ int time_change_fd(void) {
         if (fd < 0)
                 return -errno;
 
-        if (timerfd_settime(fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) < 0)
-                return -errno;
+        if (timerfd_settime(fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) >= 0)
+                return TAKE_FD(fd);
+
+        /* So apparently there are systems where time_t is 64bit, but the kernel actually doesn't support
+         * 64bit time_t. In that case configuring a timer to TIME_T_MAX will fail with EOPNOTSUPP or a
+         * similar error. If that's the case let's try with INT32_MAX instead, maybe that works. It's a bit
+         * of a black magic thing though, but what can we do?
+         *
+         * We don't want this code on x86-64, hence let's conditionalize this for systems with 64bit time_t
+         * but where "long" is shorter than 64bit, i.e. 32bit archs.
+         *
+         * See: https://github.com/systemd/systemd/issues/14362 */
+
+#if SIZEOF_TIME_T == 8 && ULONG_MAX < UINT64_MAX
+        if (ERRNO_IS_NOT_SUPPORTED(errno) || errno == EOVERFLOW) {
+                static const struct itimerspec its32 = {
+                        .it_value.tv_sec = INT32_MAX,
+                };
+
+                if (timerfd_settime(fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its32, NULL) >= 0)
+                        return TAKE_FD(fd);
+        }
+#endif
 
-        return TAKE_FD(fd);
+        return -errno;
 }

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 849c3c63b6a984a951a6ef684e5c0029b8257924..9e976ca6c4c7b36c2cfa126971260c278df2b082 100644 (file)
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -404,10 +404,10 @@ static VOID print_status(Config *config, CHAR16 *loaded_image_path) {
                 Print(L"random-seed-mode:       off\n");
                 break;
         case RANDOM_SEED_WITH_SYSTEM_TOKEN:
-                Print(L"random-seed-node:       with-system-token\n");
+                Print(L"random-seed-mode:       with-system-token\n");
                 break;
         case RANDOM_SEED_ALWAYS:
-                Print(L"random-seed-node:       always\n");
+                Print(L"random-seed-mode:       always\n");
                 break;
         default:
                 ;
@@ -1951,7 +1951,7 @@ static VOID config_entry_add_linux(
                                 continue;
                         }
 
-                        if (strcmpa((CHAR8 *)"VERSION_ID", key) == 0) {
+                        if (strcmpa((CHAR8 *)"VERSION", key) == 0) {
                                 FreePool(os_version);
                                 os_version = stra_to_str(value);
                                 continue;

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 3edabfedd536f2d199c3fcbdb3f19ab58b8b4b7c..c1fe04597bc66819b56e34e88644fd13f261d02e 100644 (file)
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -64,12 +64,19 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'
 
         efi_libdir = get_option('efi-libdir')
         if efi_libdir == ''
-                ret = run_command(efi_cc + ['-print-multi-os-directory'])
-                if ret.returncode() == 0
-                        path = join_paths('/usr/lib', ret.stdout().strip())
-                        ret = run_command('realpath', '-e', path)
-                        if ret.returncode() == 0
-                                efi_libdir = ret.stdout().strip()
+                # New location first introduced with gnu-efi 3.0.11
+                efi_libdir = join_paths('/usr/lib/gnuefi', EFI_MACHINE_TYPE_NAME)
+                cmd = run_command('test', '-e', efi_libdir)
+
+                if cmd.returncode() != 0
+                        # Fall back to the old approach
+                        cmd = run_command(efi_cc + ['-print-multi-os-directory'])
+                        if cmd.returncode() == 0
+                                path = join_paths('/usr/lib', cmd.stdout().strip())
+                                cmd = run_command('realpath', '-e', path)
+                                if cmd.returncode() == 0
+                                        efi_libdir = cmd.stdout().strip()
+                                endif
                         endif
                 endif
         endif
@@ -95,20 +102,35 @@ if have_gnu_efi
 
         objcopy = find_program('objcopy')
 
-        efi_ldsdir = get_option('efi-ldsdir')
-        arch_lds = 'elf_@0@_efi.lds'.format(gnu_efi_path_arch)
-        if efi_ldsdir == ''
-                efi_ldsdir = join_paths(efi_libdir, 'gnuefi')
-                cmd = run_command('test', '-f', join_paths(efi_ldsdir, arch_lds))
-                if cmd.returncode() != 0
-                        efi_ldsdir = efi_libdir
-                        cmd = run_command('test', '-f', join_paths(efi_ldsdir, arch_lds))
-                        if cmd.returncode() != 0
-                               error('Cannot find @0@'.format(arch_lds))
+        efi_location_map = [
+                # New locations first introduced with gnu-efi 3.0.11
+                [join_paths(efi_libdir, 'efi.lds'),
+                 join_paths(efi_libdir, 'crt0.o')],
+                # Older locations...
+                [join_paths(efi_libdir, 'gnuefi', 'elf_@0@_efi.lds'.format(gnu_efi_path_arch)),
+                 join_paths(efi_libdir, 'gnuefi', 'crt0-efi-@0@.o'.format(gnu_efi_path_arch))],
+                [join_paths(efi_libdir, 'elf_@0@_efi.lds'.format(gnu_efi_path_arch)),
+                 join_paths(efi_libdir, 'crt0-efi-@0@.o'.format(gnu_efi_path_arch))]]
+        efi_lds = ''
+        foreach location : efi_location_map
+                if efi_lds == ''
+                        cmd = run_command('test', '-f', location[0])
+                        if cmd.returncode() == 0
+                                efi_lds = location[0]
+                                efi_crt0 = location[1]
                         endif
                 endif
+        endforeach
+        if efi_lds == ''
+                if get_option('gnu-efi') == 'true'
+                        error('gnu-efi support requested, but cannot find efi.lds')
+                else
+                        have_gnu_efi = false
+                endif
         endif
+endif
 
+if have_gnu_efi
         compile_args = ['-Wall',
                         '-Wextra',
                         '-std=gnu90',
@@ -145,14 +167,13 @@ if have_gnu_efi
                 compile_args += ['-O2']
         endif
 
-        efi_ldflags = ['-T',
-                       join_paths(efi_ldsdir, arch_lds),
+        efi_ldflags = ['-T', efi_lds,
                        '-shared',
                        '-Bsymbolic',
                        '-nostdlib',
                        '-znocombreloc',
                        '-L', efi_libdir,
-                       join_paths(efi_ldsdir, 'crt0-efi-@0@.o'.format(gnu_efi_path_arch))]
+                       efi_crt0]
         if efi_arch == 'aarch64' or efi_arch == 'arm'
                 # Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary'
                 # instead, and add required symbols manually.
@@ -219,11 +240,9 @@ if have_gnu_efi
                 set_variable(tuple[0].underscorify(), so)
                 set_variable(tuple[0].underscorify() + '_stub', stub)
         endforeach
-endif
 
-############################################################
+        ############################################################
 
-if have_gnu_efi
         test_efi_disk_img = custom_target(
                 'test-efi-disk.img',
                 input : [systemd_boot_so, stub_so_stub],

diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
index 8518dfde77e0f6f53a1b42adc429de773857a69d..b13f22476c6737893a11e1df21b62abe849f58ba 100644 (file)
--- a/src/boot/efi/util.h
+++ b/src/boot/efi/util.h
@@ -55,7 +55,7 @@ static inline void FileHandleClosep(EFI_FILE_HANDLE *handle) {
         uefi_call_wrapper((*handle)->Close, 1, *handle);
 }
 
-const EFI_GUID loader_guid;
+extern const EFI_GUID loader_guid;
 
 #define UINTN_MAX (~(UINTN)0)
 #define INTN_MAX ((INTN)(UINTN_MAX>>1))

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index abcd057d6a3d656dd6b77d4d13abddaabcf5cbf5..ef6e56a918871f8b175be5682fc204d029217842 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -2334,29 +2334,39 @@ unsigned manager_dispatch_cgroup_realize_queue(Manager *m) {
 static void unit_add_siblings_to_cgroup_realize_queue(Unit *u) {
         Unit *slice;
 
-        /* This adds the siblings of the specified unit and the
-         * siblings of all parent units to the cgroup queue. (But
-         * neither the specified unit itself nor the parents.) */
+        /* This adds the siblings of the specified unit and the siblings of all parent units to the cgroup
+         * queue. (But neither the specified unit itself nor the parents.)
+         *
+         * Propagation of realization "side-ways" (i.e. towards siblings) is in relevant on cgroup-v1 where
+         * scheduling become very weird if two units that own processes reside in the same slice, but one is
+         * realized in the "cpu" hierarchy and once is not (for example because one has CPUWeight= set and
+         * the other does not), because that means processes need to be scheduled against groups. Let's avoid
+         * this asymmetry by always ensuring that units below a slice that are realized at all are hence
+         * always realized in *all* their hierarchies, and it is sufficient for a unit's sibling to be
+         * realized for a unit to be realized too. */
 
         while ((slice = UNIT_DEREF(u->slice))) {
                 Iterator i;
                 Unit *m;
                 void *v;
 
-                HASHMAP_FOREACH_KEY(v, m, u->dependencies[UNIT_BEFORE], i) {
-                        /* Skip units that have a dependency on the slice
-                         * but aren't actually in it. */
+                HASHMAP_FOREACH_KEY(v, m, slice->dependencies[UNIT_BEFORE], i) {
+
+                        /* Skip units that have a dependency on the slice but aren't actually in it. */
                         if (UNIT_DEREF(m->slice) != slice)
                                 continue;
 
-                        /* No point in doing cgroup application for units
-                         * without active processes. */
+                        /* No point in doing cgroup application for units without active processes. */
                         if (UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(m)))
                                 continue;
 
-                        /* If the unit doesn't need any new controllers
-                         * and has current ones realized, it doesn't need
-                         * any changes. */
+                        /* We only enqueue siblings if they were realized once at least, in the main
+                         * hierarchy. */
+                        if (!m->cgroup_realized)
+                                continue;
+
+                        /* If the unit doesn't need any new controllers and has current ones realized, it
+                         * doesn't need any changes. */
                         if (unit_has_mask_realized(m,
                                                    unit_get_target_mask(m),
                                                    unit_get_enable_mask(m)))
@@ -2652,6 +2662,7 @@ void unit_add_to_cgroup_empty_queue(Unit *u) {
         /* Let's verify that the cgroup is really empty */
         if (!u->cgroup_path)
                 return;
+
         r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path);
         if (r < 0) {
                 log_unit_debug_errno(u, r, "Failed to determine whether cgroup %s is empty: %m", u->cgroup_path);

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 64a612a7f0f110ee8d9b61d5e31071ff986d2acf..c751e84253e0f557c44545ac2752a14262e34559 100644 (file)
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1902,6 +1902,12 @@ static int install_error(
                                               "Unit %s is transient or generated.", changes[i].path);
                         goto found;
 
+                case -EUCLEAN:
+                        r = sd_bus_error_setf(error, BUS_ERROR_BAD_UNIT_SETTING,
+                                              "\"%s\" is not a valid unit name.",
+                                              changes[i].path);
+                        goto found;
+
                 case -ELOOP:
                         r = sd_bus_error_setf(error, BUS_ERROR_UNIT_LINKED,
                                               "Refusing to operate on alias name or linked unit file: %s",

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 9477c4714013df0898a6b3224e5e99865110e0c3..73d5b2ee1ebec925a30aba1be2f5aaea1b88c73f 100644 (file)
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -5,6 +5,7 @@
 #include "alloc-util.h"
 #include "bpf-firewall.h"
 #include "bus-common-errors.h"
+#include "bus-polkit.h"
 #include "cgroup-util.h"
 #include "condition.h"
 #include "dbus-job.h"
@@ -2012,6 +2013,21 @@ static int bus_unit_set_transient_property(
         if (d >= 0) {
                 const char *other;
 
+                if (!IN_SET(d,
+                            UNIT_REQUIRES,
+                            UNIT_REQUISITE,
+                            UNIT_WANTS,
+                            UNIT_BINDS_TO,
+                            UNIT_PART_OF,
+                            UNIT_CONFLICTS,
+                            UNIT_BEFORE,
+                            UNIT_AFTER,
+                            UNIT_ON_FAILURE,
+                            UNIT_PROPAGATES_RELOAD_TO,
+                            UNIT_RELOAD_PROPAGATED_FROM,
+                            UNIT_JOINS_NAMESPACE_OF))
+                    return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Dependency type %s may not be created transiently.", unit_dependency_to_string(d));
+
                 r = sd_bus_message_enter_container(message, 'a', "s");
                 if (r < 0)
                         return r;

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 3c40f29694401e4525c07b9fd8636f8209eeb6e7..78b30c5090dcbcf4514db647ccfe3576cea594cd 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -10,7 +10,7 @@
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-internal.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "dbus-automount.h"
 #include "dbus-cgroup.h"
 #include "dbus-device.h"

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 1679e047dd72417f8be800adc25995067080a66e..95345668bbc9ccae411b583d9a19cb96ff321473 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -4702,7 +4702,9 @@ int unit_load_fragment(Unit *u) {
                         return r;
 
                 if (null_or_empty(&st)) {
-                        u->load_state = UNIT_MASKED;
+                        /* Unit file is masked */
+
+                        u->load_state = u->perpetual ? UNIT_LOADED : UNIT_MASKED; /* don't allow perpetual units to ever be masked */
                         u->fragment_mtime = 0;
                 } else {
                         u->load_state = UNIT_LOADED;

diff --git a/src/core/meson.build b/src/core/meson.build
index df3aa5c6c1659696ed16ef90c14f8a31071b08ca..fb6820e109a9e0c2faab21123a512f305ea6e09b 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -197,6 +197,8 @@ endforeach
 
 install_data('org.freedesktop.systemd1.conf',
              install_dir : dbuspolicydir)
+install_data('org.freedesktop.systemd1.service',
+             install_dir : dbussystemservicedir)
 
 policy = configure_file(
         input : 'org.freedesktop.systemd1.policy.in',

diff --git a/src/core/mount.c b/src/core/mount.c
index dfed691c43fe34e98e4cc3df4e27bc6010c82210..a0dfa6a1a72a9aaf596c316d247004ac84ad3ba4 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -537,10 +537,9 @@ static int mount_verify(Mount *m) {
         }
 
         p = get_mount_parameters_fragment(m);
-        if (p && !p->what) {
-                log_unit_error(UNIT(m), "What= setting is missing. Refusing.");
-                return -ENOEXEC;
-        }
+        if (p && !p->what && !UNIT(m)->perpetual)
+                return log_unit_error_errno(UNIT(m), SYNTHETIC_ERRNO(ENOEXEC),
+                                            "What= setting is missing. Refusing.");
 
         if (m->exec_context.pam_name && m->kill_context.kill_mode != KILL_CONTROL_GROUP) {
                 log_unit_error(UNIT(m), "Unit has PAM enabled. Kill mode must be set to control-group'. Refusing.");
@@ -1568,7 +1567,7 @@ static int mount_setup_existing_unit(
         if (r > 0)
                 flags |= MOUNT_PROC_JUST_CHANGED;
 
-        if (!MOUNT(u)->from_proc_self_mountinfo || FLAGS_SET(MOUNT(u)->proc_flags, MOUNT_PROC_JUST_MOUNTED))
+        if (!MOUNT(u)->from_proc_self_mountinfo || FLAGS_SET(MOUNT(u)->proc_flags, MOUNT_PROC_JUST_MOUNTED) || MOUNT(u)->state == MOUNT_MOUNTING)
                 flags |= MOUNT_PROC_JUST_MOUNTED;
 
         MOUNT(u)->from_proc_self_mountinfo = true;

diff --git a/src/core/org.freedesktop.systemd1.service b/src/core/org.freedesktop.systemd1.service
new file mode 100644 (file)
index 0000000..8bd7302
--- /dev/null
+++ b/src/core/org.freedesktop.systemd1.service
@@ -0,0 +1,13 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[D-BUS Service]
+Name=org.freedesktop.systemd1
+Exec=/bin/false
+User=root

diff --git a/src/core/service.c b/src/core/service.c
index 49ad166c26045643c9fc4b24505a929f40a0bd4d..f3df541fceddc05aad15c8200b1449b8ea51702b 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -650,24 +650,37 @@ static int service_add_default_dependencies(Service *s) {
         return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
 }
 
-static void service_fix_output(Service *s) {
+static void service_fix_stdio(Service *s) {
         assert(s);
 
-        /* If nothing has been explicitly configured, patch default output in. If input is socket/tty we avoid this
-         * however, since in that case we want output to default to the same place as we read input from. */
+        /* Note that EXEC_INPUT_NULL and EXEC_OUTPUT_INHERIT play a special role here: they are both the
+         * default value that is subject to automatic overriding triggered by other settings and an explicit
+         * choice the user can make. We don't distuingish between these cases currently. */
+
+        if (s->exec_context.std_input == EXEC_INPUT_NULL &&
+            s->exec_context.stdin_data_size > 0)
+                s->exec_context.std_input = EXEC_INPUT_DATA;
+
+        if (IN_SET(s->exec_context.std_input,
+                    EXEC_INPUT_TTY,
+                    EXEC_INPUT_TTY_FORCE,
+                    EXEC_INPUT_TTY_FAIL,
+                    EXEC_INPUT_SOCKET,
+                    EXEC_INPUT_NAMED_FD))
+                return;
+
+        /* We assume these listed inputs refer to bidirectional streams, and hence duplicating them from
+         * stdin to stdout/stderr makes sense and hence leaving EXEC_OUTPUT_INHERIT in place makes sense,
+         * too. Outputs such as regular files or sealed data memfds otoh don't really make sense to be
+         * duplicated for both input and output at the same time (since they then would cause a feedback
+         * loop), hence override EXEC_OUTPUT_INHERIT with the default stderr/stdout setting.  */
 
         if (s->exec_context.std_error == EXEC_OUTPUT_INHERIT &&
-            s->exec_context.std_output == EXEC_OUTPUT_INHERIT &&
-            s->exec_context.std_input == EXEC_INPUT_NULL)
+            s->exec_context.std_output == EXEC_OUTPUT_INHERIT)
                 s->exec_context.std_error = UNIT(s)->manager->default_std_error;
 
-        if (s->exec_context.std_output == EXEC_OUTPUT_INHERIT &&
-            s->exec_context.std_input == EXEC_INPUT_NULL)
+        if (s->exec_context.std_output == EXEC_OUTPUT_INHERIT)
                 s->exec_context.std_output = UNIT(s)->manager->default_std_output;
-
-        if (s->exec_context.std_input == EXEC_INPUT_NULL &&
-            s->exec_context.stdin_data_size > 0)
-                s->exec_context.std_input = EXEC_INPUT_DATA;
 }
 
 static int service_setup_bus_name(Service *s) {
@@ -715,7 +728,7 @@ static int service_add_extras(Service *s) {
         if (s->type == SERVICE_ONESHOT && !s->start_timeout_defined)
                 s->timeout_start_usec = USEC_INFINITY;
 
-        service_fix_output(s);
+        service_fix_stdio(s);
 
         r = unit_patch_contexts(UNIT(s));
         if (r < 0)

diff --git a/src/core/socket.c b/src/core/socket.c
index fc5ee69c9c90dcba61817a372390585a77aa5a54..c587eaebed5e2cb31e859a4fb6994b707b7a1221 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -3257,7 +3257,12 @@ static void socket_trigger_notify(Unit *u, Unit *other) {
         assert(other);
 
         /* Filter out invocations with bogus state */
-        if (other->load_state != UNIT_LOADED || other->type != UNIT_SERVICE)
+        if (!IN_SET(other->load_state,
+                    UNIT_LOADED,
+                    UNIT_NOT_FOUND,
+                    UNIT_BAD_SETTING,
+                    UNIT_ERROR,
+                    UNIT_MASKED) || other->type != UNIT_SERVICE)
                 return;
 
         /* Don't propagate state changes from the service if we are already down */

diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index 5d1ddd7620c9666e751bbb0b11360d602a3095b9..8331832c7a208dcfe7d380cd30599682431da8f8 100644 (file)
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -21,6 +21,8 @@ systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/s
 systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user
 systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators
 systemdusergeneratordir=${prefix}/lib/systemd/user-generators
+systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir}
+systemdusergeneratorpath=/run/systemd/user-generators:/etc/systemd/user-generators:/usr/local/lib/systemd/user-generators:${systemdusergeneratordir}
 systemdsleepdir=${rootprefix}/lib/systemd/system-sleep
 systemdshutdowndir=${rootprefix}/lib/systemd/system-shutdown
 tmpfilesdir=${prefix}/lib/tmpfiles.d

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 811a9468c1757ccfbb619cdb11c66c41b97a995b..bf7a0fb2d54c7acbef0ec9b9ad9a1de7ef15812c 100644 (file)
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -362,7 +362,7 @@ static int create_disk(
 
         r = generator_write_timeouts(arg_dest, device, name, options, &filtered);
         if (r < 0)
-                return r;
+                log_warning_errno(r, "Failed to write device timeout drop-in: %m");
 
         if (filtered) {
                 filtered_escaped = specifier_escape(filtered);
@@ -415,11 +415,11 @@ static int create_disk(
                 return r;
 
         if (!noauto && !nofail) {
-                r = write_drop_in(arg_dest, dmname, 90, "device-timeout",
-                                  "# Automatically generated by systemd-cryptsetup-generator \n\n"
+                r = write_drop_in(arg_dest, dmname, 40, "device-timeout",
+                                  "# Automatically generated by systemd-cryptsetup-generator\n\n"
                                   "[Unit]\nJobTimeoutSec=0");
                 if (r < 0)
-                        return log_error_errno(r, "Failed to write device drop-in: %m");
+                        log_warning_errno(r, "Failed to write device timeout drop-in: %m");
         }
 
         return 0;
@@ -646,7 +646,6 @@ static int add_proc_cmdline_devices(void) {
         crypto_device *d;
 
         HASHMAP_FOREACH(d, arg_disks, i) {
-                const char *options;
                 _cleanup_free_ char *device = NULL;
 
                 if (!d->create)
@@ -662,14 +661,11 @@ static int add_proc_cmdline_devices(void) {
                 if (!device)
                         return log_oom();
 
-                if (d->options)
-                        options = d->options;
-                else if (arg_default_options)
-                        options = arg_default_options;
-                else
-                        options = "timeout=0";
-
-                r = create_disk(d->name, device, d->keyfile ?: arg_default_keyfile, d->keydev, options);
+                r = create_disk(d->name,
+                                device,
+                                d->keyfile ?: arg_default_keyfile,
+                                d->keydev,
+                                d->options ?: arg_default_options);
                 if (r < 0)
                         return r;
         }

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index de51801d23a69c7302bd2f3462a595bbac1a98a7..bd2453db7689a631e9e535d1e2df889072291919 100644 (file)
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -381,6 +381,19 @@ static int add_automount(
         return generator_add_symlink(arg_dest, SPECIAL_LOCAL_FS_TARGET, "wants", unit);
 }
 
+static const char *esp_or_xbootldr_options(const DissectedPartition *p) {
+        assert(p);
+
+        /* if we probed vfat or have no idea about the file system then assume these file systems are vfat
+         * and thus understand "umask=0077". If we detected something else then don't specify any options and
+         * use kernel defaults. */
+
+        if (!p->fstype || streq(p->fstype, "vfat"))
+                return "umask=0077";
+
+        return NULL;
+}
+
 static int add_xbootldr(DissectedPartition *p) {
         int r;
 
@@ -410,7 +423,7 @@ static int add_xbootldr(DissectedPartition *p) {
                              "/boot",
                              p->fstype,
                              true,
-                             "umask=0077",
+                             esp_or_xbootldr_options(p),
                              "Boot Loader Partition",
                              120 * USEC_PER_SEC);
 }
@@ -484,7 +497,7 @@ static int add_esp(DissectedPartition *p, bool has_xbootldr) {
                              esp_path,
                              p->fstype,
                              true,
-                             "umask=0077",
+                             esp_or_xbootldr_options(p),
                              "EFI System Partition Automount",
                              120 * USEC_PER_SEC);
 }

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index deecd9b8db30d310a7d2607ec9cbff57c5b72f68..21f647149514ab1a77f3c6ccf6ec15b8169057e0 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -8,7 +8,7 @@
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "def.h"
 #include "env-file-label.h"
 #include "env-file.h"

diff --git a/src/import/importd.c b/src/import/importd.c
index 93d89a3a1f3fa3592dde462aee14cf8da6e4d19c..93e704ed612de17304155811fa77da99aaf8472d 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -7,7 +7,7 @@
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "def.h"
 #include "fd-util.h"
 #include "float.h"
@@ -694,6 +694,7 @@ static int method_import_tar_or_raw(sd_bus_message *msg, void *userdata, sd_bus_
         const char *local, *object;
         Manager *m = userdata;
         TransferType type;
+        struct stat st;
         uint32_t id;
 
         assert(msg);
@@ -717,9 +718,11 @@ static int method_import_tar_or_raw(sd_bus_message *msg, void *userdata, sd_bus_
         if (r < 0)
                 return r;
 
-        r = fd_verify_regular(fd);
-        if (r < 0)
-                return r;
+        if (fstat(fd, &st) < 0)
+                return -errno;
+
+        if (!S_ISREG(st.st_mode) && !S_ISFIFO(st.st_mode))
+                return -EINVAL;
 
         if (!machine_name_is_valid(local))
                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Local name %s is invalid", local);
@@ -829,6 +832,7 @@ static int method_export_tar_or_raw(sd_bus_message *msg, void *userdata, sd_bus_
         const char *local, *object, *format;
         Manager *m = userdata;
         TransferType type;
+        struct stat st;
         uint32_t id;
 
         assert(msg);
@@ -855,9 +859,11 @@ static int method_export_tar_or_raw(sd_bus_message *msg, void *userdata, sd_bus_
         if (!machine_name_is_valid(local))
                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Local name %s is invalid", local);
 
-        r = fd_verify_regular(fd);
-        if (r < 0)
-                return r;
+        if (fstat(fd, &st) < 0)
+                return -errno;
+
+        if (!S_ISREG(st.st_mode) && !S_ISFIFO(st.st_mode))
+                return -EINVAL;
 
         type = streq_ptr(sd_bus_message_get_member(msg), "ExportTar") ? TRANSFER_EXPORT_TAR : TRANSFER_EXPORT_RAW;
 

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 95b6bfee172a317a29c229d0d5f25cb5955c3057..17565abe2128b53d9a9e8578289fc88ea54c8c9c 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2428,23 +2428,23 @@ int main(int argc, char *argv[]) {
                 }
                 r = sd_journal_previous(j);
 
-        } else if (arg_lines >= 0) {
+        } else if (arg_reverse) {
                 r = sd_journal_seek_tail(j);
                 if (r < 0) {
                         log_error_errno(r, "Failed to seek to tail: %m");
                         goto finish;
                 }
 
-                r = sd_journal_previous_skip(j, arg_lines);
+                r = sd_journal_previous(j);
 
-        } else if (arg_reverse) {
+        } else if (arg_lines >= 0) {
                 r = sd_journal_seek_tail(j);
                 if (r < 0) {
                         log_error_errno(r, "Failed to seek to tail: %m");
                         goto finish;
                 }
 
-                r = sd_journal_previous(j);
+                r = sd_journal_previous_skip(j, arg_lines);
 
         } else {
                 r = sd_journal_seek_head(j);
@@ -2514,7 +2514,7 @@ int main(int argc, char *argv[]) {
                                         goto finish;
                                 }
                                 if (usec > arg_until)
-                                        goto finish;
+                                        break;
                         }
 
                         if (arg_since_set && arg_reverse) {
@@ -2526,7 +2526,7 @@ int main(int argc, char *argv[]) {
                                         goto finish;
                                 }
                                 if (usec < arg_since)
-                                        goto finish;
+                                        break;
                         }
 
                         if (!arg_merge && !arg_quiet) {
@@ -2632,29 +2632,6 @@ int main(int argc, char *argv[]) {
                 if (!arg_follow) {
                         if (n_shown == 0 && !arg_quiet)
                                 printf("-- No entries --\n");
-
-                        if (arg_show_cursor || arg_cursor_file) {
-                                _cleanup_free_ char *cursor = NULL;
-
-                                r = sd_journal_get_cursor(j, &cursor);
-                                if (r < 0 && r != -EADDRNOTAVAIL)
-                                        log_error_errno(r, "Failed to get cursor: %m");
-                                else if (r >= 0) {
-                                        if (arg_show_cursor)
-                                                printf("-- cursor: %s\n", cursor);
-
-                                        if (arg_cursor_file) {
-                                                r = write_string_file(arg_cursor_file, cursor,
-                                                                      WRITE_STRING_FILE_CREATE |
-                                                                      WRITE_STRING_FILE_ATOMIC);
-                                                if (r < 0)
-                                                        log_error_errno(r,
-                                                                        "Failed to write new cursor to %s: %m",
-                                                                        arg_cursor_file);
-                                        }
-                                }
-                        }
-
                         break;
                 }
 
@@ -2667,6 +2644,28 @@ int main(int argc, char *argv[]) {
                 first_line = false;
         }
 
+        if (arg_show_cursor || arg_cursor_file) {
+                _cleanup_free_ char *cursor = NULL;
+
+                r = sd_journal_get_cursor(j, &cursor);
+                if (r < 0 && r != -EADDRNOTAVAIL)
+                        log_error_errno(r, "Failed to get cursor: %m");
+                else if (r >= 0) {
+                        if (arg_show_cursor)
+                                printf("-- cursor: %s\n", cursor);
+
+                        if (arg_cursor_file) {
+                                r = write_string_file(arg_cursor_file, cursor,
+                                                      WRITE_STRING_FILE_CREATE |
+                                                      WRITE_STRING_FILE_ATOMIC);
+                                if (r < 0)
+                                        log_error_errno(r,
+                                                        "Failed to write new cursor to %s: %m",
+                                                        arg_cursor_file);
+                        }
+                }
+        }
+
 finish:
         pager_close();
 

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 2b969a640567f002b9b2c7b792c6baef13c49c74..055a975b31a57eb02e589d666b3042f8fb5d3e1f 100644 (file)
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -161,7 +161,7 @@ static int match_is_valid(const void *data, size_t size) {
         if (size < 2)
                 return false;
 
-        if (startswith(data, "__"))
+        if (((char*) data)[0] == '_' && ((char*) data)[1] == '_')
                 return false;
 
         b = data;

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 5417ba8c5febc40265c24a97f4347026f1899dcb..9c4ce247d5dc45c85daa182dfe6c21d965850f50 100644 (file)
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -675,8 +675,7 @@ static int client_timeout_resend_expire(sd_event_source *s, uint64_t usec, void
 }
 
 static usec_t client_timeout_compute_random(usec_t val) {
-        return val - val / 10 +
-                (random_u32() % (2 * USEC_PER_SEC)) * val / 10 / USEC_PER_SEC;
+        return val - (random_u32() % USEC_PER_SEC) * val / 10 / USEC_PER_SEC;
 }
 
 static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userdata) {

diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c
index beab80687d6f1a6e370f3ee2009d6d3924cbee34..e8934489b581f1b07a35609cbedeb35fb628aea6 100644 (file)
--- a/src/libsystemd/sd-bus/bus-introspect.c
+++ b/src/libsystemd/sd-bus/bus-introspect.c
@@ -160,7 +160,7 @@ int introspect_write_interface(struct introspect *i, const sd_bus_vtable *v) {
                 case _SD_BUS_VTABLE_SIGNAL:
                         fprintf(i->f, "  <signal name=\"%s\">\n", v->x.signal.member);
                         if (bus_vtable_has_names(vtable))
-                                names = strempty(v->x.method.names);
+                                names = strempty(v->x.signal.names);
                         introspect_write_arguments(i, strempty(v->x.signal.signature), &names, NULL);
                         introspect_write_flags(i, v->type, v->flags);
                         fputs("  </signal>\n", i->f);

diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index ced0bb3d34a91ea1764b70669ba5376648806d03..3f39377befc34826ae78b64b3d0aaa03f54f5b4f 100644 (file)
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -225,3 +225,4 @@ void bus_message_set_sender_local(sd_bus *bus, sd_bus_message *m);
 
 sd_bus_message* bus_message_ref_queued(sd_bus_message *m, sd_bus *bus);
 sd_bus_message* bus_message_unref_queued(sd_bus_message *m, sd_bus *bus);
+int sd_bus_enqueue_for_read(sd_bus *bus, sd_bus_message *m);

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 058492a83eecc3d2e73d6f7f4451ee42092dfeeb..6933a2b8df23dbb44ea60d91d8a5c21ea339b795 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -4207,3 +4207,27 @@ _public_ int sd_bus_get_close_on_exit(sd_bus *bus) {
 
         return bus->close_on_exit;
 }
+
+int sd_bus_enqueue_for_read(sd_bus *bus, sd_bus_message *m) {
+        int r;
+
+        assert_return(bus, -EINVAL);
+        assert_return(bus = bus_resolve(bus), -ENOPKG);
+        assert_return(m, -EINVAL);
+        assert_return(m->sealed, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        if (!BUS_IS_OPEN(bus->state))
+                return -ENOTCONN;
+
+        /* Re-enqueue a message for reading. This is primarily useful for PolicyKit-style authentication,
+         * where we accept a message, then determine we need to interactively authenticate the user, and then
+         * we want to process the message again. */
+
+        r = bus_rqueue_make_room(bus);
+        if (r < 0)
+                return r;
+
+        bus->rqueue[bus->rqueue_size++] = bus_message_ref_queued(m, bus);
+        return 0;
+}

diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c
index e38bcdcc76fd827d710e1d0c7fa45949c8da87f5..82eb35e5b16db960c0b3c38840ced85a5c65bcb1 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-server.c
+++ b/src/libsystemd/sd-bus/test-bus-server.c
@@ -108,7 +108,7 @@ fail:
 static int client(struct context *c) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL;
         _cleanup_(sd_bus_unrefp) sd_bus *bus = NULL;
-        sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;
 
         assert_se(sd_bus_new(&bus) >= 0);

diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
index 519dd0d188cfea6abd2f3efb26578989d7c291c0..30669a9359e58104898dcc1e9c460db27fee9562 100644 (file)
--- a/src/locale/keymap-util.c
+++ b/src/locale/keymap-util.c
@@ -5,7 +5,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "env-file-label.h"
 #include "env-file.h"
 #include "env-util.h"

diff --git a/src/locale/localed.c b/src/locale/localed.c
index baf0bd102ba99d58fdf25749affb35e1f69fad87..09f16d25f4c20e5fa928dcce2dabaf34e3d0982b 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -15,7 +15,7 @@
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "def.h"
 #include "keymap-util.h"
 #include "locale-util.h"
@@ -33,7 +33,7 @@ static int locale_update_system_manager(Context *c, sd_bus *bus) {
         _cleanup_free_ char **l_unset = NULL;
         _cleanup_strv_free_ char **l_set = NULL;
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
-        sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         size_t c_set, c_unset;
         LocaleVariable p;
         int r;

diff --git a/src/login/71-seat.rules.in b/src/login/71-seat.rules.in
index 2bbd18363e69a817dd0c769c489b53fbacbb1f08..2a9ddb93aa73f998cd89df76eb1f7e1149a5631c 100644 (file)
--- a/src/login/71-seat.rules.in
+++ b/src/login/71-seat.rules.in
@@ -32,9 +32,12 @@ SUBSYSTEM=="pci", ENV{ID_PCI_CLASS_FROM_DATABASE}=="Display controller", \
 SUBSYSTEM=="drm", KERNEL=="card[0-9]*", TAG+="seat", TAG+="master-of-seat"
 SUBSYSTEM=="usb", ATTR{bDeviceClass}=="09", TAG+="seat"
 
-# 'Plugable' USB hub, sound, network, graphics adapter
+# 'Plugable UD-160' USB hub, sound, network, graphics adapter
 SUBSYSTEM=="usb", ATTR{idVendor}=="2230", ATTR{idProduct}=="000[13]", ENV{ID_AUTOSEAT}="1"
 
+# 'Plugable UD-PRO8' USB hub, sound, network, graphics adapter
+SUBSYSTEM=="usb", ATTR{idVendor}=="1a40", ATTR{idProduct}=="0201", ENV{ID_AUTOSEAT}="1"
+
 # qemu (version 2.4+) has a PCI-PCI bridge (-device pci-bridge-seat) to group
 # devices belonging to one seat. See:
 #     http://git.qemu.org/?p=qemu.git;a=blob;f=docs/multiseat.txt

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 61f619de9cc5da7d7a8e428d94573719f1ce495e..6ffd135bcf202f7d053907434f0f356211cab092 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -981,7 +981,6 @@ static int show_seat(int argc, char *argv[], void *userdata) {
 static int activate(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         sd_bus *bus = userdata;
-        char *short_argv[3];
         int r, i;
 
         assert(bus);
@@ -990,12 +989,20 @@ static int activate(int argc, char *argv[], void *userdata) {
         polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
 
         if (argc < 2) {
-                short_argv[0] = argv[0];
-                short_argv[1] = (char*) "";
-                short_argv[2] = NULL;
+                r = sd_bus_call_method(
+                                bus,
+                                "org.freedesktop.login1",
+                                "/org/freedesktop/login1/session/auto",
+                                "org.freedesktop.login1.Session",
+                                streq(argv[0], "lock-session")      ? "Lock" :
+                                streq(argv[0], "unlock-session")    ? "Unlock" :
+                                streq(argv[0], "terminate-session") ? "Terminate" :
+                                                                      "Activate",
+                                &error, NULL, NULL);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to issue method call: %s", bus_error_message(&error, r));
 
-                argv = short_argv;
-                argc = 2;
+                return 0;
         }
 
         for (i = 1; i < argc; i++) {

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 69b59948786f62a18a8facecea37bc722f3769f3..ff731555d7408f0bf9e954266791821e991dd92e 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -12,13 +12,14 @@
 #include "bootspec.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
+#include "bus-polkit.h"
 #include "bus-unit-util.h"
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "device-util.h"
 #include "dirent-util.h"
-#include "efivars.h"
 #include "efi-loader.h"
+#include "efivars.h"
 #include "env-util.h"
 #include "escape.h"
 #include "fd-util.h"

diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 34ac0350f2dd93b69d455b5740ae71396e82dc9d..5b41e60fd6a049a80be1aba0ce940520ffe9a88a 100644 (file)
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -5,6 +5,7 @@
 #include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-label.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "logind-dbus.h"
 #include "logind-seat-dbus.h"

diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 8f13edafb00fd991ba447b208fa4c412a17b698a..03f470cf2a2571236eee60f46dca0c06b3d8bf34 100644 (file)
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -5,6 +5,7 @@
 #include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-label.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "fd-util.h"
 #include "logind-brightness.h"
@@ -249,7 +250,11 @@ static int method_set_idle_hint(sd_bus_message *message, void *userdata, sd_bus_
         if (uid != 0 && uid != s->user->uid)
                 return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session may set idle hint");
 
-        session_set_idle_hint(s, b);
+        r = session_set_idle_hint(s, b);
+        if (r == -ENOTTY)
+                return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Idle hint control is not supported on non-graphical sessions.");
+        if (r < 0)
+                return r;
 
         return sd_bus_reply_method_return(message, NULL);
 }

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 1ef73570e58b52bf35d4ae968dd62e129dd736c2..a9be416f52d790308646c8071e10fb7f9f320548 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -932,63 +932,57 @@ static int get_process_ctty_atime(pid_t pid, usec_t *atime) {
 }
 
 int session_get_idle_hint(Session *s, dual_timestamp *t) {
-        usec_t atime = 0, n;
+        usec_t atime = 0;
         int r;
 
         assert(s);
 
-        /* Explicit idle hint is set */
-        if (s->idle_hint) {
+        /* Graphical sessions have an explicit idle hint */
+        if (SESSION_TYPE_IS_GRAPHICAL(s->type)) {
                 if (t)
                         *t = s->idle_hint_timestamp;
 
                 return s->idle_hint;
         }
 
-        /* Graphical sessions should really implement a real
-         * idle hint logic */
-        if (SESSION_TYPE_IS_GRAPHICAL(s->type))
-                goto dont_know;
-
-        /* For sessions with an explicitly configured tty, let's check
-         * its atime */
+        /* For sessions with an explicitly configured tty, let's check its atime */
         if (s->tty) {
                 r = get_tty_atime(s->tty, &atime);
                 if (r >= 0)
                         goto found_atime;
         }
 
-        /* For sessions with a leader but no explicitly configured
-         * tty, let's check the controlling tty of the leader */
+        /* For sessions with a leader but no explicitly configured tty, let's check the controlling tty of
+         * the leader */
         if (pid_is_valid(s->leader)) {
                 r = get_process_ctty_atime(s->leader, &atime);
                 if (r >= 0)
                         goto found_atime;
         }
 
-dont_know:
         if (t)
-                *t = s->idle_hint_timestamp;
+                *t = DUAL_TIMESTAMP_NULL;
 
-        return 0;
+        return false;
 
 found_atime:
         if (t)
                 dual_timestamp_from_realtime(t, atime);
 
-        n = now(CLOCK_REALTIME);
-
         if (s->manager->idle_action_usec <= 0)
-                return 0;
+                return false;
 
-        return atime + s->manager->idle_action_usec <= n;
+        return usec_add(atime, s->manager->idle_action_usec) <= now(CLOCK_REALTIME);
 }
 
-void session_set_idle_hint(Session *s, bool b) {
+int session_set_idle_hint(Session *s, bool b) {
         assert(s);
 
+        if (!SESSION_TYPE_IS_GRAPHICAL(s->type))
+                return -ENOTTY;
+
         if (s->idle_hint == b)
-                return;
+                return 0;
 
         s->idle_hint = b;
         dual_timestamp_get(&s->idle_hint_timestamp);
@@ -1000,6 +994,8 @@ void session_set_idle_hint(Session *s, bool b) {
 
         user_send_changed(s->user, "IdleHint", "IdleSinceHint", "IdleSinceHintMonotonic", NULL);
         manager_send_changed(s->manager, "IdleHint", "IdleSinceHint", "IdleSinceHintMonotonic", NULL);
+
+        return 1;
 }
 
 int session_get_locked_hint(Session *s) {

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index 28b01d2b9a63a688ee5af0612ced813266ee1c6e..c51392bef655ef533c8d5ed95313aeabab69d269 100644 (file)
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -132,7 +132,7 @@ void session_add_to_gc_queue(Session *s);
 int session_activate(Session *s);
 bool session_is_active(Session *s);
 int session_get_idle_hint(Session *s, dual_timestamp *t);
-void session_set_idle_hint(Session *s, bool b);
+int session_set_idle_hint(Session *s, bool b);
 int session_get_locked_hint(Session *s);
 void session_set_locked_hint(Session *s, bool b);
 int session_create_fifo(Session *s);

diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 1dc222f90ef51c344ac31ab232e663a5c134902c..d9f1dfe4a4f2277a0145de1416339371e260435f 100644 (file)
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -3,6 +3,7 @@
 #include <errno.h>
 
 #include "alloc-util.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "format-util.h"
 #include "logind-dbus.h"

diff --git a/src/login/logind.c b/src/login/logind.c
index d8c1bbe15b95eec66d3ed11776a7821b1d405d2b..8f3708d2a4f00671d6dc8d0444315bfd6f9c3038 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -9,7 +9,7 @@
 
 #include "alloc-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "cgroup-util.h"
 #include "def.h"
 #include "device-util.h"

diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index b45355d86fce7d322c2ee9bf8f33682b791d6aa8..294ef349321f4c0397d9d9aecc9a3dfa8b1484b6 100644 (file)
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -5,6 +5,7 @@
 
 #include "alloc-util.h"
 #include "bus-label.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "copy.h"
 #include "dissect-image.h"

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 3b2ac3829859618b633587d21864136cf82339ea..a2990452af17973de8844844f13bdb5c575ac0b9 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -14,6 +14,7 @@
 #include "bus-common-errors.h"
 #include "bus-internal.h"
 #include "bus-label.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "copy.h"
 #include "env-file.h"

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 6fc3b930570be25e6c9ac4c2efe590228d4bfc92..d0cc07678fa25e4193c1590dbef32fbace3bf7f2 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -8,6 +8,7 @@
 #include "alloc-util.h"
 #include "btrfs-util.h"
 #include "bus-common-errors.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "errno-util.h"

diff --git a/src/machine/machined.c b/src/machine/machined.c
index a3bed035dc80c95169491506e078f1514f9f9c62..ace2131c2deaa512bb9960d73277dd2093b0fe3c 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -10,7 +10,7 @@
 
 #include "alloc-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "cgroup-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"

diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
index 8b79051ef579d86a467acee32169614c7e6f1473..a3bad941ad291d69bb39c8b0f3ffe0a02ba813dc 100644 (file)
--- a/src/network/netdev/tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -729,7 +729,7 @@ static void ipip_sit_init(NetDev *n) {
         assert(t);
 
         t->pmtudisc = true;
-        t->fou_encap_type = FOU_ENCAP_DIRECT;
+        t->fou_encap_type = NETDEV_FOO_OVER_UDP_ENCAP_DIRECT;
         t->isatap = -1;
 }
 
@@ -771,7 +771,7 @@ static void gre_erspan_init(NetDev *n) {
 
         t->pmtudisc = true;
         t->gre_erspan_sequence = -1;
-        t->fou_encap_type = FOU_ENCAP_DIRECT;
+        t->fou_encap_type = NETDEV_FOO_OVER_UDP_ENCAP_DIRECT;
 }
 
 static void ip6gre_init(NetDev *n) {

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 23d40ccc4119b67fb809ee3a9bc0952c65be32a9..8579771941c20a06e3722b360e05d6572da3e938 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -32,6 +32,7 @@ int address_new(Address **ret) {
                 .scope = RT_SCOPE_UNIVERSE,
                 .cinfo.ifa_prefered = CACHE_INFO_INFINITY_LIFE_TIME,
                 .cinfo.ifa_valid = CACHE_INFO_INFINITY_LIFE_TIME,
+                .prefix_route = true,
         };
 
         *ret = TAKE_PTR(address);
@@ -593,7 +594,7 @@ int address_configure(
         if (address->manage_temporary_address)
                 address->flags |= IFA_F_MANAGETEMPADDR;
 
-        if (address->prefix_route)
+        if (!address->prefix_route)
                 address->flags |= IFA_F_NOPREFIXROUTE;
 
         if (address->autojoin)
@@ -908,6 +909,8 @@ int config_parse_address_flags(const char *unit,
         else if (streq(lvalue, "ManageTemporaryAddress"))
                 n->manage_temporary_address = r;
         else if (streq(lvalue, "PrefixRoute"))
+                n->prefix_route = !r;
+        else if (streq(lvalue, "AddPrefixRoute"))
                 n->prefix_route = r;
         else if (streq(lvalue, "AutoJoin"))
                 n->autojoin = r;

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 8ca87d99d4db7922569daf136814d9e4a2635222..95c8b92541356729c9464604ba0cec4d46363c92 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -111,10 +111,10 @@ static int route_scope_from_address(const Route *route, const struct in_addr *se
                 return RT_SCOPE_UNIVERSE;
 }
 
-static bool link_noprefixroute(Link *link) {
-        return link->network->dhcp_route_table_set &&
-                link->network->dhcp_route_table != RT_TABLE_MAIN &&
-                !link->manager->dhcp4_prefix_root_cannot_set_table;
+static bool link_prefixroute(Link *link) {
+        return !link->network->dhcp_route_table_set ||
+                link->network->dhcp_route_table == RT_TABLE_MAIN ||
+                link->manager->dhcp4_prefix_root_cannot_set_table;
 }
 
 static int dhcp_route_configure(Route **route, Link *link) {
@@ -254,7 +254,7 @@ static int link_set_dhcp_routes(Link *link) {
         if (r < 0)
                 return log_link_warning_errno(link, r, "DHCP error: could not get address: %m");
 
-        if (link_noprefixroute(link)) {
+        if (!link_prefixroute(link)) {
                 _cleanup_(route_freep) Route *prefix_route = NULL;
 
                 r = dhcp_prefix_route_from_lease(link->dhcp_lease, table, &address, &prefix_route);
@@ -516,7 +516,7 @@ static int dhcp_remove_dns_routes(Link *link, sd_dhcp_lease *lease, const struct
                 (void) route_remove(route, link, NULL);
         }
 
-        if (link_noprefixroute(link)) {
+        if (!link_prefixroute(link)) {
                 _cleanup_(route_freep) Route *prefix_route = NULL;
 
                 r = dhcp_prefix_route_from_lease(lease, table, address, &prefix_route);
@@ -719,7 +719,7 @@ static int dhcp4_update_address(Link *link,
         addr->cinfo.ifa_valid = lifetime;
         addr->prefixlen = prefixlen;
         addr->broadcast.s_addr = address->s_addr | ~netmask->s_addr;
-        addr->prefix_route = link_noprefixroute(link);
+        addr->prefix_route = link_prefixroute(link);
 
         /* allow reusing an existing address and simply update its lifetime
          * in case it already exists */

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 356ceaf0630856639d2586441f83bf16ca4f07a9..d25ab20a0fafeb1d3a76e629542a25d1c4270cfb 100644 (file)
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -6,6 +6,7 @@
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "dns-domain.h"
 #include "networkd-link-bus.h"

diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index 773dcf0b4db71cf7dd140630138d83435c075684..d97cc0ce24286f7402adbb75ddaf595a557082f9 100644 (file)
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -6,7 +6,7 @@
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "networkd-link-bus.h"
 #include "networkd-link.h"
 #include "networkd-manager-bus.h"

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 40fbf14743e8596c9daf23001fe670632cc60420..cbb3fa96f9466bf2a5e4d468921dbdae51a4f6a9 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -11,6 +11,7 @@
 #include "sd-netlink.h"
 
 #include "alloc-util.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "conf-parser.h"
 #include "def.h"
@@ -682,8 +683,8 @@ int manager_rtnl_process_neighbor(sd_netlink *rtnl, sd_netlink_message *message,
                                        strnull(addr_str), strnull(lladdr_str));
                         (void) neighbor_free(neighbor);
                 } else
-                        log_link_info(link, "Kernel removed a neighbor we don't remember: %s->%s, ignoring.",
-                                      strnull(addr_str), strnull(lladdr_str));
+                        log_link_debug(link, "Kernel removed a neighbor we don't remember: %s->%s, ignoring.",
+                                       strnull(addr_str), strnull(lladdr_str));
 
                 break;
 
@@ -839,9 +840,9 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
                                        valid_str ? "for " : "forever", strempty(valid_str));
                         (void) address_drop(address);
                 } else
-                        log_link_info(link, "Kernel removed an address we don't remember: %s/%u (valid %s%s), ignoring.",
-                                      strnull(buf), prefixlen,
-                                      valid_str ? "for " : "forever", strempty(valid_str));
+                        log_link_debug(link, "Kernel removed an address we don't remember: %s/%u (valid %s%s), ignoring.",
+                                       strnull(buf), prefixlen,
+                                       valid_str ? "for " : "forever", strempty(valid_str));
 
                 break;
 

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index f314b1ec16ef09d34b9a9b7ade7faa5d2a4a1b10..f7e68be1814fb3345830a7310a450ba44cb5618e 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -107,7 +107,8 @@ Address.PreferredLifetime,              config_parse_lifetime,
 Address.HomeAddress,                    config_parse_address_flags,                      0,                             0
 Address.DuplicateAddressDetection,      config_parse_address_flags,                      0,                             0
 Address.ManageTemporaryAddress,         config_parse_address_flags,                      0,                             0
-Address.PrefixRoute,                    config_parse_address_flags,                      0,                             0
+Address.PrefixRoute,                    config_parse_address_flags,                      0,                             0 /* deprecated */
+Address.AddPrefixRoute,                 config_parse_address_flags,                      0,                             0
 Address.AutoJoin,                       config_parse_address_flags,                      0,                             0
 Address.Scope,                          config_parse_address_scope,                      0,                             0
 IPv6AddressLabel.Prefix,                config_parse_address_label_prefix,               0,                             0

diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c
index 89168c3c43bab79bb1c6ec0ae84ec94c088f5d4c..0fa05434efb34094325b808d7f3be1e344f08221 100644 (file)
--- a/src/portable/portabled-bus.c
+++ b/src/portable/portabled-bus.c
@@ -3,7 +3,7 @@
 #include "alloc-util.h"
 #include "btrfs-util.h"
 #include "bus-common-errors.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "fd-util.h"
 #include "io-util.h"
 #include "machine-image.h"

diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index fd2b7c99944a062565bd7add3b0b800e8c7b7c8f..2bd1c495e4e0ee540202780230480a74be27886a 100644 (file)
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -8,6 +8,7 @@
 #include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-label.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index c74ec429627b721a6b8d85d857437d5eea2cbf2e..75b76926e5565be0e0b4370d17ff6cfcb59e6bb7 100644 (file)
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -7,7 +7,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "def.h"
 #include "main-func.h"
 #include "portabled-bus.h"

diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index 2c1aba911ac6e24aad1c98ef7ce5c788954ca092..a2712610ce47c2a4dec03851885ee5f61c374786 100644 (file)
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -2,6 +2,7 @@
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "dns-domain.h"
 #include "memory-util.h"

diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c
index 89e48403f090223d128b2b1a77b41322ca1c1548..92842bcf89d43f8646b768f1b3333a8b88db4780 100644 (file)
--- a/src/resolve/resolved-dns-trust-anchor.c
+++ b/src/resolve/resolved-dns-trust-anchor.c
@@ -20,11 +20,6 @@
 
 static const char trust_anchor_dirs[] = CONF_PATHS_NULSTR("dnssec-trust-anchors.d");
 
-/* The first DS RR from https://data.iana.org/root-anchors/root-anchors.xml, retrieved December 2015 */
-static const uint8_t root_digest1[] =
-        { 0x49, 0xAA, 0xC1, 0x1D, 0x7B, 0x6F, 0x64, 0x46, 0x70, 0x2E, 0x54, 0xA1, 0x60, 0x73, 0x71, 0x60,
-          0x7A, 0x1A, 0x41, 0x85, 0x52, 0x00, 0xFD, 0x2C, 0xE1, 0xCD, 0xDE, 0x32, 0xF2, 0x4E, 0x8F, 0xB5 };
-
 /* The second DS RR from https://data.iana.org/root-anchors/root-anchors.xml, retrieved February 2017 */
 static const uint8_t root_digest2[] =
         { 0xE0, 0x6D, 0x44, 0xB8, 0x0B, 0x8F, 0x1D, 0x39, 0xA9, 0x5C, 0x0B, 0x0D, 0x7C, 0x65, 0xD0, 0x84,
@@ -96,11 +91,7 @@ static int dns_trust_anchor_add_builtin_positive(DnsTrustAnchor *d) {
         if (!answer)
                 return -ENOMEM;
 
-        /* Add the two RRs from https://data.iana.org/root-anchors/root-anchors.xml */
-        r = add_root_ksk(answer, key, 19036, DNSSEC_ALGORITHM_RSASHA256, DNSSEC_DIGEST_SHA256, root_digest1, sizeof(root_digest1));
-        if (r < 0)
-                return r;
-
+        /* Add the currently valid RRs from https://data.iana.org/root-anchors/root-anchors.xml */
         r = add_root_ksk(answer, key, 20326, DNSSEC_ALGORITHM_RSASHA256, DNSSEC_DIGEST_SHA256, root_digest2, sizeof(root_digest2));
         if (r < 0)
                 return r;

diff --git a/src/resolve/resolved-dnssd-bus.c b/src/resolve/resolved-dnssd-bus.c
index 24bb37b35e848eaaf59195267ad887046f94b508..f7dcb3bfa56f8fb4afc035e9ab165d3211129b21 100644 (file)
--- a/src/resolve/resolved-dnssd-bus.c
+++ b/src/resolve/resolved-dnssd-bus.c
@@ -1,9 +1,10 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "alloc-util.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "missing_capability.h"
-#include "resolved-dnssd.h"
 #include "resolved-dnssd-bus.h"
+#include "resolved-dnssd.h"
 #include "resolved-link.h"
 #include "strv.h"
 #include "user-util.h"

diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c
index 8a2768b1e2c8e60bf6e92a6d24cab0152ceffddc..8bbfbaacb88dc4eb8b9a781b05838e07372ffe29 100644 (file)
--- a/src/resolve/resolved-link-bus.c
+++ b/src/resolve/resolved-link-bus.c
@@ -6,6 +6,7 @@
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
+#include "bus-polkit.h"
 #include "bus-util.h"
 #include "parse-util.h"
 #include "resolve-util.h"

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 95f698ab06d6498c7365cbf35043495207a8bf45..2d5dbcc23dc5512560fa4b33c15d0e687c75916b 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -14,7 +14,7 @@
 
 #include "af-list.h"
 #include "alloc-util.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "dirent-util.h"
 #include "dns-domain.h"
 #include "fd-util.h"

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 4f750dc1da1b50c282576429529bd0024a3b2b63..558748df35e91646b1219fcdada73cb6cb55f3f3 100644 (file)
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -162,6 +162,7 @@ void boot_config_free(BootConfig *config) {
         free(config->auto_entries);
         free(config->auto_firmware);
         free(config->console_mode);
+        free(config->random_seed_mode);
 
         free(config->entry_oneshot);
         free(config->entry_default);
@@ -227,6 +228,8 @@ static int boot_loader_read_conf(const char *path, BootConfig *config) {
                         r = free_and_strdup(&config->auto_firmware, p);
                 else if (streq(field, "console-mode"))
                         r = free_and_strdup(&config->console_mode, p);
+                else if (streq(field, "random-seed-mode"))
+                        r = free_and_strdup(&config->random_seed_mode, p);
                 else {
                         log_notice("%s:%u: Unknown line \"%s\", ignoring.", path, line, field);
                         continue;

diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h
index c18d89494a512132be7adde966bf200ef2e3a062..b65b76c2ee0c9ab775525ddb4638b5668aa7bdee 100644 (file)
--- a/src/shared/bootspec.h
+++ b/src/shared/bootspec.h
@@ -42,6 +42,7 @@ typedef struct BootConfig {
         char *auto_entries;
         char *auto_firmware;
         char *console_mode;
+        char *random_seed_mode;
 
         char *entry_oneshot;
         char *entry_default;

diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c
new file mode 100644 (file)
index 0000000..0dbf3f6
--- /dev/null
+++ b/src/shared/bus-polkit.c
@@ -0,0 +1,416 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include "bus-internal.h"
+#include "bus-message.h"
+#include "bus-polkit.h"
+#include "strv.h"
+#include "user-util.h"
+
+static int check_good_user(sd_bus_message *m, uid_t good_user) {
+        _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
+        uid_t sender_uid;
+        int r;
+
+        assert(m);
+
+        if (good_user == UID_INVALID)
+                return 0;
+
+        r = sd_bus_query_sender_creds(m, SD_BUS_CREDS_EUID, &creds);
+        if (r < 0)
+                return r;
+
+        /* Don't trust augmented credentials for authorization */
+        assert_return((sd_bus_creds_get_augmented_mask(creds) & SD_BUS_CREDS_EUID) == 0, -EPERM);
+
+        r = sd_bus_creds_get_euid(creds, &sender_uid);
+        if (r < 0)
+                return r;
+
+        return sender_uid == good_user;
+}
+
+#if ENABLE_POLKIT
+static int bus_message_append_strv_key_value(
+                sd_bus_message *m,
+                const char **l) {
+
+        const char **k, **v;
+        int r;
+
+        assert(m);
+
+        r = sd_bus_message_open_container(m, 'a', "{ss}");
+        if (r < 0)
+                return r;
+
+        STRV_FOREACH_PAIR(k, v, l) {
+                r = sd_bus_message_append(m, "{ss}", *k, *v);
+                if (r < 0)
+                        return r;
+        }
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return r;
+
+        return r;
+}
+#endif
+
+int bus_test_polkit(
+                sd_bus_message *call,
+                int capability,
+                const char *action,
+                const char **details,
+                uid_t good_user,
+                bool *_challenge,
+                sd_bus_error *ret_error) {
+
+        int r;
+
+        assert(call);
+        assert(action);
+
+        /* Tests non-interactively! */
+
+        r = check_good_user(call, good_user);
+        if (r != 0)
+                return r;
+
+        r = sd_bus_query_sender_privilege(call, capability);
+        if (r < 0)
+                return r;
+        else if (r > 0)
+                return 1;
+#if ENABLE_POLKIT
+        else {
+                _cleanup_(sd_bus_message_unrefp) sd_bus_message *request = NULL;
+                _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
+                int authorized = false, challenge = false;
+                const char *sender;
+
+                sender = sd_bus_message_get_sender(call);
+                if (!sender)
+                        return -EBADMSG;
+
+                r = sd_bus_message_new_method_call(
+                                call->bus,
+                                &request,
+                                "org.freedesktop.PolicyKit1",
+                                "/org/freedesktop/PolicyKit1/Authority",
+                                "org.freedesktop.PolicyKit1.Authority",
+                                "CheckAuthorization");
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_append(
+                                request,
+                                "(sa{sv})s",
+                                "system-bus-name", 1, "name", "s", sender,
+                                action);
+                if (r < 0)
+                        return r;
+
+                r = bus_message_append_strv_key_value(request, details);
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_append(request, "us", 0, NULL);
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_call(call->bus, request, 0, ret_error, &reply);
+                if (r < 0) {
+                        /* Treat no PK available as access denied */
+                        if (sd_bus_error_has_name(ret_error, SD_BUS_ERROR_SERVICE_UNKNOWN)) {
+                                sd_bus_error_free(ret_error);
+                                return -EACCES;
+                        }
+
+                        return r;
+                }
+
+                r = sd_bus_message_enter_container(reply, 'r', "bba{ss}");
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
+                if (r < 0)
+                        return r;
+
+                if (authorized)
+                        return 1;
+
+                if (_challenge) {
+                        *_challenge = challenge;
+                        return 0;
+                }
+        }
+#endif
+
+        return -EACCES;
+}
+
+#if ENABLE_POLKIT
+
+typedef struct AsyncPolkitQuery {
+        char *action;
+        char **details;
+
+        sd_bus_message *request, *reply;
+        sd_bus_slot *slot;
+
+        Hashmap *registry;
+        sd_event_source *defer_event_source;
+} AsyncPolkitQuery;
+
+static void async_polkit_query_free(AsyncPolkitQuery *q) {
+        if (!q)
+                return;
+
+        sd_bus_slot_unref(q->slot);
+
+        if (q->registry && q->request)
+                hashmap_remove(q->registry, q->request);
+
+        sd_bus_message_unref(q->request);
+        sd_bus_message_unref(q->reply);
+
+        free(q->action);
+        strv_free(q->details);
+
+        sd_event_source_disable_unref(q->defer_event_source);
+        free(q);
+}
+
+static int async_polkit_defer(sd_event_source *s, void *userdata) {
+        AsyncPolkitQuery *q = userdata;
+
+        assert(s);
+
+        /* This is called as idle event source after we processed the async polkit reply, hopefully after the
+         * method call we re-enqueued has been properly processed. */
+
+        async_polkit_query_free(q);
+        return 0;
+}
+
+static int async_polkit_callback(sd_bus_message *reply, void *userdata, sd_bus_error *error) {
+        _cleanup_(sd_bus_error_free) sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
+        AsyncPolkitQuery *q = userdata;
+        int r;
+
+        assert(reply);
+        assert(q);
+
+        assert(q->slot);
+        q->slot = sd_bus_slot_unref(q->slot);
+
+        assert(!q->reply);
+        q->reply = sd_bus_message_ref(reply);
+
+        /* Now, let's dispatch the original message a second time be re-enqueing. This will then traverse the
+         * whole message processing again, and thus re-validating and re-retrieving the "userdata" field
+         * again.
+         *
+         * We install an idle event loop event to clean-up the PolicyKit request data when we are idle again,
+         * i.e. after the second time the message is processed is complete. */
+
+        assert(!q->defer_event_source);
+        r = sd_event_add_defer(sd_bus_get_event(sd_bus_message_get_bus(reply)), &q->defer_event_source, async_polkit_defer, q);
+        if (r < 0)
+                goto fail;
+
+        r = sd_event_source_set_priority(q->defer_event_source, SD_EVENT_PRIORITY_IDLE);
+        if (r < 0)
+                goto fail;
+
+        r = sd_event_source_set_enabled(q->defer_event_source, SD_EVENT_ONESHOT);
+        if (r < 0)
+                goto fail;
+
+        r = sd_bus_message_rewind(q->request, true);
+        if (r < 0)
+                goto fail;
+
+        r = sd_bus_enqueue_for_read(sd_bus_message_get_bus(q->request), q->request);
+        if (r < 0)
+                goto fail;
+
+        return 1;
+
+fail:
+        log_debug_errno(r, "Processing asynchronous PolicyKit reply failed, ignoring: %m");
+        (void) sd_bus_reply_method_errno(q->request, r, NULL);
+        async_polkit_query_free(q);
+        return r;
+}
+
+#endif
+
+int bus_verify_polkit_async(
+                sd_bus_message *call,
+                int capability,
+                const char *action,
+                const char **details,
+                bool interactive,
+                uid_t good_user,
+                Hashmap **registry,
+                sd_bus_error *ret_error) {
+
+#if ENABLE_POLKIT
+        _cleanup_(sd_bus_message_unrefp) sd_bus_message *pk = NULL;
+        AsyncPolkitQuery *q;
+        int c;
+#endif
+        const char *sender;
+        int r;
+
+        assert(call);
+        assert(action);
+        assert(registry);
+
+        r = check_good_user(call, good_user);
+        if (r != 0)
+                return r;
+
+#if ENABLE_POLKIT
+        q = hashmap_get(*registry, call);
+        if (q) {
+                int authorized, challenge;
+
+                /* This is the second invocation of this function, and there's already a response from
+                 * polkit, let's process it */
+                assert(q->reply);
+
+                /* If the operation we want to authenticate changed between the first and the second time,
+                 * let's not use this authentication, it might be out of date as the object and context we
+                 * operate on might have changed. */
+                if (!streq(q->action, action) ||
+                    !strv_equal(q->details, (char**) details))
+                        return -ESTALE;
+
+                if (sd_bus_message_is_method_error(q->reply, NULL)) {
+                        const sd_bus_error *e;
+
+                        e = sd_bus_message_get_error(q->reply);
+
+                        /* Treat no PK available as access denied */
+                        if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN) ||
+                            sd_bus_error_has_name(e, SD_BUS_ERROR_NAME_HAS_NO_OWNER))
+                                return -EACCES;
+
+                        /* Copy error from polkit reply */
+                        sd_bus_error_copy(ret_error, e);
+                        return -sd_bus_error_get_errno(e);
+                }
+
+                r = sd_bus_message_enter_container(q->reply, 'r', "bba{ss}");
+                if (r >= 0)
+                        r = sd_bus_message_read(q->reply, "bb", &authorized, &challenge);
+                if (r < 0)
+                        return r;
+
+                if (authorized)
+                        return 1;
+
+                if (challenge)
+                        return sd_bus_error_set(ret_error, SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED, "Interactive authentication required.");
+
+                return -EACCES;
+        }
+#endif
+
+        r = sd_bus_query_sender_privilege(call, capability);
+        if (r < 0)
+                return r;
+        else if (r > 0)
+                return 1;
+
+        sender = sd_bus_message_get_sender(call);
+        if (!sender)
+                return -EBADMSG;
+
+#if ENABLE_POLKIT
+        c = sd_bus_message_get_allow_interactive_authorization(call);
+        if (c < 0)
+                return c;
+        if (c > 0)
+                interactive = true;
+
+        r = hashmap_ensure_allocated(registry, NULL);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_new_method_call(
+                        call->bus,
+                        &pk,
+                        "org.freedesktop.PolicyKit1",
+                        "/org/freedesktop/PolicyKit1/Authority",
+                        "org.freedesktop.PolicyKit1.Authority",
+                        "CheckAuthorization");
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_append(
+                        pk,
+                        "(sa{sv})s",
+                        "system-bus-name", 1, "name", "s", sender,
+                        action);
+        if (r < 0)
+                return r;
+
+        r = bus_message_append_strv_key_value(pk, details);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_append(pk, "us", interactive, NULL);
+        if (r < 0)
+                return r;
+
+        q = new(AsyncPolkitQuery, 1);
+        if (!q)
+                return -ENOMEM;
+
+        *q = (AsyncPolkitQuery) {
+                .request = sd_bus_message_ref(call),
+        };
+
+        q->action = strdup(action);
+        if (!q->action) {
+                async_polkit_query_free(q);
+                return -ENOMEM;
+        }
+
+        q->details = strv_copy((char**) details);
+        if (!q->details) {
+                async_polkit_query_free(q);
+                return -ENOMEM;
+        }
+
+        r = hashmap_put(*registry, call, q);
+        if (r < 0) {
+                async_polkit_query_free(q);
+                return r;
+        }
+
+        q->registry = *registry;
+
+        r = sd_bus_call_async(call->bus, &q->slot, pk, async_polkit_callback, q, 0);
+        if (r < 0) {
+                async_polkit_query_free(q);
+                return r;
+        }
+
+        return 0;
+#endif
+
+        return -EACCES;
+}
+
+void bus_verify_polkit_async_registry_free(Hashmap *registry) {
+#if ENABLE_POLKIT
+        hashmap_free_with_destructor(registry, async_polkit_query_free);
+#endif
+}

diff --git a/src/shared/bus-polkit.h b/src/shared/bus-polkit.h
new file mode 100644 (file)
index 0000000..29b3923
--- /dev/null
+++ b/src/shared/bus-polkit.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include "sd-bus.h"
+
+#include "hashmap.h"
+
+int bus_test_polkit(sd_bus_message *call, int capability, const char *action, const char **details, uid_t good_user, bool *_challenge, sd_bus_error *e);
+
+int bus_verify_polkit_async(sd_bus_message *call, int capability, const char *action, const char **details, bool interactive, uid_t good_user, Hashmap **registry, sd_bus_error *error);
+void bus_verify_polkit_async_registry_free(Hashmap *registry);

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index aea46d311996a548c8838f183c1015904cd21b71..7bab94580fb53c88e8b44b67ea396f3bb437e5f7 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -9,7 +9,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "sd-bus-protocol.h"
 #include "sd-bus.h"
 #include "sd-daemon.h"
 #include "sd-event.h"
@@ -22,15 +21,12 @@
 #include "bus-util.h"
 #include "cap-list.h"
 #include "cgroup-util.h"
-#include "def.h"
-#include "escape.h"
-#include "fd-util.h"
 #include "mountpoint-util.h"
 #include "nsflags.h"
 #include "parse-util.h"
 #include "path-util.h"
-#include "proc-cmdline.h"
 #include "rlimit-util.h"
+#include "socket-util.h"
 #include "stdio-util.h"
 #include "strv.h"
 #include "user-util.h"
@@ -185,357 +181,6 @@ int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error) {
         return has_owner;
 }
 
-static int check_good_user(sd_bus_message *m, uid_t good_user) {
-        _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
-        uid_t sender_uid;
-        int r;
-
-        assert(m);
-
-        if (good_user == UID_INVALID)
-                return 0;
-
-        r = sd_bus_query_sender_creds(m, SD_BUS_CREDS_EUID, &creds);
-        if (r < 0)
-                return r;
-
-        /* Don't trust augmented credentials for authorization */
-        assert_return((sd_bus_creds_get_augmented_mask(creds) & SD_BUS_CREDS_EUID) == 0, -EPERM);
-
-        r = sd_bus_creds_get_euid(creds, &sender_uid);
-        if (r < 0)
-                return r;
-
-        return sender_uid == good_user;
-}
-
-int bus_test_polkit(
-                sd_bus_message *call,
-                int capability,
-                const char *action,
-                const char **details,
-                uid_t good_user,
-                bool *_challenge,
-                sd_bus_error *e) {
-
-        int r;
-
-        assert(call);
-        assert(action);
-
-        /* Tests non-interactively! */
-
-        r = check_good_user(call, good_user);
-        if (r != 0)
-                return r;
-
-        r = sd_bus_query_sender_privilege(call, capability);
-        if (r < 0)
-                return r;
-        else if (r > 0)
-                return 1;
-#if ENABLE_POLKIT
-        else {
-                _cleanup_(sd_bus_message_unrefp) sd_bus_message *request = NULL;
-                _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
-                int authorized = false, challenge = false;
-                const char *sender, **k, **v;
-
-                sender = sd_bus_message_get_sender(call);
-                if (!sender)
-                        return -EBADMSG;
-
-                r = sd_bus_message_new_method_call(
-                                call->bus,
-                                &request,
-                                "org.freedesktop.PolicyKit1",
-                                "/org/freedesktop/PolicyKit1/Authority",
-                                "org.freedesktop.PolicyKit1.Authority",
-                                "CheckAuthorization");
-                if (r < 0)
-                        return r;
-
-                r = sd_bus_message_append(
-                                request,
-                                "(sa{sv})s",
-                                "system-bus-name", 1, "name", "s", sender,
-                                action);
-                if (r < 0)
-                        return r;
-
-                r = sd_bus_message_open_container(request, 'a', "{ss}");
-                if (r < 0)
-                        return r;
-
-                STRV_FOREACH_PAIR(k, v, details) {
-                        r = sd_bus_message_append(request, "{ss}", *k, *v);
-                        if (r < 0)
-                                return r;
-                }
-
-                r = sd_bus_message_close_container(request);
-                if (r < 0)
-                        return r;
-
-                r = sd_bus_message_append(request, "us", 0, NULL);
-                if (r < 0)
-                        return r;
-
-                r = sd_bus_call(call->bus, request, 0, e, &reply);
-                if (r < 0) {
-                        /* Treat no PK available as access denied */
-                        if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN)) {
-                                sd_bus_error_free(e);
-                                return -EACCES;
-                        }
-
-                        return r;
-                }
-
-                r = sd_bus_message_enter_container(reply, 'r', "bba{ss}");
-                if (r < 0)
-                        return r;
-
-                r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
-                if (r < 0)
-                        return r;
-
-                if (authorized)
-                        return 1;
-
-                if (_challenge) {
-                        *_challenge = challenge;
-                        return 0;
-                }
-        }
-#endif
-
-        return -EACCES;
-}
-
-#if ENABLE_POLKIT
-
-typedef struct AsyncPolkitQuery {
-        sd_bus_message *request, *reply;
-        sd_bus_message_handler_t callback;
-        void *userdata;
-        sd_bus_slot *slot;
-        Hashmap *registry;
-} AsyncPolkitQuery;
-
-static void async_polkit_query_free(AsyncPolkitQuery *q) {
-
-        if (!q)
-                return;
-
-        sd_bus_slot_unref(q->slot);
-
-        if (q->registry && q->request)
-                hashmap_remove(q->registry, q->request);
-
-        sd_bus_message_unref(q->request);
-        sd_bus_message_unref(q->reply);
-
-        free(q);
-}
-
-static int async_polkit_callback(sd_bus_message *reply, void *userdata, sd_bus_error *error) {
-        _cleanup_(sd_bus_error_free) sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
-        AsyncPolkitQuery *q = userdata;
-        int r;
-
-        assert(reply);
-        assert(q);
-
-        q->slot = sd_bus_slot_unref(q->slot);
-        q->reply = sd_bus_message_ref(reply);
-
-        r = sd_bus_message_rewind(q->request, true);
-        if (r < 0) {
-                r = sd_bus_reply_method_errno(q->request, r, NULL);
-                goto finish;
-        }
-
-        r = q->callback(q->request, q->userdata, &error_buffer);
-        r = bus_maybe_reply_error(q->request, r, &error_buffer);
-
-finish:
-        async_polkit_query_free(q);
-
-        return r;
-}
-
-#endif
-
-int bus_verify_polkit_async(
-                sd_bus_message *call,
-                int capability,
-                const char *action,
-                const char **details,
-                bool interactive,
-                uid_t good_user,
-                Hashmap **registry,
-                sd_bus_error *error) {
-
-#if ENABLE_POLKIT
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *pk = NULL;
-        AsyncPolkitQuery *q;
-        const char *sender, **k, **v;
-        sd_bus_message_handler_t callback;
-        void *userdata;
-        int c;
-#endif
-        int r;
-
-        assert(call);
-        assert(action);
-        assert(registry);
-
-        r = check_good_user(call, good_user);
-        if (r != 0)
-                return r;
-
-#if ENABLE_POLKIT
-        q = hashmap_get(*registry, call);
-        if (q) {
-                int authorized, challenge;
-
-                /* This is the second invocation of this function, and
-                 * there's already a response from polkit, let's
-                 * process it */
-                assert(q->reply);
-
-                if (sd_bus_message_is_method_error(q->reply, NULL)) {
-                        const sd_bus_error *e;
-
-                        e = sd_bus_message_get_error(q->reply);
-
-                        /* Treat no PK available as access denied */
-                        if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN) ||
-                            sd_bus_error_has_name(e, SD_BUS_ERROR_NAME_HAS_NO_OWNER))
-                                return -EACCES;
-
-                        /* Copy error from polkit reply */
-                        sd_bus_error_copy(error, e);
-                        return -sd_bus_error_get_errno(e);
-                }
-
-                r = sd_bus_message_enter_container(q->reply, 'r', "bba{ss}");
-                if (r >= 0)
-                        r = sd_bus_message_read(q->reply, "bb", &authorized, &challenge);
-                if (r < 0)
-                        return r;
-
-                if (authorized)
-                        return 1;
-
-                if (challenge)
-                        return sd_bus_error_set(error, SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED, "Interactive authentication required.");
-
-                return -EACCES;
-        }
-#endif
-
-        r = sd_bus_query_sender_privilege(call, capability);
-        if (r < 0)
-                return r;
-        else if (r > 0)
-                return 1;
-
-#if ENABLE_POLKIT
-        if (sd_bus_get_current_message(call->bus) != call)
-                return -EINVAL;
-
-        callback = sd_bus_get_current_handler(call->bus);
-        if (!callback)
-                return -EINVAL;
-
-        userdata = sd_bus_get_current_userdata(call->bus);
-
-        sender = sd_bus_message_get_sender(call);
-        if (!sender)
-                return -EBADMSG;
-
-        c = sd_bus_message_get_allow_interactive_authorization(call);
-        if (c < 0)
-                return c;
-        if (c > 0)
-                interactive = true;
-
-        r = hashmap_ensure_allocated(registry, NULL);
-        if (r < 0)
-                return r;
-
-        r = sd_bus_message_new_method_call(
-                        call->bus,
-                        &pk,
-                        "org.freedesktop.PolicyKit1",
-                        "/org/freedesktop/PolicyKit1/Authority",
-                        "org.freedesktop.PolicyKit1.Authority",
-                        "CheckAuthorization");
-        if (r < 0)
-                return r;
-
-        r = sd_bus_message_append(
-                        pk,
-                        "(sa{sv})s",
-                        "system-bus-name", 1, "name", "s", sender,
-                        action);
-        if (r < 0)
-                return r;
-
-        r = sd_bus_message_open_container(pk, 'a', "{ss}");
-        if (r < 0)
-                return r;
-
-        STRV_FOREACH_PAIR(k, v, details) {
-                r = sd_bus_message_append(pk, "{ss}", *k, *v);
-                if (r < 0)
-                        return r;
-        }
-
-        r = sd_bus_message_close_container(pk);
-        if (r < 0)
-                return r;
-
-        r = sd_bus_message_append(pk, "us", interactive, NULL);
-        if (r < 0)
-                return r;
-
-        q = new0(AsyncPolkitQuery, 1);
-        if (!q)
-                return -ENOMEM;
-
-        q->request = sd_bus_message_ref(call);
-        q->callback = callback;
-        q->userdata = userdata;
-
-        r = hashmap_put(*registry, call, q);
-        if (r < 0) {
-                async_polkit_query_free(q);
-                return r;
-        }
-
-        q->registry = *registry;
-
-        r = sd_bus_call_async(call->bus, &q->slot, pk, async_polkit_callback, q, 0);
-        if (r < 0) {
-                async_polkit_query_free(q);
-                return r;
-        }
-
-        return 0;
-#endif
-
-        return -EACCES;
-}
-
-void bus_verify_polkit_async_registry_free(Hashmap *registry) {
-#if ENABLE_POLKIT
-        hashmap_free_with_destructor(registry, async_polkit_query_free);
-#endif
-}
-
 int bus_check_peercred(sd_bus *c) {
         struct ucred ucred;
         int fd, r;

diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index 1e2f04cc5dffcfc21fdb33bbb9eb8e56d828bc7e..db245a791ea4fa4c21450e0394f41993e5f38dde 100644 (file)
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -9,8 +9,8 @@
 #include "sd-bus.h"
 #include "sd-event.h"
 
-#include "hashmap.h"
 #include "macro.h"
+#include "set.h"
 #include "string-util.h"
 #include "time-util.h"
 
@@ -52,11 +52,6 @@ int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error);
 
 int bus_check_peercred(sd_bus *c);
 
-int bus_test_polkit(sd_bus_message *call, int capability, const char *action, const char **details, uid_t good_user, bool *_challenge, sd_bus_error *e);
-
-int bus_verify_polkit_async(sd_bus_message *call, int capability, const char *action, const char **details, bool interactive, uid_t good_user, Hashmap **registry, sd_bus_error *error);
-void bus_verify_polkit_async_registry_free(Hashmap *registry);
-
 int bus_connect_system_systemd(sd_bus **_bus);
 int bus_connect_user_systemd(sd_bus **_bus);
 

diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index ca97285c979bd6d50d846ec4008c4256f0e1602a..96cd08aab25d65837ed9bdd734ae86df8fc769c4 100644 (file)
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -230,7 +230,6 @@ int unit_file_find_dropin_paths(
                 char ***ret) {
 
         _cleanup_strv_free_ char **dirs = NULL;
-        UnitType type = _UNIT_TYPE_INVALID;
         char *name, **p;
         Iterator i;
         int r;
@@ -240,22 +239,24 @@ int unit_file_find_dropin_paths(
         /* All the names in the unit are of the same type so just grab one. */
         name = (char*) set_first(names);
         if (name) {
+                UnitType type = _UNIT_TYPE_INVALID;
+
                 type = unit_name_to_type(name);
                 if (type < 0)
                         return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                                "Failed to to derive unit type from unit name: %s",
                                                name);
-        }
 
-        /* Special top level drop in for "<unit type>.<suffix>". Add this first as it's the most generic
-         * and should be able to be overridden by more specific drop-ins. */
-        STRV_FOREACH(p, lookup_path)
-                (void) unit_file_find_dirs(original_root,
-                                           unit_path_cache,
-                                           *p,
-                                           unit_type_to_string(type),
-                                           dir_suffix,
-                                           &dirs);
+                /* Special top level drop in for "<unit type>.<suffix>". Add this first as it's the most generic
+                 * and should be able to be overridden by more specific drop-ins. */
+                STRV_FOREACH(p, lookup_path)
+                        (void) unit_file_find_dirs(original_root,
+                                                   unit_path_cache,
+                                                   *p,
+                                                   unit_type_to_string(type),
+                                                   dir_suffix,
+                                                   &dirs);
+        }
 
         SET_FOREACH(name, names, i)
                 STRV_FOREACH(p, lookup_path)

diff --git a/src/shared/efi-loader.c b/src/shared/efi-loader.c
index 3d1df09907f6c01d56b57ff649b3db8364d33b2f..4f6dff7983562852b061ddb444e948aedcfb99c5 100644 (file)
--- a/src/shared/efi-loader.c
+++ b/src/shared/efi-loader.c
@@ -63,40 +63,6 @@ struct device_path device_path__contents;
 struct device_path__packed device_path__contents _packed_;
 assert_cc(sizeof(struct device_path) == sizeof(struct device_path__packed));
 
-bool is_efi_boot(void) {
-        if (detect_container() > 0)
-                return false;
-
-        return access("/sys/firmware/efi/", F_OK) >= 0;
-}
-
-static int read_flag(const char *varname) {
-        _cleanup_free_ void *v = NULL;
-        uint8_t b;
-        size_t s;
-        int r;
-
-        if (!is_efi_boot()) /* If this is not an EFI boot, assume the queried flags are zero */
-                return 0;
-
-        r = efi_get_variable(EFI_VENDOR_GLOBAL, varname, NULL, &v, &s);
-        if (r < 0)
-                return r;
-
-        if (s != 1)
-                return -EINVAL;
-
-        b = *(uint8_t *)v;
-        return !!b;
-}
-
-bool is_efi_secure_boot(void) {
-        return read_flag("SecureBoot") > 0;
-}
-
-bool is_efi_secure_boot_setup_mode(void) {
-        return read_flag("SetupMode") > 0;
-}
 
 int efi_reboot_to_firmware_supported(void) {
         _cleanup_free_ void *v = NULL;

diff --git a/src/shared/efi-loader.h b/src/shared/efi-loader.h
index 7d41fbb3593608b2128d0d62171346e689654f97..96208d25bf5ea053687d156e579063cf72164d64 100644 (file)
--- a/src/shared/efi-loader.h
+++ b/src/shared/efi-loader.h
@@ -5,9 +5,6 @@
 
 #if ENABLE_EFI
 
-bool is_efi_boot(void);
-bool is_efi_secure_boot(void);
-bool is_efi_secure_boot_setup_mode(void);
 int efi_reboot_to_firmware_supported(void);
 int efi_get_reboot_to_firmware(void);
 int efi_set_reboot_to_firmware(bool value);
@@ -28,18 +25,6 @@ int efi_loader_get_features(uint64_t *ret);
 
 #else
 
-static inline bool is_efi_boot(void) {
-        return false;
-}
-
-static inline bool is_efi_secure_boot(void) {
-        return false;
-}
-
-static inline bool is_efi_secure_boot_setup_mode(void) {
-        return false;
-}
-
 static inline int efi_reboot_to_firmware_supported(void) {
         return -EOPNOTSUPP;
 }

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 5b571681f28469fb518ac871b1ab552824d34a27..1cf5887a60de1516bac1df3322d3abe8f1b4c5c3 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -237,10 +237,12 @@ int generator_write_timeouts(
                 return log_error_errno(r, "Failed to make unit name from path: %m");
 
         return write_drop_in_format(dir, unit, 50, "device-timeout",
-                                    "# Automatically generated by %s\n\n"
+                                    "# Automatically generated by %s\n"
+                                    "# from supplied options \"%s\"\n\n"
                                     "[Unit]\n"
                                     "JobRunningTimeoutSec=%s",
                                     program_invocation_short_name,
+                                    opts,
                                     timeout);
 }
 
@@ -491,15 +493,21 @@ int generator_hook_up_growfs(
                 "BindsTo=%%i.mount\n"
                 "Conflicts=shutdown.target\n"
                 "After=%%i.mount\n"
-                "Before=shutdown.target %s\n"
+                "Before=shutdown.target %s\n",
+                program_invocation_short_name,
+                target);
+
+        if (empty_or_root(where)) /* Make sure the root fs is actually writable before we resize it */
+                fprintf(f,
+                        "After=systemd-remount-fs.service\n");
+
+        fprintf(f,
                 "\n"
                 "[Service]\n"
                 "Type=oneshot\n"
                 "RemainAfterExit=yes\n"
                 "ExecStart="SYSTEMD_GROWFS_PATH " %s\n"
                 "TimeoutSec=0\n",
-                program_invocation_short_name,
-                target,
                 escaped);
 
         return generator_add_symlink(dir, where_unit, "wants", unit);

diff --git a/src/shared/install.c b/src/shared/install.c
index 14dfd331d584a0f5ded6c70ed4a8f50640124053..e72ff187f18d5fc71c2bed402c72c2f67f626b82 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -362,6 +362,12 @@ void unit_file_dump_changes(int r, const char *verb, const UnitFileChange *chang
                                         verb, changes[i].path);
                         logged = true;
                         break;
+                case -EUCLEAN:
+                        log_error_errno(changes[i].type,
+                                        "Failed to %s unit, \"%s\" is not a valid unit name.",
+                                        verb, changes[i].path);
+                        logged = true;
+                        break;
                 case -ELOOP:
                         log_error_errno(changes[i].type, "Failed to %s unit, refusing to operate on linked unit file %s",
                                         verb, changes[i].path);
@@ -1194,7 +1200,8 @@ static int config_parse_default_instance(
         }
 
         if (!unit_instance_is_valid(printed))
-                return -EINVAL;
+                return log_syntax(unit, LOG_WARNING, filename, line, SYNTHETIC_ERRNO(EINVAL),
+                                  "Invalid DefaultInstance= value \"%s\".", printed);
 
         return free_and_replace(i->default_instance, printed);
 }
@@ -1785,7 +1792,8 @@ static int install_info_symlink_wants(
                         return q;
 
                 if (!unit_name_is_valid(dst, UNIT_NAME_ANY)) {
-                        r = -EINVAL;
+                        unit_file_changes_add(changes, n_changes, -EUCLEAN, dst, NULL);
+                        r = -EUCLEAN;
                         continue;
                 }
 

diff --git a/src/shared/meson.build b/src/shared/meson.build
index b3ae259b228218be3af3383f2debfdacfb9f62fe..063d15775afd62fa10149ea29aea5415fec223cd 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -27,6 +27,8 @@ shared_sources = files('''
         bus-unit-util.h
         bus-util.c
         bus-util.h
+        bus-polkit.c
+        bus-polkit.h
         bus-wait-for-jobs.c
         bus-wait-for-jobs.h
         bus-wait-for-units.c

diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
index 12fb3ef7ea0e2d58f7f548d65a962163cd1bbc88..8543dbd2d05f39b2bc4db7cd5bfa58d249d8dfd4 100644 (file)
--- a/src/shared/sysctl-util.c
+++ b/src/shared/sysctl-util.c
@@ -9,6 +9,7 @@
 #include "fileio.h"
 #include "log.h"
 #include "macro.h"
+#include "path-util.h"
 #include "string-util.h"
 #include "sysctl-util.h"
 
@@ -16,22 +17,27 @@ char *sysctl_normalize(char *s) {
         char *n;
 
         n = strpbrk(s, "/.");
+
         /* If the first separator is a slash, the path is
          * assumed to be normalized and slashes remain slashes
          * and dots remains dots. */
-        if (!n || *n == '/')
-                return s;
-
-        /* Otherwise, dots become slashes and slashes become
-         * dots. Fun. */
-        while (n) {
-                if (*n == '.')
-                        *n = '/';
-                else
-                        *n = '.';
-
-                n = strpbrk(n + 1, "/.");
-        }
+
+        if (n && *n == '.')
+                /* Dots become slashes and slashes become dots. Fun. */
+                do {
+                        if (*n == '.')
+                                *n = '/';
+                        else
+                                *n = '.';
+
+                        n = strpbrk(n + 1, "/.");
+                } while (n);
+
+        path_simplify(s, true);
+
+        /* Kill the leading slash, but keep the first character of the string in the same place. */
+        if (*s == '/' && *(s+1))
+                memmove(s, s+1, strlen(s));
 
         return s;
 }

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 88dc03ed6211663767273262ae010dcc09c6deb1..e006b4a2eaaff35b8019082d44fcdc0dff8683d4 100644 (file)
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -526,13 +526,14 @@ static int swap_points_list_off(MountPoint **head, bool *changed) {
 
         LIST_FOREACH_SAFE(mount_point, m, n, *head) {
                 log_info("Deactivating swap %s.", m->path);
-                if (swapoff(m->path) == 0) {
-                        *changed = true;
-                        mount_point_free(head, m);
-                } else {
+                if (swapoff(m->path) < 0) {
                         log_warning_errno(errno, "Could not deactivate swap %s: %m", m->path);
                         n_failed++;
+                        continue;
                 }
+
+                *changed = true;
+                mount_point_free(head, m);
         }
 
         return n_failed;
@@ -562,15 +563,15 @@ static int loopback_points_list_detach(MountPoint **head, bool *changed, int umo
 
                 log_info("Detaching loopback %s.", m->path);
                 r = delete_loopback(m->path);
-                if (r >= 0) {
-                        if (r > 0)
-                                *changed = true;
-
-                        mount_point_free(head, m);
-                } else {
-                        log_full_errno(umount_log_level, errno, "Could not detach loopback %s: %m", m->path);
+                if (r < 0) {
+                        log_full_errno(umount_log_level, r, "Could not detach loopback %s: %m", m->path);
                         n_failed++;
+                        continue;
                 }
+                if (r > 0)
+                        *changed = true;
+
+                mount_point_free(head, m);
         }
 
         return n_failed;
@@ -595,23 +596,24 @@ static int dm_points_list_detach(MountPoint **head, bool *changed, int umount_lo
                         continue;
                 }
 
-                log_info("Detaching DM %u:%u.", major(m->devnum), minor(m->devnum));
+                log_info("Detaching DM %s (%u:%u).", m->path, major(m->devnum), minor(m->devnum));
                 r = delete_dm(m->devnum);
-                if (r >= 0) {
-                        *changed = true;
-                        mount_point_free(head, m);
-                } else {
-                        log_full_errno(umount_log_level, errno, "Could not detach DM %s: %m", m->path);
+                if (r < 0) {
+                        log_full_errno(umount_log_level, r, "Could not detach DM %s: %m", m->path);
                         n_failed++;
+                        continue;
                 }
+
+                *changed = true;
+                mount_point_free(head, m);
         }
 
         return n_failed;
 }
 
 static int umount_all_once(bool *changed, int umount_log_level) {
-        int r;
         _cleanup_(mount_points_list_free) LIST_HEAD(MountPoint, mp_list_head);
+        int r;
 
         assert(changed);
 

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 56d86d8eba31e7d382f21614db4724206c14743b..80742b9e10dd83974693a3306ef3020db970568d 100644 (file)
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -11,6 +11,7 @@
 
 #include "conf-files.h"
 #include "def.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"
@@ -85,13 +86,15 @@ static int apply_all(OrderedHashmap *sysctl_options) {
                 k = sysctl_write(option->key, option->value);
                 if (k < 0) {
                         /* If the sysctl is not available in the kernel or we are running with reduced
-                         * privileges and cannot write it, then log about the issue at LOG_NOTICE level, and
-                         * proceed without failing. (EROFS is treated as a permission problem here, since
-                         * that's how container managers usually protected their sysctls.) In all other cases
-                         * log an error and make the tool fail. */
-
-                        if (IN_SET(k, -EPERM, -EACCES, -EROFS, -ENOENT) || option->ignore_failure)
-                                log_notice_errno(k, "Couldn't write '%s' to '%s', ignoring: %m", option->value, option->key);
+                         * privileges and cannot write it, then log about the issue, and proceed without
+                         * failing. (EROFS is treated as a permission problem here, since that's how
+                         * container managers usually protected their sysctls.) In all other cases log an
+                         * error and make the tool fail. */
+
+                        if (option->ignore_failure || k == -EROFS || ERRNO_IS_PRIVILEGE(k))
+                                log_debug_errno(k, "Couldn't write '%s' to '%s', ignoring: %m", option->value, option->key);
+                        else if (k == -ENOENT)
+                                log_info_errno(k, "Couldn't write '%s' to '%s', ignoring: %m", option->value, option->key);
                         else {
                                 log_error_errno(k, "Couldn't write '%s' to '%s': %m", option->value, option->key);
                                 if (r == 0)

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 6a0e59a4d76cdabd48004109c0cff087c8f497b1..3e4fc46154de339639cb46070de9534eab28da55 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5937,7 +5937,7 @@ static int cat(int argc, char *argv[], void *userdata) {
         char **name;
         sd_bus *bus;
         bool first = true;
-        int r;
+        int r, rc = 0;
 
         /* Include all units by default — i.e. continue as if the --all
          * option was used */
@@ -5982,8 +5982,12 @@ static int cat(int argc, char *argv[], void *userdata) {
                 }
                 if (r < 0)
                         return r;
-                if (r == 0)
-                        return -ENOENT;
+                if (r == 0) {
+                        /* Skip units which have no on-disk counterpart, but
+                         * propagate the error to the user */
+                        rc = -ENOENT;
+                        continue;
+                }
 
                 if (first)
                         first = false;
@@ -6009,7 +6013,7 @@ static int cat(int argc, char *argv[], void *userdata) {
                         return r;
         }
 
-        return 0;
+        return rc;
 }
 
 static int set_property(int argc, char *argv[], void *userdata) {
@@ -7956,6 +7960,9 @@ static int systemctl_help(void) {
                "     --what=RESOURCES    Which types of resources to remove\n"
                "     --now               Start or stop unit after enabling or disabling it\n"
                "     --dry-run           Only print what would be done\n"
+               "                         Currently supported by verbs: halt, poweroff, reboot,\n"
+               "                             kexec, suspend, hibernate, suspend-then-hibernate,\n"
+               "                             hybrid-sleep, default, rescue, emergency, and exit.\n"
                "  -q --quiet             Suppress output\n"
                "     --wait              For (re)start, wait until service stopped again\n"
                "                         For is-system-running, wait until startup is completed\n"

diff --git a/src/test/meson.build b/src/test/meson.build
index 7e5a61a11e24fbc8d4608ca03e23bdde8d8a641d..dd844f0291555f8b2a14fe3c77aa83e65498c26d 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -325,6 +325,10 @@ tests += [
          [],
          []],
 
+        [['src/test/test-sysctl-util.c'],
+         [],
+         []],
+
         [['src/test/test-user-util.c'],
          [],
          []],

diff --git a/src/test/test-condition.c b/src/test/test-condition.c
index fce9232dcfebc781139a658de60c050d5befeb11..28b5b780c35b75677ee038d6fc8dfd340418f6f0 100644 (file)
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -689,7 +689,7 @@ static void test_condition_test_group(void) {
         condition_free(condition);
         free(gid);
 
-        groupname = (char*)(geteuid() == 0 ? NOBODY_GROUP_NAME : "root");
+        groupname = (char*)(getegid() == 0 ? NOBODY_GROUP_NAME : "root");
         condition = condition_new(CONDITION_GROUP, groupname, false, false);
         assert_se(condition);
         r = condition_test(condition);

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 9d6aeed776fe33ed5a45f5d059880304b638c549..3b4bbeed943c274ab7e3ed1865e799a49934db43 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -755,6 +755,7 @@ static void test_exec_specifier(Manager *m) {
 static void test_exec_standardinput(Manager *m) {
         test(__func__, m, "exec-standardinput-data.service", 0, CLD_EXITED);
         test(__func__, m, "exec-standardinput-file.service", 0, CLD_EXITED);
+        test(__func__, m, "exec-standardinput-file-cat.service", 0, CLD_EXITED);
 }
 
 static void test_exec_standardoutput(Manager *m) {
@@ -785,6 +786,7 @@ static int run_tests(UnitFileScope scope, const test_entry tests[], char **patte
         assert_se(tests);
 
         r = manager_new(scope, MANAGER_TEST_RUN_BASIC, &m);
+        m->default_std_output = EXEC_OUTPUT_NULL; /* don't rely on host journald */
         if (manager_errno_skip_test(r))
                 return log_tests_skipped_errno(r, "manager_new");
         assert_se(r >= 0);

diff --git a/src/test/test-sysctl-util.c b/src/test/test-sysctl-util.c
new file mode 100644 (file)
index 0000000..2b957dd
--- /dev/null
+++ b/src/test/test-sysctl-util.c
@@ -0,0 +1,44 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include "strv.h"
+#include "sysctl-util.h"
+#include "tests.h"
+
+static const char* cases[] = {
+        "a.b.c", "a/b/c",
+        "a/b/c", "a/b/c",
+        "a/b.c/d", "a/b.c/d",
+        "a.b/c.d", "a/b.c/d",
+
+        "net.ipv4.conf.enp3s0/200.forwarding", "net/ipv4/conf/enp3s0.200/forwarding",
+        "net/ipv4/conf/enp3s0.200/forwarding", "net/ipv4/conf/enp3s0.200/forwarding",
+
+        "a...b...c", "a/b/c",
+        "a///b///c", "a/b/c",
+        ".a...b...c", "a/b/c",
+        "/a///b///c", "a/b/c",
+        NULL,
+};
+
+static void test_sysctl_normalize(void) {
+        log_info("/* %s */", __func__);
+
+        const char **s, **expected;
+        STRV_FOREACH_PAIR(s, expected, cases) {
+                _cleanup_free_ char *t;
+
+                assert_se(t = strdup(*s));
+                assert_se(sysctl_normalize(t) == t);
+
+                log_info("\"%s\" → \"%s\", expected \"%s\"", *s, t, *expected);
+                assert_se(streq(t, *expected));
+        }
+}
+
+int main(int argc, char *argv[]) {
+        test_setup_logging(LOG_INFO);
+
+        test_sysctl_normalize();
+
+        return 0;
+}

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 4ec3b503592555a3de5e25fd56be4a30e116bf16..5e2fb50d8371b5138f0a2cafc1b1f74d147c1b75 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -12,7 +12,7 @@
 #include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "bus-polkit.h"
 #include "clock-util.h"
 #include "conf-files.h"
 #include "def.h"

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index da6b4104767eca24da1ce1dcb1eed37cca215138..7b71e98f566ff2667c6a1d7e7418bb278bb54f27 100644 (file)
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -514,7 +514,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
 
         root_distance = ntp_ts_short_to_d(&ntpmsg.root_delay) / 2 + ntp_ts_short_to_d(&ntpmsg.root_dispersion);
         if (root_distance > (double) m->max_root_distance_usec / (double) USEC_PER_SEC) {
-                log_debug("Server has too large root distance. Disconnecting.");
+                log_info("Server has too large root distance. Disconnecting.");
                 return manager_connect(m);
         }
 

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 6168b332d3b23f8801dbc2db4952d72329c5716e..b9b350d1ef7a4f8064a7a7bd1e6b796d4bfaff7a 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1654,7 +1654,7 @@ static int udev_rule_apply_token_to_event(
                 if (mode == MODE_INVALID)
                         return token->op == OP_MATCH;
 
-                match = (((statbuf.st_mode ^ mode) & 07777) == 0);
+                match = (statbuf.st_mode & mode) > 0;
                 return token->op == (match ? OP_MATCH : OP_NOMATCH);
         }
         case TK_M_PROGRAM: {

diff --git a/test/TEST-15-DROPIN/test-dropin.sh b/test/TEST-15-DROPIN/test-dropin.sh
index fe424c158798d1263292087e582e63e125351760..fd500c1a0be885264e41ae6b9a5bc81a773ec866 100755 (executable)
--- a/test/TEST-15-DROPIN/test-dropin.sh
+++ b/test/TEST-15-DROPIN/test-dropin.sh
@@ -419,9 +419,23 @@ EOF
     clear_services a b
 }
 
+test_invalid_dropins () {
+    echo "Testing invalid dropins..."
+    # Assertion failed on earlier versions, command exits unsuccessfully on later versions
+    systemctl cat nonexistent@.service || true
+    create_services a
+    systemctl daemon-reload
+    # Assertion failed on earlier versions, command exits unsuccessfully on later versions
+    systemctl cat a@.service || true
+    systemctl stop a
+    clear_services a
+    return 0
+}
+
 test_basic_dropins
 test_template_dropins
 test_alias_dropins
 test_masked_dropins
+test_invalid_dropins
 
 touch /testok

diff --git a/test/TEST-21-SYSUSERS/test.sh b/test/TEST-21-SYSUSERS/test.sh
index a1a2e62ab1b0c55df2255c712cfacf09ae4a6e6f..add16ea19fe1f1ec16dc1866b40047facb48d6bb 100755 (executable)
--- a/test/TEST-21-SYSUSERS/test.sh
+++ b/test/TEST-21-SYSUSERS/test.sh
@@ -114,6 +114,7 @@ test_run() {
         prepare_testdir ${f%.input}
         cp $f $TESTDIR/usr/lib/sysusers.d/test.conf
         systemd-sysusers --root=$TESTDIR 2> /dev/null
+        journalctl --sync
         journalctl -t systemd-sysusers -o cat | tail -n1 > $TESTDIR/tmp/err
         if ! diff -u $TESTDIR/tmp/err  ${f%.*}.expected-err; then
             echo "**** Unexpected error output for $f"

diff --git a/test/TEST-25-IMPORT/testsuite.sh b/test/TEST-25-IMPORT/testsuite.sh
index 380ba3d82defb4504f469b99a9c9e9e0fe1410e5..d4efd71e0651fe09fec16d6617419d25750bd272 100755 (executable)
--- a/test/TEST-25-IMPORT/testsuite.sh
+++ b/test/TEST-25-IMPORT/testsuite.sh
@@ -119,6 +119,18 @@ machinectl remove scratch4
 ! test -f /var/lib/machines/scratch4
 ! machinectl image-status scratch4
 
+# Test import-tar hypen/stdin pipe behavior
+cat /var/tmp/scratch.tar.gz | machinectl import-tar - scratch5
+test -d /var/lib/machines/scratch5
+machinectl image-status scratch5
+diff -r /var/tmp/scratch/ /var/lib/machines/scratch5
+
+# Test export-tar hypen/stdout pipe behavior
+mkdir -p /var/tmp/extract
+machinectl export-tar scratch5 - | tar xvf - -C /var/tmp/extract/
+diff -r /var/tmp/scratch/ /var/tmp/extract/
+rm -rf /var/tmp/extract
+
 rm -rf /var/tmp/scratch
 
 echo OK > /testok

diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
index cb10ca306a478d47d5ad91093c25fde6a84f6b61..5bd80dece867deb518b0fc2820da877f8a022d4a 100644 (file)
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -202,6 +202,7 @@ Address=
 Scope=
 HomeAddress=
 PrefixRoute=
+AddPrefixRoute=
 ManageTemporaryAddress=
 Broadcast=
 Peer=

diff --git a/test/meson.build b/test/meson.build
index eeb3c5f8f0bc45028af3ddce27b1de31e723c84c..26861918b9956d178b07c380a65cbfe6fa3bfee3 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -137,6 +137,7 @@ test_data_files = '''
         test-execute/exec-specifier@.service
         test-execute/exec-standardinput-data.service
         test-execute/exec-standardinput-file.service
+        test-execute/exec-standardinput-file-cat.service
         test-execute/exec-standardoutput-file.service
         test-execute/exec-standardoutput-append.service
         test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service

diff --git a/test/test-execute/exec-capabilityboundingset-invert.service b/test/test-execute/exec-capabilityboundingset-invert.service
index 1abe3906016d210231d8f4c539e007d36ffb7de3..5f374276034d61c3505895f7f695628547d299a1 100644 (file)
--- a/test/test-execute/exec-capabilityboundingset-invert.service
+++ b/test/test-execute/exec-capabilityboundingset-invert.service
@@ -2,6 +2,7 @@
 Description=Test for CapabilityBoundingSet
 
 [Service]
-ExecStart=/bin/sh -x -c '! capsh --print | grep "^Bounding set .*cap_chown"'
+# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep "^Bounding set .*cap_chown"'
 Type=oneshot
 CapabilityBoundingSet=~CAP_CHOWN

diff --git a/test/test-execute/exec-privatedevices-no-capability-mknod.service b/test/test-execute/exec-privatedevices-no-capability-mknod.service
index 6d39469da8f26eeaab3e8ba27d4274e399d8a37e..4d61d9ffaa9b63c428bc411018e3cdd597314f9e 100644 (file)
--- a/test/test-execute/exec-privatedevices-no-capability-mknod.service
+++ b/test/test-execute/exec-privatedevices-no-capability-mknod.service
@@ -3,5 +3,6 @@ Description=Test CAP_MKNOD capability for PrivateDevices=no
 
 [Service]
 PrivateDevices=no
-ExecStart=/bin/sh -x -c 'capsh --print | grep cap_mknod'
+# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+ExecStart=/bin/sh -x -c 'capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_mknod'
 Type=oneshot

diff --git a/test/test-execute/exec-privatedevices-no-capability-sys-rawio.service b/test/test-execute/exec-privatedevices-no-capability-sys-rawio.service
index e7f529c44c607f8f31b8fac11fe5e81f67c0c768..f7f7a16736d9a17826cc2864ecf38069154abb8c 100644 (file)
--- a/test/test-execute/exec-privatedevices-no-capability-sys-rawio.service
+++ b/test/test-execute/exec-privatedevices-no-capability-sys-rawio.service
@@ -3,5 +3,6 @@ Description=Test CAP_SYS_RAWIO capability for PrivateDevices=no
 
 [Service]
 PrivateDevices=no
-ExecStart=/bin/sh -x -c 'capsh --print | grep cap_sys_rawio'
+# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+ExecStart=/bin/sh -x -c 'capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_sys_rawio'
 Type=oneshot

diff --git a/test/test-execute/exec-privatedevices-yes-capability-mknod.service b/test/test-execute/exec-privatedevices-yes-capability-mknod.service
index fb1fc2875a329fda02391b5dbc9bd22292deaea7..5bcace08455bad9ae522aed2e9541c71e9d797a7 100644 (file)
--- a/test/test-execute/exec-privatedevices-yes-capability-mknod.service
+++ b/test/test-execute/exec-privatedevices-yes-capability-mknod.service
@@ -3,5 +3,6 @@ Description=Test CAP_MKNOD capability for PrivateDevices=yes
 
 [Service]
 PrivateDevices=yes
-ExecStart=/bin/sh -x -c '! capsh --print | grep cap_mknod'
+# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_mknod'
 Type=oneshot

diff --git a/test/test-execute/exec-privatedevices-yes-capability-sys-rawio.service b/test/test-execute/exec-privatedevices-yes-capability-sys-rawio.service
index cebc493a7abfd4449eb5ba3932f1214fb6469803..a246f950c1167cee9c8da1dfa9d46baeb26708ff 100644 (file)
--- a/test/test-execute/exec-privatedevices-yes-capability-sys-rawio.service
+++ b/test/test-execute/exec-privatedevices-yes-capability-sys-rawio.service
@@ -3,5 +3,6 @@ Description=Test CAP_SYS_RAWIO capability for PrivateDevices=yes
 
 [Service]
 PrivateDevices=yes
-ExecStart=/bin/sh -x -c '! capsh --print | grep cap_sys_rawio'
+# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_sys_rawio'
 Type=oneshot

diff --git a/test/test-execute/exec-protectkernellogs-no-capabilities.service b/test/test-execute/exec-protectkernellogs-no-capabilities.service
index f0c7d4d6858fb441783fd15507a56d0faf2d5afe..47d88534a9b807738eae30f55e479de066eca562 100644 (file)
--- a/test/test-execute/exec-protectkernellogs-no-capabilities.service
+++ b/test/test-execute/exec-protectkernellogs-no-capabilities.service
@@ -3,5 +3,6 @@ Description=Test CAP_SYSLOG for ProtectKernelLogs=no
 
 [Service]
 ProtectKernelLogs=no
-ExecStart=/bin/sh -x -c 'capsh --print | grep cap_syslog'
+# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+ExecStart=/bin/sh -x -c 'capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_syslog'
 Type=oneshot

diff --git a/test/test-execute/exec-protectkernellogs-yes-capabilities.service b/test/test-execute/exec-protectkernellogs-yes-capabilities.service
index 803ba7d5521b6ec9c0e0e36588ff866245dc33ec..11350f288a57a23b1f2cf3a7952ba1d7fe37579c 100644 (file)
--- a/test/test-execute/exec-protectkernellogs-yes-capabilities.service
+++ b/test/test-execute/exec-protectkernellogs-yes-capabilities.service
@@ -3,5 +3,6 @@ Description=Test CAP_SYSLOG for ProtectKernelLogs=yes
 
 [Service]
 ProtectKernelLogs=yes
-ExecStart=/bin/sh -x -c '! capsh --print | grep cap_syslog'
+# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_syslog'
 Type=oneshot

diff --git a/test/test-execute/exec-protectkernelmodules-no-capabilities.service b/test/test-execute/exec-protectkernelmodules-no-capabilities.service
index b2f2cd6b8ab0fcf23ec0ba87972104c7759c950d..8d7e2b52d4446e1e4f7dae125005826ddb7eed28 100644 (file)
--- a/test/test-execute/exec-protectkernelmodules-no-capabilities.service
+++ b/test/test-execute/exec-protectkernelmodules-no-capabilities.service
@@ -3,5 +3,6 @@ Description=Test CAP_SYS_MODULE ProtectKernelModules=no
 
 [Service]
 ProtectKernelModules=no
-ExecStart=/bin/sh -x -c 'capsh --print | grep cap_sys_module'
+# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+ExecStart=/bin/sh -x -c 'capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_sys_module'
 Type=oneshot

diff --git a/test/test-execute/exec-protectkernelmodules-yes-capabilities.service b/test/test-execute/exec-protectkernelmodules-yes-capabilities.service
index 84bf39be56928b0fba273962a5a03518018c1366..fe2ae208dd20191b6bfb81cc73006b11762c2927 100644 (file)
--- a/test/test-execute/exec-protectkernelmodules-yes-capabilities.service
+++ b/test/test-execute/exec-protectkernelmodules-yes-capabilities.service
@@ -3,5 +3,6 @@ Description=Test CAP_SYS_MODULE for ProtectKernelModules=yes
 
 [Service]
 ProtectKernelModules=yes
-ExecStart=/bin/sh -x -c '! capsh --print | grep cap_sys_module'
+# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_sys_module'
 Type=oneshot

diff --git a/test/test-execute/exec-standardinput-file-cat.service b/test/test-execute/exec-standardinput-file-cat.service
new file mode 100644 (file)
index 0000000..a0c786c
--- /dev/null
+++ b/test/test-execute/exec-standardinput-file-cat.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Test for StandardInput=file:
+
+[Service]
+ExecStart=cat
+Type=oneshot
+StandardInput=file:/etc/os-release
+# We leave StandardOutput= unset here, to verify https://github.com/systemd/systemd/issues/14560 works
+# The "cat" tool is going to write to stdout, which fails if we dup() stdin to stdout

diff --git a/units/initrd-udevadm-cleanup-db.service.in b/units/initrd-udevadm-cleanup-db.service.in
index 5059605c27b622c52bde7a06d44272db6208ad7e..09af690986c9b5b929b1ee26624d67dcb926eba7 100644 (file)
--- a/units/initrd-udevadm-cleanup-db.service.in
+++ b/units/initrd-udevadm-cleanup-db.service.in
@@ -11,8 +11,8 @@
 Description=Cleanup udevd DB
 DefaultDependencies=no
 ConditionPathExists=/etc/initrd-release
-Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket
-After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket
+Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service
+After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service
 Before=initrd-switch-root.target
 
 [Service]

diff --git a/units/meson.build b/units/meson.build
index 6a3a0d0dea22722ba44f5600d351253ff69a76c9..476991edbae4a69351f2ca34999779e845c05c7f 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -309,6 +309,9 @@ install_data('user-.slice.d/10-defaults.conf',
 meson.add_install_script(meson_make_symlink,
                          join_paths(pkgsysconfdir, 'user'),
                          join_paths(sysconfdir, 'xdg/systemd/user'))
+meson.add_install_script(meson_make_symlink,
+                         join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'),
+                         join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service'))
 if conf.get('HAVE_SYSV_COMPAT') == 1
         foreach i : [1, 2, 3, 4, 5]
                 meson.add_install_script(