3 files changed, 9 insertions, 7 deletions
diff --git a/usr/src/cmd/dladm/dladm.c b/usr/src/cmd/dladm/dladm.c
index 7bba0420bd..0bd80316c5 100644
--- a/usr/src/cmd/dladm/dladm.c
+++ b/usr/src/cmd/dladm/dladm.c
@@ -3860,7 +3860,7 @@ do_create_vnic(int argc, char *argv[], const char *use)
 	uchar_t			*mac_addr;
 	int			mac_slot = -1, maclen = 0, mac_prefix_len = 0;
 	dladm_arg_list_t	*proplist = NULL;
-	uint16_t		vid = 0;
+	int			vid = 0;
 
 	opterr = 0;
 	while ((option = getopt_long(argc, argv, ":tfR:l:m:n:p:r:v:H",
@@ -3920,10 +3920,12 @@ do_create_vnic(int argc, char *argv[], const char *use)
 			}
 			break;
 		case 'v':
-			vid = (int)strtol(optarg, &endp, 10);
-			if (errno != 0 || *endp != '\0' || vid == 0)
-				/* VID of 0 is invalid */
-				die("invalid VLAN id");
+			if (vid != 0)
+				die_optdup(option);
+
+			if (!str2int(optarg, &vid) || vid < 1 || vid > 4094)
+				die("invalid VLAN identifier '%s'", optarg);
+
 			break;
 		case 'f':
 			flags |= DLADM_OPT_FORCE;
diff --git a/usr/src/lib/libdladm/common/libdlstat.c b/usr/src/lib/libdladm/common/libdlstat.c
index 1245a89d43..222d6e905b 100644
--- a/usr/src/lib/libdladm/common/libdlstat.c
+++ b/usr/src/lib/libdladm/common/libdlstat.c
@@ -49,7 +49,7 @@
 struct flowlist {
 	char		flowname[MAXFLOWNAMELEN];
 	datalink_id_t	linkid;
-	uint_t		ifspeed;
+	uint64_t	ifspeed;
 	boolean_t	first;
 	boolean_t	display;
 	pktsum_t 	prevstats;
diff --git a/usr/src/lib/libdladm/common/linkprop.c b/usr/src/lib/libdladm/common/linkprop.c
index 7affe07dd2..7dc51ca3d3 100644
--- a/usr/src/lib/libdladm/common/linkprop.c
+++ b/usr/src/lib/libdladm/common/linkprop.c
@@ -1668,7 +1668,7 @@ i_dladm_add_ap_module(const char *module, struct dlautopush *dlap)
 		dlap->dap_anchor = dlap->dap_npush;
 		return (DLADM_STATUS_OK);
 	}
-	if (dlap->dap_npush > MAXAPUSH)
+	if (dlap->dap_npush >= MAXAPUSH)
 		return (DLADM_STATUS_BADVALCNT);
 
 	(void) strlcpy(dlap->dap_aplist[dlap->dap_npush++], module,