Mercurial > illumos > illumos-gate

changeset 3397:d2f9d3ec4f8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6508701 ire_add_v4() often adds unresolved IREs even when told not to 6469271 misspelled collision related kstat names in GLDv3
author sangeeta
date Wed, 10 Jan 2007 08:25:37 -0800
parents 82dc424a5bb4
children 6253059e76ed
files usr/src/uts/common/inet/ip/ip_ire.c usr/src/uts/common/io/mac/plugins/mac_ether.c
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/inet/ip/ip_ire.c	Tue Jan 09 15:03:05 2007 -0800
+++ b/usr/src/uts/common/inet/ip/ip_ire.c	Wed Jan 10 08:25:37 2007 -0800
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 /* Copyright (c) 1990 Mentat Inc. */
@@ -3633,7 +3633,7 @@
 		if ((nce == NULL) ||
 		    (nce->nce_flags & NCE_F_CONDEMNED) ||
 		    (!allow_unresolved &&
-		    ((nce->nce_state & ND_REACHABLE) == 0))) {
+		    (nce->nce_state != ND_REACHABLE))) {
 			if (nce != NULL)
 				mutex_exit(&nce->nce_lock);
 			ire_atomic_end(irb_ptr, ire);
--- a/usr/src/uts/common/io/mac/plugins/mac_ether.c	Tue Jan 09 15:03:05 2007 -0800
+++ b/usr/src/uts/common/io/mac/plugins/mac_ether.c	Wed Jan 10 08:25:37 2007 -0800
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -46,15 +46,15 @@
 	/* RFC1643 stats */
 	{ ETHER_STAT_ALIGN_ERRORS, "align_errors", KSTAT_DATA_UINT32,	0 },
 	{ ETHER_STAT_FCS_ERRORS, "fcs_errors", KSTAT_DATA_UINT32,	0 },
-	{ ETHER_STAT_FIRST_COLLISIONS, "first_collsions", KSTAT_DATA_UINT32,
+	{ ETHER_STAT_FIRST_COLLISIONS, "first_collisions", KSTAT_DATA_UINT32,
 	    0 },
-	{ ETHER_STAT_MULTI_COLLISIONS, "multi_collsions", KSTAT_DATA_UINT32,
+	{ ETHER_STAT_MULTI_COLLISIONS, "multi_collisions", KSTAT_DATA_UINT32,
 	    0 },
 	{ ETHER_STAT_SQE_ERRORS, "sqe_errors", KSTAT_DATA_UINT32,	0},
 	{ ETHER_STAT_DEFER_XMTS, "defer_xmts", KSTAT_DATA_UINT32,	0},
-	{ ETHER_STAT_TX_LATE_COLLISIONS, "tx_late_collsions",
+	{ ETHER_STAT_TX_LATE_COLLISIONS, "tx_late_collisions",
 	    KSTAT_DATA_UINT32, 0 },
-	{ ETHER_STAT_EX_COLLISIONS, "ex_collsions", KSTAT_DATA_UINT32,	0 },
+	{ ETHER_STAT_EX_COLLISIONS, "ex_collisions", KSTAT_DATA_UINT32,	0 },
 	{ ETHER_STAT_MACXMT_ERRORS, "macxmt_errors", KSTAT_DATA_UINT32,	0 },
 	{ ETHER_STAT_CARRIER_ERRORS, "carrier_errors", KSTAT_DATA_UINT32, 0 },
 	{ ETHER_STAT_TOOLONG_ERRORS, "toolong_errors", KSTAT_DATA_UINT32, 0 },