[illumos-gate merge]

commit d1b7cae3ba116011f75268b837e07eac4891bc1d
    10137 smatch fixes for setuname
commit 9a25c41f5f79fbad25d7746f5a4e65423c7eddff
    10139 smatch fixes for usr/src/cmd/stat
commit bf9b145b69c7f9e2ab076ee1ab9461cb6d527e64
    10275 Kernel attempts to apply old erratum to AMD Threadripper 1950X
commit 589d67980300f18e46919b854a2fdf644ee5fa09
    10320 qede_gld.c uses assignment, means equality
commit 84d9cd0f02f7b6d7963dcb4a84148c3b2aaba7c5
    10317 iconv_modules is building with -I/usr/include

11 files changed, 63 insertions, 60 deletions

diff --git a/usr/src/cmd/setuname/setuname.c b/usr/src/cmd/setuname/setuname.c
index e8120018be..69434e6d2d 100644
--- a/usr/src/cmd/setuname/setuname.c
+++ b/usr/src/cmd/setuname/setuname.c
@@ -27,7 +27,9 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"       /* SVr4.0 1.3 */
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 /*
  *  setuname [-t] [-s name] [-n node] 
@@ -452,7 +454,7 @@ setuname(temp, sysname, nodename)
 			(void) strncpy(utsname.nodename, nodename,
 			    sizeof (utsname.nodename));
 		(void) kvm_kwrite(kd, utsname_addr, &utsname, sizeof (utsname));
-		kvm_close(kd);
+		(void) kvm_close(kd);
 	} else
 		return (-1);
 #else /* sun */
@@ -504,9 +506,9 @@ setuname(temp, sysname, nodename)
 				(void) fprintf(fd, "# This script, generated by the setuname command,\n");
 				(void) fprintf(fd, "# sets the system's system-name\n");
 				(void) fprintf(fd, "#\n");
-			if (sysnm && *sysnm) 
-				(void) fprintf(fd, "setuname -t -s %s\n", sysnm);
-			(void) fclose(fd);
+				if (sysnm && *sysnm)
+					(void) fprintf(fd, "setuname -t -s %s\n", sysnm);
+				(void) fclose(fd);
 			} else return(rtncd = -1);
 		}
 
