Mercurial > illumos > illumos-gate

changeset 12614:f85dcacb0f5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6956533 assertion failed: --ipx->ipx_reentry_cnt == 0, file: ../../common/inet/ip/ip_if.c, line: 6440
author Ramesh Kumar Katla <Ramesh.K@Sun.COM>
date Fri, 11 Jun 2010 13:51:59 -0700
parents 4c5722bc28dc
children 4fc0a1ca161e
files usr/src/uts/common/inet/ip/ip_if.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/inet/ip/ip_if.c	Fri Jun 11 12:07:14 2010 -0700
+++ b/usr/src/uts/common/inet/ip/ip_if.c	Fri Jun 11 13:51:59 2010 -0700
@@ -8565,8 +8565,7 @@
 /*
  * Process I_{P}LINK and I_{P}UNLINK requests named by `ioccmd' and pointed to
  * by `mp' and `li' for the IP module stream (if li->q_bot is in fact an IP
- * module stream).  If `doconsist' is set, then do the extended consistency
- * checks requested by ifconfig(1M) and (atomically) set ill_muxid here.
+ * module stream).
  * Returns zero on success, EINPROGRESS if the operation is still pending, or
  * an error code on failure.
  */
@@ -8639,7 +8638,8 @@
 			 * second, but here we have arp being plumbed first.
 			 */
 			mutex_exit(&ill->ill_lock);
-			ipsq_exit(ipsq);
+			if (entered_ipsq)
+				ipsq_exit(ipsq);
 			ill_refrele(ill);
 			return (EINVAL);
 		}