[illumos-gate merge]

commit 67b886e08e73a289a63ea9a98920f9ff423d1881
    5934 localedef needs a native build (fix lint)
commit fa9922c2be34868be01989cef133828185b5c0bc
    5935 libavl should be a public interface
    5936 AVL trees should be part of the DDI
commit 7de0ac867568af5d9b8a9d8f8c82fd5fc12c6bfa
    5934 localedef needs a native build
commit 25b86e8fb6a2b50f929d8492cbac5d4eb5c2009a
    5933 Makefile.man should take care of directory creation
commit 22ff04516c85a5caac614d46031edbc085ba3a9e
    6113 cpqary3: add support for hp gen9 smart array controllers
commit d05c2e387bac9df4515e8771dbee0ef3f5fe121a
    6121 Copy-paste bug in mac_init_rings()

	Conflicts:
	usr/src/man/Makefile.man
	usr/src/cmd/localedef/Makefile

3 files changed, 130 insertions, 15 deletions

diff --git a/usr/src/uts/common/io/cpqary3/cpqary3_bd.c b/usr/src/uts/common/io/cpqary3/cpqary3_bd.c
index a643418e5f..e31b9388b5 100644
--- a/usr/src/uts/common/io/cpqary3/cpqary3_bd.c
+++ b/usr/src/uts/common/io/cpqary3/cpqary3_bd.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (C) 2014 Hewlett-Packard Development Company, L.P.
+ * Copyright (C) 2015 Hewlett-Packard Development Company, L.P.
  */
 
 /*
@@ -492,6 +492,126 @@ static cpqary3_bd_t cpqary3_bds[] = {
 		INTR_PERF_MASK,
 		0,
 		1
+	},
+	{
+		"Smart Array P244br Controller",
+		8,
+		0x103c,
+		0x21bd,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P741m Controller",
+		8,
+		0x103c,
+		0x21be,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P440ar Controller",
+		8,
+		0x103c,
+		0x21c0,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P440 Controller",
+		8,
+		0x103c,
+		0x21c2,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P441 Controller",
+		8,
+		0x103c,
+		0x21c3,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P841 Controller",
+		8,
+		0x103c,
+		0x21c5,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P246br Controller",
+		8,
+		0x103c,
+		0x21ca,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P840 Controller",
+		8,
+		0x103c,
+		0x21cb,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P542t Controller",
+		8,
+		0x103c,
+		0x21cc,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P240tr Controller",
+		8,
+		0x103c,
+		0x21cd,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
 	}
 };
 
diff --git a/usr/src/uts/common/io/mac/mac.c b/usr/src/uts/common/io/mac/mac.c
index 99bdbda0cd..a36f220ac2 100644
--- a/usr/src/uts/common/io/mac/mac.c
+++ b/usr/src/uts/common/io/mac/mac.c
@@ -4039,11 +4039,11 @@ mac_init_rings(mac_impl_t *mip, mac_ring_type_t rtype)
 		 * Driver must register group->mgi_addmac/remmac() for rx groups
 		 * to support multiple MAC addresses.
 		 */
-		if (rtype == MAC_RING_TYPE_RX) {
-			if ((group_info.mgi_addmac == NULL) ||
-			    (group_info.mgi_addmac == NULL)) {
-				goto bail;
-			}
+		if (rtype == MAC_RING_TYPE_RX &&
+		    ((group_info.mgi_addmac == NULL) ||
+		    (group_info.mgi_remmac == NULL))) {
+			err = EINVAL;
+			goto bail;
 		}
 
 		/* Cache driver-supplied information */
diff --git a/usr/src/uts/common/sys/avl.h b/usr/src/uts/common/sys/avl.h
index 10e0ddaeef..cc4af828e6 100644
--- a/usr/src/uts/common/sys/avl.h
+++ b/usr/src/uts/common/sys/avl.h
@@ -30,11 +30,6 @@
 #ifndef	_AVL_H
 #define	_AVL_H
 
-/*
- * This is a private header file.  Applications should not directly include
- * this file.
- */
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -43,9 +38,9 @@ extern "C" {
 #include <sys/avl_impl.h>
 
 /*
- * This is a generic implementation of AVL trees for use in the Solaris kernel.
- * The interfaces provide an efficient way of implementing an ordered set of
- * data structures.
+ * This is a generic implementation of AVL trees for use in the illumos. The
+ * interfaces provide an efficient way of implementing an ordered set of data
+ * structures.
  *
  * AVL trees provide an alternative to using an ordered linked list. Using AVL
  * trees will usually be faster, however they requires more storage. An ordered
@@ -57,7 +52,7 @@ extern "C" {
  *	---------	 --------	--------
  *	lookup		   O(n)		O(log(n))
  *
- *	insert 1 node	 constant	constant
+ *	insert 1 node	 constant	O(log(n))
  *
  *	delete 1 node	 constant	between constant and O(log(n))
  *