diff --git a/usr/src/cmd/stat/common/acquire_iodevs.c b/usr/src/cmd/stat/common/acquire_iodevs.c
index 762243e3b3..4fd1115142 100644
--- a/usr/src/cmd/stat/common/acquire_iodevs.c
+++ b/usr/src/cmd/stat/common/acquire_iodevs.c
@@ -458,7 +458,7 @@ choose_iodevs(struct snapshot *ss, struct iodev_snapshot *iodevs,
 			tmp = pos;
 			pos = pos->is_next;
 
-			if (df && df->if_skip_floppy &&
+			if (df->if_skip_floppy &&
 			    strncmp(tmp->is_name, "fd", 2) == 0)
 				continue;
 
diff --git a/usr/src/cmd/stat/vmstat/vmstat.c b/usr/src/cmd/stat/vmstat/vmstat.c
index f089d554f6..e932cad52b 100644
--- a/usr/src/cmd/stat/vmstat/vmstat.c
+++ b/usr/src/cmd/stat/vmstat/vmstat.c
@@ -11,6 +11,10 @@
 /* from UCB 5.4 5/17/86 */
 /* from SunOS 4.1, SID 1.31 */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -225,9 +229,6 @@ show_disk(void *v1, void *v2, void *d)
 	double hr_etime;
 	double reads, writes;
 
-	if (new == NULL)
-		return;
-
 	if (old)
 		oldtime = old->is_stats.wlastupdate;
 	hr_etime = new->is_stats.wlastupdate - oldtime;
diff --git a/usr/src/lib/iconv_modules/Makefile.iconv b/usr/src/lib/iconv_modules/Makefile.iconv
index ea347e79ae..9359286219 100644
--- a/usr/src/lib/iconv_modules/Makefile.iconv
+++ b/usr/src/lib/iconv_modules/Makefile.iconv
@@ -43,8 +43,8 @@ CLEANFILES	= *.o *.so.* *.so $(CREATE_LINKS)
 
 PROTOCLEANFILES = $(ICONV_LIBS) $(ICONV_LIBS_64)
 
-CFLAGS		+= -I../../inc -I. -I../../common $(C_PICFLAGS) $(GSHARED)
-CFLAGS		+= -I$(ADJUNCT_PROTO)/usr/include
+CPPFLAGS	+= -I../../inc -I. -I../../common
+CFLAGS		+= $(C_PICFLAGS) $(GSHARED)
 
 DYNFLAGS=	$(GSHARED) $(ZTEXT) $(ZDEFS) $(BDIRECT) \
 		$(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
@@ -80,15 +80,15 @@ $(ICONV_DIR)/%: ../%
 	$(POST_PROCESS_SO)
 
 %.o: ../%.c
-	$(CC) $(CFLAGS) -c -o $@ $(@:%.o=../%.c)
+	$(COMPILE.c) $(CFLAGS) -o $@ $<
 	$(POST_PROCESS_O)
 
 %.o: ../common/%.c
-	$(CC) $(CFLAGS) -c -o $@ $(@:%.o=../common/%.c)
+	$(COMPILE.c) $(CFLAGS) -o $@ $<
 	$(POST_PROCESS_O)
 
 %.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $(@:%.o=%.c)
+	$(COMPILE.c) $(CFLAGS) -o $@ $<
 	$(POST_PROCESS_O)
 
 lint: FRC
diff --git a/usr/src/lib/iconv_modules/Makefile.iconv.64 b/usr/src/lib/iconv_modules/Makefile.iconv.64
index 0669f8dc81..e287bbcefb 100644
--- a/usr/src/lib/iconv_modules/Makefile.iconv.64
+++ b/usr/src/lib/iconv_modules/Makefile.iconv.64
@@ -15,7 +15,7 @@
 
 include $(SRC)/Makefile.master.64
 
-CFLAGS	+= -I../../inc -I. -I../../common $(C_PICFLAGS) $(GSHARED)
-CFLAGS	+= -I$(ADJUNCT_PROTO)/usr/include
+CPPFLAGS	+= -I../../inc -I. -I../../common
+CFLAGS		+= $(C_PICFLAGS) $(GSHARED)
 
 ICONV_LIBS      = $(PROGS:%=$(ICONV_DIR_64)/%)
diff --git a/usr/src/lib/iconv_modules/hi_IN/Makefile.com b/usr/src/lib/iconv_modules/hi_IN/Makefile.com
index 2a1d4996f4..03bd1b625b 100644
--- a/usr/src/lib/iconv_modules/hi_IN/Makefile.com
+++ b/usr/src/lib/iconv_modules/hi_IN/Makefile.com
@@ -35,7 +35,7 @@ dummy: all
 
 include $(SRC)/lib/iconv_modules/Makefile.iconv
 
-CFLAGS += -I../include
+CPPFLAGS += -I../include
 
 # needs work
 SMOFF += index_overflow
diff --git a/usr/src/lib/iconv_modules/ko/Makefile.com b/usr/src/lib/iconv_modules/ko/Makefile.com
index 25ae7bb98e..2aea057571 100644
--- a/usr/src/lib/iconv_modules/ko/Makefile.com
+++ b/usr/src/lib/iconv_modules/ko/Makefile.com
@@ -92,7 +92,7 @@ ALL_SOS   = $(E2I) $(I2E) $(E2J92) $(J922E) $(E2J) $(J2E) $(E2NB) $(NB2E) \
 	$(C9332U) $(U2C933)
 
 LDFLAGS = $(DYNFLAGS) $(LDLIBS) $(CFLAG_OPT)
-CFLAGS += -I$(ICONV_COMMON) -I../inc
+CPPFLAGS += -I$(ICONV_COMMON) -I../inc
 
 # needs work
 SMATCH=off
@@ -207,51 +207,51 @@ $(C9332U): Cp933_to_UTF8.o ibm%utf8.o tab_lookup.o $(ICONV_COMMON)tab_lookup.h
 # objs
 #
 common_utf8.o: $(ICONV_COMMON)common_utf8.c $(COMMON)common_def.h
-	$(CC) -c $(CFLAGS) $(ICONV_COMMON)common_utf8.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) $(ICONV_COMMON)common_utf8.c -o $@
 	$(POST_PROCESS_O)
 
 ucs_LE_to_unihan.o : $(COMMON)ucs_to_unihan.c
-	$(CC) -c $(CFLAGS) -DUCS_2LE $(COMMON)ucs_to_unihan.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) -DUCS_2LE $(COMMON)ucs_to_unihan.c -o $@
 	$(POST_PROCESS_O)
 
 ucs_BE_to_unihan.o : $(COMMON)ucs_to_unihan.c
-	$(CC) -c $(CFLAGS) -DUCS_2BE $(COMMON)ucs_to_unihan.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) -DUCS_2BE $(COMMON)ucs_to_unihan.c -o $@
 	$(POST_PROCESS_O)
 
 unihan_to_UCS-2BE_main.o : $(COMMON)unihan_to_UCS_main.c
