6 files changed, 44 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf
index c2dd3890ee..e83432f48f 100644
--- a/usr/src/pkg/manifests/service-fault-management.mf
+++ b/usr/src/pkg/manifests/service-fault-management.mf
@@ -569,6 +569,7 @@ file path=usr/lib/fm/topo/plugins/disk.so mode=0555
 file path=usr/lib/fm/topo/plugins/fac_prov_ipmi.so mode=0555
 file path=usr/lib/fm/topo/plugins/fac_prov_mptsas.so mode=0555
 file path=usr/lib/fm/topo/plugins/ipmi.so mode=0555
+file path=usr/lib/fm/topo/plugins/nic.so mode=0555
 file path=usr/lib/fm/topo/plugins/ses.so mode=0555
 file path=usr/lib/fm/topo/plugins/xfp.so mode=0555
 #
diff --git a/usr/src/pkg/manifests/system-kernel.man9e.inc b/usr/src/pkg/manifests/system-kernel.man9e.inc
index a3e8bc6788..b45d3cbabe 100644
--- a/usr/src/pkg/manifests/system-kernel.man9e.inc
+++ b/usr/src/pkg/manifests/system-kernel.man9e.inc
@@ -37,6 +37,7 @@ file path=usr/share/man/man9e/ioctl.9e
 file path=usr/share/man/man9e/ks_snapshot.9e
 file path=usr/share/man/man9e/ks_update.9e
 file path=usr/share/man/man9e/mac.9e
+file path=usr/share/man/man9e/mac_capab_transceiver.9e
 file path=usr/share/man/man9e/mc_getcapab.9e
 file path=usr/share/man/man9e/mc_getprop.9e
 file path=usr/share/man/man9e/mc_getstat.9e
@@ -94,6 +95,8 @@ link path=usr/share/man/man9e/gldv3.9e target=mac.9e
 link path=usr/share/man/man9e/intro.9e target=Intro.9e
 link path=usr/share/man/man9e/mc_close.9e target=mc_open.9e
 link path=usr/share/man/man9e/mc_stop.9e target=mc_start.9e
+link path=usr/share/man/man9e/mct_info.9e target=mac_capab_transceiver.9e
+link path=usr/share/man/man9e/mct_read.9e target=mac_capab_transceiver.9e
 link path=usr/share/man/man9e/tran_destroy_pkt.9e target=tran_init_pkt.9e
 link path=usr/share/man/man9e/tran_pkt_constructor.9e target=tran_setup_pkt.9e
 link path=usr/share/man/man9e/tran_pkt_destructor.9e target=tran_setup_pkt.9e
diff --git a/usr/src/pkg/manifests/system-kernel.man9f.inc b/usr/src/pkg/manifests/system-kernel.man9f.inc
index 8f82c38cec..31b6644aa9 100644
--- a/usr/src/pkg/manifests/system-kernel.man9f.inc
+++ b/usr/src/pkg/manifests/system-kernel.man9f.inc
@@ -327,6 +327,7 @@ file path=usr/share/man/man9f/mac_maxsdu_update.9f
 file path=usr/share/man/man9f/mac_prop_info.9f
 file path=usr/share/man/man9f/mac_register.9f
 file path=usr/share/man/man9f/mac_rx.9f
+file path=usr/share/man/man9f/mac_transceiver_info.9f
 file path=usr/share/man/man9f/mac_tx_update.9f
 file path=usr/share/man/man9f/makecom.9f
 file path=usr/share/man/man9f/makedevice.9f
@@ -1015,6 +1016,10 @@ link path=usr/share/man/man9f/mac_prop_info_set_perm.9f \
     target=mac_prop_info.9f
 link path=usr/share/man/man9f/mac_prop_info_set_range_uint32.9f \
     target=mac_prop_info.9f
+link path=usr/share/man/man9f/mac_transceiver_info_set_present.9f \
+    target=mac_transceiver_info.9f
+link path=usr/share/man/man9f/mac_transceiver_info_set_usable.9f \
+    target=mac_transceiver_info.9f
 link path=usr/share/man/man9f/mac_unregister.9f target=mac_register.9f
 link path=usr/share/man/man9f/makecom_g0.9f target=makecom.9f
 link path=usr/share/man/man9f/makecom_g0_s.9f target=makecom.9f
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index 87b6465d5e..523abb44d7 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -375,6 +375,7 @@ file path=usr/lib/$(ARCH64)/libreparse.so.1
 $(i386_ONLY)file path=usr/lib/$(ARCH64)/libsaveargs.so.1
 file path=usr/lib/$(ARCH64)/libsched.so.1
 file path=usr/lib/$(ARCH64)/libsctp.so.1
