[illumos-gate merge]

commit 84fe1120bdf58601e40698ac798bbbcabfc8cfb8
    8900 deadlock between netstack teardown and kstat read
commit 6e0609600611b03dde9cde82799da6d7b40d14be
    8850 libresolv2: variable 'tvp' set but not used
commit bd64ab839d994fbc07f126ff254a4bf3c12524b7
    8838 libxcurses: variable 'code' set but not used
commit fe054a6ca181843f102908c7e101f69bb5ea5b59
    8814 nxge: variable 'ether_class' set but not used

	Conflicts:
	usr/src/uts/common/os/netstack.c

4 files changed, 38 insertions, 54 deletions

diff --git a/usr/src/lib/libresolv2/common/isc/eventlib.c b/usr/src/lib/libresolv2/common/isc/eventlib.c
index ef9832c3b7..e4678e8099 100644
--- a/usr/src/lib/libresolv2/common/isc/eventlib.c
+++ b/usr/src/lib/libresolv2/common/isc/eventlib.c
@@ -733,7 +733,7 @@ pselect(int nfds, void *rfds, void *wfds, void *efds,
 	struct timespec *tsp,
 	const sigset_t *sigmask)
 {
-	struct timeval tv, *tvp;
+	struct timeval tv;
 	sigset_t sigs;
 	int n;
 #ifdef USE_POLL
@@ -743,16 +743,18 @@ pselect(int nfds, void *rfds, void *wfds, void *efds,
 	nfds_t		pnfds;
 
 	UNUSED(nfds);
+#else
+	struct timeval *tvp = NULL;
 #endif /* USE_POLL */
 
 	if (tsp) {
-		tvp = &tv;
 		tv = evTimeVal(*tsp);
 #ifdef USE_POLL
 		polltimeout = 1000 * tv.tv_sec + tv.tv_usec / 1000;
+#else
+		tvp = &tv;
 #endif /* USE_POLL */
-	} else
-		tvp = NULL;
+	}
 	if (sigmask)
 		sigprocmask(SIG_SETMASK, sigmask, &sigs);
 #ifndef USE_POLL
diff --git a/usr/src/lib/libxcurses/src/libc/xcurses/overlay.c b/usr/src/lib/libxcurses/src/libc/xcurses/overlay.c
index d0414afb4b..c8a7abef01 100644
--- a/usr/src/lib/libxcurses/src/libc/xcurses/overlay.c
+++ b/usr/src/lib/libxcurses/src/libc/xcurses/overlay.c
@@ -24,53 +24,39 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * overlay.c
- * 
+ *
  * XCurses Library
  *
  * Copyright 1990, 1995 by Mortice Kern Systems Inc.  All rights reserved.
  *
  */
 
-#if M_RCSID
-#ifndef lint
-static char rcsID[] = "$Header: /rd/src/libc/xcurses/rcs/overlay.c 1.3 1995/09/19 19:15:49 ant Exp $";
-#endif
-#endif
-
 #include <private.h>
 
 int
-(overlay)(s, t)
-const WINDOW *s;
-WINDOW *t;
+(overlay)(const WINDOW *s, WINDOW *t)
 {
-	int code;
 
 #ifdef M_CURSES_TRACE
 	__m_trace("overlay(%p, %p)", s, t);
 #endif
 
-	code = __m_copywin(s, t, 1);
+	(void) __m_copywin(s, t, 1);
 
-	return __m_return_code("overlay", ERR);
+	return (__m_return_code("overlay", ERR));
 }
 
 int
-(overwrite)(s, t)
-const WINDOW *s;
-WINDOW *t;
+(overwrite)(const WINDOW *s, WINDOW *t)
 {
-	int code;
 
 #ifdef M_CURSES_TRACE
 	__m_trace("overwrite(%p, %p)", s, t);
 #endif
 
-	code = __m_copywin(s, t, 0);
+	(void) __m_copywin(s, t, 0);
 
-	return __m_return_code("overwrite", ERR);
+	return (__m_return_code("overwrite", ERR));
 }
diff --git a/usr/src/uts/common/io/nxge/nxge_ndd.c b/usr/src/uts/common/io/nxge/nxge_ndd.c
index 307f553391..71d68b56c2 100644
--- a/usr/src/uts/common/io/nxge/nxge_ndd.c
+++ b/usr/src/uts/common/io/nxge/nxge_ndd.c
@@ -1102,7 +1102,7 @@ nxge_param_get_rxdma_info(p_nxge_t nxgep, queue_t *q, p_mblk_t mp, caddr_t cp)
 /* ARGSUSED */
 int
 nxge_param_get_rxdma_rdcgrp_info(p_nxge_t nxgep, queue_t *q,
-	p_mblk_t mp, caddr_t cp)
+    p_mblk_t mp, caddr_t cp)
 {
 	uint_t			print_len, buf_len;
 	p_mblk_t		np;
@@ -1214,7 +1214,7 @@ nxge_mk_mblk_tail_space(p_mblk_t mp, p_mblk_t *nmp, size_t size)
 /* ARGSUSED */
 int
 nxge_param_set_generic(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
-			    char *value, caddr_t cp)
+    char *value, caddr_t cp)
 {
 	char *end;
 	uint32_t new_value;
@@ -1235,7 +1235,7 @@ nxge_param_set_generic(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
 /* ARGSUSED */
 int
 nxge_param_set_instance(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
-	char *value, caddr_t cp)
+    char *value, caddr_t cp)
 {
 	NXGE_DEBUG_MSG((nxgep, NDD_CTL, " ==> nxge_param_set_instance"));
 	NXGE_DEBUG_MSG((nxgep, NDD_CTL, " <== nxge_param_set_instance"));
@@ -1246,7 +1246,7 @@ nxge_param_set_instance(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
 /* ARGSUSED */
 int
 nxge_param_set_mac(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
-	char *value, caddr_t cp)
+    char *value, caddr_t cp)
 {
 	char		*end;
 	uint32_t	new_value;
@@ -1277,7 +1277,7 @@ nxge_param_set_mac(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
 /* ARGSUSED */
 int
 nxge_param_rx_intr_pkts(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
-	char *value, caddr_t cp)
+    char *value, caddr_t cp)
 {
 	char		*end;
 	uint32_t	cfg_value;
@@ -1305,7 +1305,7 @@ nxge_param_rx_intr_pkts(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
 /* ARGSUSED */
 int
 nxge_param_rx_intr_time(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
-	char *value, caddr_t cp)
+    char *value, caddr_t cp)
 {
 	char		*end;
 	uint32_t	cfg_value;
@@ -1333,7 +1333,7 @@ nxge_param_rx_intr_time(p_nxge_t nxgep, queue_t *q, mblk_t *mp,
 /* ARGSUSED */
 static int
 nxge_param_set_mac_rdcgrp(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char			 *end;
 	uint32_t		status = 0, cfg_value;
@@ -1405,7 +1405,7 @@ nxge_param_set_mac_rdcgrp(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_set_vlan_rdcgrp(p_nxge_t nxgep, queue_t *q,
-	mblk_t	*mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char			*end;
 	uint32_t		status = 0, cfg_value;
@@ -1525,7 +1525,7 @@ nxge_param_set_vlan_rdcgrp(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_get_vlan_rdcgrp(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, caddr_t cp)
+    mblk_t *mp, caddr_t cp)
 {
 
 	uint_t 			print_len, buf_len;
@@ -1597,7 +1597,7 @@ nxge_param_get_vlan_rdcgrp(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_get_mac_rdcgrp(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, caddr_t cp)
+    mblk_t *mp, caddr_t cp)
 {
 	uint_t			print_len, buf_len;
 	p_mblk_t		np;
@@ -1653,7 +1653,7 @@ nxge_param_get_mac_rdcgrp(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_tcam_enable(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	uint32_t	status = 0, cfg_value;
 	p_nxge_param_t	pa = (p_nxge_param_t)cp;
@@ -1685,7 +1685,7 @@ nxge_param_tcam_enable(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_hash_lookup_enable(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	uint32_t	status = 0, cfg_value;
 	p_nxge_param_t	pa = (p_nxge_param_t)cp;
@@ -1717,7 +1717,7 @@ nxge_param_hash_lookup_enable(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_llc_snap_enable(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char		*end;
 	uint32_t	status = 0, cfg_value;
@@ -1749,10 +1749,9 @@ nxge_param_llc_snap_enable(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_set_ether_usr(p_nxge_t nxgep, queue_t *q,
-	mblk_t	*mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char		*end;
-	uint8_t		ether_class;
 	uint32_t	status = 0, cfg_value;
 	p_nxge_param_t	pa = (p_nxge_param_t)cp;
 	uint8_t		cfg_it = B_FALSE;
@@ -1772,10 +1771,7 @@ nxge_param_set_ether_usr(p_nxge_t nxgep, queue_t *q,
 
 	/* do the actual hw setup  */
 	if (cfg_it == B_TRUE) {
-		ether_class = mi_strtol(pa->name, &end, 10);
-#ifdef lint
-		ether_class = ether_class;
-#endif
+		(void) mi_strtol(pa->name, &end, BASE_DECIMAL);
 		NXGE_DEBUG_MSG((nxgep, NDD_CTL, " nxge_param_set_ether_usr"));
 	}
 
@@ -1786,7 +1782,7 @@ nxge_param_set_ether_usr(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_set_ip_usr(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char		*end;
 	tcam_class_t	class;
@@ -1837,7 +1833,7 @@ nxge_class_name_2value(p_nxge_t nxgep, char *name)
 /* ARGSUSED */
 int
 nxge_param_set_ip_opt(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char		*end;
 	uint32_t	status, cfg_value;
@@ -1883,7 +1879,7 @@ nxge_param_set_ip_opt(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_get_ip_opt(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, caddr_t cp)
+    mblk_t *mp, caddr_t cp)
 {
 	uint32_t status, cfg_value;
 	p_nxge_param_t pa = (p_nxge_param_t)cp;
@@ -1920,7 +1916,7 @@ nxge_param_get_ip_opt(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_fflp_hash_init(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char		*end;
 	uint32_t	status, cfg_value;
@@ -1979,7 +1975,7 @@ nxge_param_fflp_hash_init(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_set_grp_rdc(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char			*end;
 	uint32_t		status = 0, cfg_value;
@@ -2040,7 +2036,7 @@ nxge_param_set_grp_rdc(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_set_port_rdc(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char		*end;
 	uint32_t	status = B_TRUE, cfg_value;
@@ -2084,7 +2080,7 @@ nxge_param_set_port_rdc(p_nxge_t nxgep, queue_t *q,
 /* ARGSUSED */
 static int
 nxge_param_set_nxge_debug_flag(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char *end;
 	uint32_t status = 0;
@@ -2137,7 +2133,7 @@ nxge_param_get_debug_flag(p_nxge_t nxgep, queue_t *q, p_mblk_t mp, caddr_t cp)
 /* ARGSUSED */
 static int
 nxge_param_set_npi_debug_flag(p_nxge_t nxgep, queue_t *q,
-	mblk_t *mp, char *value, caddr_t cp)
+    mblk_t *mp, char *value, caddr_t cp)
 {
 	char		*end;
 	uint32_t	status = 0;
@@ -2454,7 +2450,7 @@ nxge_get_default(p_nxge_t nxgep, queue_t *q, p_mblk_t mp, caddr_t data)
 /* ARGSUSED */
 int
 nxge_set_default(p_nxge_t nxgep, queue_t *q, p_mblk_t mp, char *value,
-	caddr_t data)
+    caddr_t data)
 {
 	return (EACCES);
 }
diff --git a/usr/src/uts/common/os/netstack.c b/usr/src/uts/common/os/netstack.c
index 70337cca2f..8791bb06da 100644
--- a/usr/src/uts/common/os/netstack.c
+++ b/usr/src/uts/common/os/netstack.c
@@ -1080,7 +1080,7 @@ netstack_reap(void *arg)
 	mutex_enter(&netstack_g_lock);
 	found = B_FALSE;
 	for (nsp = &netstack_head; *nsp != NULL;
-	     nsp = &(*nsp)->netstack_next) {
+	    nsp = &(*nsp)->netstack_next) {
 		if (*nsp == ns) {
 			*nsp = ns->netstack_next;
 			ns->netstack_next = NULL;