-	$(CC) -c $(CFLAGS) -DUCS_2BE $(COMMON)unihan_to_UCS_main.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) -DUCS_2BE $(COMMON)unihan_to_UCS_main.c -o $@
 	$(POST_PROCESS_O)
 
 unihan_to_UCS-2LE_main.o : $(COMMON)unihan_to_UCS_main.c
-	$(CC) -c $(CFLAGS) -DUCS_2LE $(COMMON)unihan_to_UCS_main.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) -DUCS_2LE $(COMMON)unihan_to_UCS_main.c -o $@
 	$(POST_PROCESS_O)
 
 ibm%utf8.o : $(ICONV_COMMON)ibm%utf8.c  $(COMMON)common_def.h
-	$(CC) -c $(CFLAGS) $(ICONV_COMMON)ibm%utf8.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) $(ICONV_COMMON)ibm%utf8.c -o $@
 	$(POST_PROCESS_O)
 
 utf8%ibm.o: $(ICONV_COMMON)utf8%ibm.c $(COMMON)common_def.h
-	$(CC) -c $(CFLAGS) $(ICONV_COMMON)utf8%ibm.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) $(ICONV_COMMON)utf8%ibm.c -o $@
 	$(POST_PROCESS_O)
 
 cnv_utf8ibm.o: $(ICONV_COMMON)cnv_utf8ibm.c $(ICONV_COMMON)tab_lookup.h
-	$(CC) -c $(CFLAGS) $(ICONV_COMMON)cnv_utf8ibm.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) $(ICONV_COMMON)cnv_utf8ibm.c -o $@
 	$(POST_PROCESS_O)
 
 cnv_ibmutf8.o: $(ICONV_COMMON)cnv_ibmutf8.c $(ICONV_COMMON)tab_lookup.h
-	$(CC) -c $(CFLAGS) $(ICONV_COMMON)cnv_ibmutf8.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) $(ICONV_COMMON)cnv_ibmutf8.c -o $@
 	$(POST_PROCESS_O)
 
 tab_lookup.o: $(ICONV_COMMON)tab_lookup.c $(ICONV_COMMON)tab_lookup.h
-	$(CC) -c $(CFLAGS) $(ICONV_COMMON)tab_lookup.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) $(ICONV_COMMON)tab_lookup.c -o $@
 	$(POST_PROCESS_O)
 
 Cp933_to_UTF8.o: $(COMMON)Cp933_to_UTF8.c $(ICONV_COMMON)tab_lookup.h  $(COMMON)cp933_ucs2.h
-	$(CC) -c $(CFLAGS) $(COMMON)Cp933_to_UTF8.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) $(COMMON)Cp933_to_UTF8.c -o $@
 	$(POST_PROCESS_O)
 
 UTF8_to_Cp933.o: $(COMMON)UTF8_to_Cp933.c $(ICONV_COMMON)tab_lookup.h $(COMMON)ucs2_cp933.h