+file path=usr/lib/$(ARCH64)/libsff.so.1
 file path=usr/lib/$(ARCH64)/libshell.so.1
 file path=usr/lib/$(ARCH64)/libsip.so.1
 file path=usr/lib/$(ARCH64)/libsldap.so.1
@@ -450,6 +451,7 @@ file path=usr/lib/libraidcfg.so.1
 file path=usr/lib/libreparse.so.1
 file path=usr/lib/libsched.so.1
 file path=usr/lib/libsctp.so.1
+file path=usr/lib/libsff.so.1
 file path=usr/lib/libshell.so.1
 file path=usr/lib/libsip.so.1
 file path=usr/lib/libsldap.so.1
diff --git a/usr/src/pkg/manifests/system-network.mf b/usr/src/pkg/manifests/system-network.mf
index bcc96e4b34..fd44515945 100644
--- a/usr/src/pkg/manifests/system-network.mf
+++ b/usr/src/pkg/manifests/system-network.mf
@@ -43,6 +43,7 @@ dir path=etc/nwam group=netadm owner=netadm
 dir path=etc/nwam/loc group=netadm owner=netadm
 dir path=etc/nwam/loc/NoNet group=netadm owner=netadm
 dir path=sbin group=sys
+dir path=usr/lib/dl
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 file path=etc/default/dhcpagent group=sys \
@@ -82,6 +83,7 @@ file path=sbin/dlstat mode=0555
 file path=sbin/flowadm mode=0555
 file path=sbin/flowstat mode=0555
 file path=sbin/ipadm mode=0555
+file path=usr/lib/dl/dltraninfo mode=0555
 file path=usr/share/man/man1m/dladm.1m
 file path=usr/share/man/man1m/flowadm.1m
 file path=usr/share/man/man1m/ipadm.1m
diff --git a/usr/src/pkg/manifests/system-test-utiltest.mf b/usr/src/pkg/manifests/system-test-utiltest.mf
index 045ba608b0..1bf15858bd 100644
--- a/usr/src/pkg/manifests/system-test-utiltest.mf
+++ b/usr/src/pkg/manifests/system-test-utiltest.mf
@@ -31,6 +31,7 @@ dir path=opt/util-tests/tests/dis/i386
 dir path=opt/util-tests/tests/dis/sparc
 dir path=opt/util-tests/tests/files
 dir path=opt/util-tests/tests/libnvpair_json
+dir path=opt/util-tests/tests/libsff
 file path=opt/util-tests/README mode=0444
 file path=opt/util-tests/bin/print_json mode=0555
 file path=opt/util-tests/bin/utiltest mode=0555
@@ -237,6 +238,36 @@ file path=opt/util-tests/tests/libnvpair_json/json_05_strings mode=0555
 file path=opt/util-tests/tests/libnvpair_json/json_06_nested mode=0555
 file path=opt/util-tests/tests/libnvpair_json/json_07_nested_arrays mode=0555
 file path=opt/util-tests/tests/libnvpair_json/json_common mode=0555
+file path=opt/util-tests/tests/libsff/libsff mode=0555
+file path=opt/util-tests/tests/libsff/libsff_8472 mode=0555
+file path=opt/util-tests/tests/libsff/libsff_8472.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_8636_diag mode=0555
+file path=opt/util-tests/tests/libsff/libsff_8636_diag.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_8636_extspec mode=0555
+file path=opt/util-tests/tests/libsff/libsff_8636_extspec.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_8636_tech mode=0555
+file path=opt/util-tests/tests/libsff/libsff_8636_tech.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_8636_temp mode=0555
+file path=opt/util-tests/tests/libsff/libsff_8636_temp.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_br mode=0555
+file path=opt/util-tests/tests/libsff/libsff_br.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_compliance mode=0555
+file path=opt/util-tests/tests/libsff/libsff_compliance.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_conn mode=0555
+file path=opt/util-tests/tests/libsff/libsff_conn.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_efault mode=0555
+file path=opt/util-tests/tests/libsff/libsff_einval mode=0555
+file path=opt/util-tests/tests/libsff/libsff_enc mode=0555
+file path=opt/util-tests/tests/libsff/libsff_enc.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_ident mode=0555
+file path=opt/util-tests/tests/libsff/libsff_ident.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_lengths mode=0555
+file path=opt/util-tests/tests/libsff/libsff_lengths.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_opts mode=0555
+file path=opt/util-tests/tests/libsff/libsff_opts.out mode=0444
+file path=opt/util-tests/tests/libsff/libsff_strings mode=0555
+file path=opt/util-tests/tests/libsff/libsff_wave mode=0555
+file path=opt/util-tests/tests/libsff/libsff_wave.out mode=0444
 file path=opt/util-tests/tests/printf_test mode=0555
 file path=opt/util-tests/tests/set-linkprop mode=0555
 file path=opt/util-tests/tests/xargs_test mode=0555