[#4348] Imported other core updates

diff --git a/src/lib/dhcp/docsis3_option_defs.h b/src/lib/dhcp/docsis3_option_defs.h
index 3b02fec52f84976a98ff6834ef41c6b6038b00b9..ad82945477d3a0ed6c813acec7092abe1ca73c35 100644 (file)
--- a/src/lib/dhcp/docsis3_option_defs.h
+++ b/src/lib/dhcp/docsis3_option_defs.h
@@ -17,7 +17,7 @@
 namespace isc {
 namespace dhcp {
 
-#define VENDOR_ID_CABLE_LABS 4491
+#define VENDOR_ID_CABLE_LABS 4491U
 
 #define DOCSIS3_V4_ORO 1
 #define DOCSIS3_V4_TFTP_SERVERS 2