-	$(CC) -c $(CFLAGS) $(COMMON)UTF8_to_Cp933.c -o $@
+	$(CC) $(CPPFLAGS) -c $(CFLAGS) $(COMMON)UTF8_to_Cp933.c -o $@
 	$(POST_PROCESS_O)
 
 #
diff --git a/usr/src/lib/iconv_modules/vi/Makefile.com b/usr/src/lib/iconv_modules/vi/Makefile.com
index c3d8d12904..a021b4fcf5 100644
--- a/usr/src/lib/iconv_modules/vi/Makefile.com
+++ b/usr/src/lib/iconv_modules/vi/Makefile.com
@@ -45,28 +45,28 @@ SMOFF += all_func_returns,deref_check
 dummy: all
 
 tcvn%UCS-2LE.o: $(COMMON)tcvn%UCS-2.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 
 tcvn%UCS-2BE.o: $(COMMON)tcvn%UCS-2.c
-	$(CC) $(CFLAGS) -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
 
 viscii%UCS-2LE.o: $(COMMON)viscii%UCS-2.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 
 viscii%UCS-2BE.o: $(COMMON)viscii%UCS-2.c
-	$(CC) $(CFLAGS) -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
 
 UCS-2LE%tcvn.o: $(COMMON)UCS-2%tcvn.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 
 UCS-2BE%tcvn.o: $(COMMON)UCS-2%tcvn.c
-	$(CC) $(CFLAGS) -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
 
 UCS-2LE%viscii.o: $(COMMON)UCS-2%viscii.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 
 UCS-2BE%viscii.o: $(COMMON)UCS-2%viscii.c
-	$(CC) $(CFLAGS) -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
 
 include $(SRC)/lib/iconv_modules/Makefile.iconv
 
diff --git a/usr/src/lib/iconv_modules/zh/Makefile.com b/usr/src/lib/iconv_modules/zh/Makefile.com
index 741b71d069..752fc70325 100644
--- a/usr/src/lib/iconv_modules/zh/Makefile.com
+++ b/usr/src/lib/iconv_modules/zh/Makefile.com
@@ -87,71 +87,71 @@ SRCS		=	UTF-8%zh_CN.iso2022-7.c \
 dummy: all
 
 gb2312%UCS-2LE.o: $(COMMON)zh_CN.euc%UTF-8.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 GBK%UCS-2LE.o: $(COMMON)zh_CN.gbk%UTF-8.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 GBK%UCS-2BE.o: $(COMMON)zh_CN.gbk%UTF-8.c
-	$(CC) $(CFLAGS) -DUCS_2BE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2BE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 GBK%UCS-4LE.o: $(COMMON)zh_CN.gbk%UTF-8.c
-	$(CC) $(CFLAGS) -DUCS_4LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_4LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 GBK%UCS-4BE.o: $(COMMON)zh_CN.gbk%UTF-8.c
-	$(CC) $(CFLAGS) -DUCS_4BE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_4BE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 UCS-2LE%gb2312.o: $(COMMON)UTF-8%zh_CN.euc.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 UCS-2LE%GBK.o: $(COMMON)UTF-8%zh_CN.gbk.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 UCS-2BE%GBK.o: $(COMMON)UTF-8%zh_CN.gbk.c
-	$(CC) $(CFLAGS) -DUCS_2BE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2BE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 UCS-4LE%GBK.o: $(COMMON)UTF-8%zh_CN.gbk.c
-	$(CC) $(CFLAGS) -DUCS_4LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_4LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 UCS-4BE%GBK.o: $(COMMON)UTF-8%zh_CN.gbk.c
-	$(CC) $(CFLAGS) -DUCS_4BE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_4BE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 cns11643%UCS-2LE.o: $(COMMON)zh_TW-euc%UTF-8.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 BIG5%UCS-2LE.o: $(COMMON)zh_TW-big5%UTF-8.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 Big5-HKSCS%UCS-2LE.o: $(COMMON)zh_HK.hkscs%UTF-8.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 UCS-2LE%cns11643.o: $(COMMON)UTF-8%zh_TW-euc.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 UCS-2LE%BIG5.o: $(COMMON)UTF-8%zh_TW-big5.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 UCS-2LE%Big5-HKSCS.o: $(COMMON)UTF-8%zh_HK.hkscs.c
-	$(CC) $(CFLAGS) -DUCS_2LE -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DUCS_2LE -c -o $@ $^
 	$(POST_PROCESS_O)
 
 common_utf8.o: $(ICONV_COMMON)/common_utf8.c
