[illumos-gate merge]

commit e5c421abb8bd517cb6964747b9ce23066e1a1cef
    9266 ixgbe: this statement may fall through
commit 8a7aa2a592747bd90d85645126d80688e024a0e2
    9673 move internet address manipulation functions to libc
commit 7e3488dc6cdcb0c04e1ce167a1a3bfef83b5f2e0
    9610 qede: error: left shift of negative value
commit d972451485b9ccf8c5c4951e2d24f63da9ac2cc8
    9609 qede: error: result of '983040 << 16' requires 37 bits to represent, but 'int' only has 32 bits
commit 3df3d01f9da8be5cdd1e81a5d050c24ccc55caa9
    9608 qede: error: 'free_buffer_count' may be used uninitialized in this function
commit 0d7de619fa7b28e48c8e80fa26d724400f4f47a4
    9607 qede: this statement may fall through
commit 77b62fe435d195b5a58f123e6c5ec9c9dffdc877
    9606 qede: error: this 'for' clause does not guard

	Conflicts:
	usr/src/man/man1m/route.1m
	usr/src/lib/libdladm/Makefile.com

1 files changed, 18 insertions, 17 deletions

diff --git a/usr/src/lib/libnsl/common/mapfile-vers b/usr/src/lib/libnsl/common/mapfile-vers
index aafb70af9f..bae1af4edc 100644
--- a/usr/src/lib/libnsl/common/mapfile-vers
+++ b/usr/src/lib/libnsl/common/mapfile-vers
@@ -18,10 +18,11 @@
 #
 # CDDL HEADER END
 #
+
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015 Joyent, Inc.
-# Copyright 2017 Nexenta Systems, Inc.  All rights reserved.
+# Copyright 2018 Nexenta Systems, Inc.
 #
 
 #
@@ -40,7 +41,7 @@
 
 $mapfile_version 2
 
-SYMBOL_VERSION ILLUMOS_0.1 {    # Illumos additions
+SYMBOL_VERSION ILLUMOS_0.1 {    # illumos additions
     global:
 	svc_tp_create_addr;
 } SUNW_1.10;
@@ -52,7 +53,7 @@ SYMBOL_VERSION SUNW_1.10 {	# SunOS 5.11 (Solaris 11)
 
 SYMBOL_VERSION SUNW_1.9.1 {	# SunOS 5.10 (Solaris 10 update 5)
     global:
-	inet_aton;
+	inet_aton		{ TYPE = FUNCTION; FILTER = libc.so.1 };
 } SUNW_1.9;
 
 SYMBOL_VERSION SUNW_1.9 {	# SunOS 5.10 (Solaris 10)
@@ -78,8 +79,8 @@ SYMBOL_VERSION SUNW_1.7 {	# SunOS 5.8 (Solaris 8)
 	freehostent;
 	getipnodebyaddr;
 	getipnodebyname;
-	inet_ntop;
-	inet_pton;
+	inet_ntop		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	inet_pton		{ TYPE = FUNCTION; FILTER = libc.so.1 };
 } SUNW_1.6;
 
 SYMBOL_VERSION SUNW_1.6 {	# SunOS 5.7 (Solaris 7)
@@ -235,16 +236,16 @@ SYMBOL_VERSION SUNW_0.7 {	# SunOS 5.3 (Solaris 2.3)
 	getrpcent;
 	getrpcent_r;
 	h_errno			{ FLAGS = NODIRECT };
-	inet_ntoa_r;
+	inet_ntoa_r		{ TYPE = FUNCTION; FILTER = libc.so.1 };
 	key_secretkey_is_set;
 	maxbno;
 	nc_sperror;
 	netdir_perror;
 	netdir_sperror;
 	nextkey;
-        nis_clone_object;
-        nis_destroy_object;	
-        nis_dir_cmp;
+	nis_clone_object;
+	nis_destroy_object;
+	nis_dir_cmp;
 	nis_domain_of;
 	nis_leaf_of;
 	nis_leaf_of_r;
@@ -318,9 +319,9 @@ SYMBOL_VERSION SISCD_2.3 {
 $endif
 	gethostbyaddr;
 	gethostbyname;
-	inet_addr;
-	inet_netof;
-	inet_ntoa;
+	inet_addr		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	inet_netof		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	inet_ntoa		{ TYPE = FUNCTION; FILTER = libc.so.1 };
 	_null_auth;
 	rpc_broadcast_exp;
 	svc_fdset;
@@ -579,8 +580,8 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	__getnetnamebyuid;
 	__getpublickey_cached;
 	__getpublickey_cached_g;
-        __getpublickey_flush;
-        __getpublickey_flush_g;
+	__getpublickey_flush;
+	__getpublickey_flush_g;
 	getpublickey_g;
 	getsecretkey_g;
 	hashinc;
@@ -620,17 +621,17 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	__nis_get_mechanism_library;
 	__nis_get_mechanisms;
 	__nis_get_mechanism_symbol;
-        nis_get_static_storage;
+	nis_get_static_storage;
 	__nis_gssprin2netname;
 	__nis_keyalg2authtype;
 	__nis_keyalg2mechalias;
 	__nis_mechalias2authtype;
 	__nis_mechname2alias;
-        nis_read_obj;
+	nis_read_obj;
 	__nis_release_mechanisms;
 	__nis_rpc_domain;
 	__nis_translate_mechanism;
-        nis_write_obj;
+	nis_write_obj;
 	__nsl_dom;
 	__nss2herrno;
 	nss_ioctl;