-	$(CC) $(CFLAGS) -c -o $@ $(ICONV_COMMON)/common_utf8.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(ICONV_COMMON)/common_utf8.c
 	$(POST_PROCESS_O)
 
 UCS-2LE%cns11643.so: UCS-2LE%cns11643.o common_utf8.o
@@ -179,7 +179,7 @@ UTF-8%zh_HK.hkscs.so: UTF-8%zh_HK.hkscs.o common_utf8.o
 	$(POST_PROCESS_SO)
 
 zh_TW-iso2022-CN-EXT.o: $(COMMON)/zh_TW-iso2022-CN-EXT.c
-	$(CC) $(CFLAGS) -c -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
 	$(POST_PROCESS_O)
 
 zh_TW-iso2022-CN-EXT%zh_TW-big5.so: zh_TW-iso2022-CN-EXT%zh_TW-big5.o zh_TW-iso2022-CN-EXT.o
@@ -191,11 +191,11 @@ zh_TW-iso2022-CN-EXT%zh_TW-euc.so: zh_TW-iso2022-CN-EXT%zh_TW-euc.o zh_TW-iso202
 	$(POST_PROCESS_SO)
 
 utf8%ibm.o: $(ICONV_COMMON)/utf8%ibm.c
-	$(CC) $(CFLAGS) -c -o $@ $(ICONV_COMMON)/utf8%ibm.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(ICONV_COMMON)/utf8%ibm.c
 	$(POST_PROCESS_O)
 
 tab_lookup.o: $(ICONV_COMMON)/tab_lookup.c
-	$(CC) $(CFLAGS) -c -o $@ $(ICONV_COMMON)/tab_lookup.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(ICONV_COMMON)/tab_lookup.c
 	$(POST_PROCESS_O)
 
 zh_TW-cp937%UTF-8.so: zh_TW-cp937%UTF-8.o utf8%ibm.o tab_lookup.o
diff --git a/usr/src/uts/common/io/qede/qede_gld.c b/usr/src/uts/common/io/qede/qede_gld.c
index a75bd0debd..4bca690225 100644
--- a/usr/src/uts/common/io/qede/qede_gld.c
+++ b/usr/src/uts/common/io/qede/qede_gld.c
@@ -1165,7 +1165,7 @@ qede_multicast(qede_t *qede, boolean_t flag, const uint8_t *ptr_mcaddr)
                 qede->params.multi_promisc_fl = B_FALSE;
         } else {
                 if ((qede->params.multi_promisc_fl == B_FALSE) && 
-		    (qede->params.promisc_fl = B_FALSE)) {
+		    (qede->params.promisc_fl == B_FALSE)) {
                         ret = qede_set_filter_rx_mode(qede, 
 			    QEDE_FILTER_RX_MODE_MULTI_PROMISC);
                 }
diff --git a/usr/src/uts/common/io/qede/qede_version.h b/usr/src/uts/common/io/qede/qede_version.h
index 54678600c9..8af00d182e 100644
--- a/usr/src/uts/common/io/qede/qede_version.h
+++ b/usr/src/uts/common/io/qede/qede_version.h
@@ -39,6 +39,6 @@
 
 #define MAJVERSION 8 
 #define MINVERSION 1
-#define REVVERSION 23
+#define REVVERSION 24
 
 #endif  /* !_QEDE_VERSION_H */