# This patch was developed in-house. Since it is Solaris-specific,

# it is not suitable for upstream.

#

diff -r -u /tmp/infiniband-diags-1.5.8/Makefile.am infiniband-diags-1.5.8/Makefile.am

--- /tmp/infiniband-diags-1.5.8/Makefile.am	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/Makefile.am	Fri Feb 25 03:09:22 2011

@@ -13,7 +13,7 @@

 sbin_PROGRAMS = src/ibaddr src/ibnetdiscover src/ibping src/ibportstate \

 	        src/ibroute src/ibstat src/ibsysstat src/ibtracert \

 	        src/perfquery src/sminfo src/smpdump src/smpquery \

-	        src/saquery src/vendstat src/iblinkinfo \

+	        src/saquery src/vendstat src/solaris_set_nodedesc src/iblinkinfo \

 		src/ibqueryerrors src/ibcacheedit

 if ENABLE_TEST_UTILS

@@ -44,7 +44,7 @@

 libcommon_a_SOURCES = src/ibdiag_common.c

 src_ibaddr_SOURCES = src/ibaddr.c

 src_ibnetdiscover_SOURCES = src/ibnetdiscover.c

-src_ibnetdiscover_LDFLAGS = -L$(top_builddir)/libibnetdisc -libnetdisc

+src_ibnetdiscover_LDFLAGS =

 src_ibping_SOURCES = src/ibping.c

 src_ibportstate_SOURCES = src/ibportstate.c

 src_ibroute_SOURCES = src/ibroute.c

@@ -66,6 +66,9 @@

 src_ibcacheedit_SOURCES = src/ibcacheedit.c

 src_ibcacheedit_LDFLAGS = -L$(top_builddir)/libibnetdisc -libnetdisc

+src_solaris_set_nodedesc_SOURCES = src/solaris_set_nodedesc.c

+src_solaris_set_nodedesc_CFLAGS = -Wall $(DBGFLAGS)

+

 man_MANS = man/ibaddr.8 man/ibcheckerrors.8 man/ibcheckerrs.8 \

 	man/ibchecknet.8 man/ibchecknode.8 man/ibcheckport.8 \

 	man/ibcheckportstate.8 man/ibcheckportwidth.8 man/ibcheckstate.8 \

diff -r -u /tmp/infiniband-diags-1.5.8/Makefile.in infiniband-diags-1.5.8/Makefile.in

--- /tmp/infiniband-diags-1.5.8/Makefile.in	Wed Feb 16 02:28:20 2011

+++ infiniband-diags-1.5.8/Makefile.in	Fri Feb 25 03:21:49 2011

@@ -44,7 +44,8 @@

 	src/smpdump$(EXEEXT) src/smpquery$(EXEEXT) \

 	src/saquery$(EXEEXT) src/vendstat$(EXEEXT) \

 	src/iblinkinfo$(EXEEXT) src/ibqueryerrors$(EXEEXT) \

-	src/ibcacheedit$(EXEEXT) $(am__EXEEXT_1)

+	src/ibcacheedit$(EXEEXT) $(am__EXEEXT_1) \

+	src/solaris_set_nodedesc$(EXEEXT)

 @ENABLE_TEST_UTILS_TRUE@am__append_1 = src/ibsendtrap src/mcm_rereg_test

 subdir = .

 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

@@ -190,6 +191,11 @@

 src_vendstat_OBJECTS = $(am_src_vendstat_OBJECTS)

 src_vendstat_LDADD = $(LDADD)

 src_vendstat_DEPENDENCIES = libcommon.a

+am_src_solaris_set_nodedesc_OBJECTS = src_solaris_set_nodedesc-solaris_set_nodedesc.$(OBJEXT) \

+	src_solaris_set_nodedesc-ibdiag_common.$(OBJEXT)

+src_solaris_set_nodedesc_OBJECTS = $(am_src_solaris_set_nodedesc_OBJECTS)

+src_solaris_set_nodedesc_LDADD = $(LDADD)

+sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) -m 755

 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

 am__vpath_adj = case $$p in \

     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

@@ -234,7 +240,8 @@

 	$(src_ibtracert_SOURCES) $(src_mcm_rereg_test_SOURCES) \

 	$(src_perfquery_SOURCES) $(src_saquery_SOURCES) \

 	$(src_sminfo_SOURCES) $(src_smpdump_SOURCES) \

-	$(src_smpquery_SOURCES) $(src_vendstat_SOURCES)

+	$(src_smpquery_SOURCES) $(src_vendstat_SOURCES) \

+	$(src_solaris_set_nodedesc_SOURCES)

 DIST_SOURCES = $(libcommon_a_SOURCES) $(src_ibaddr_SOURCES) \

 	$(src_ibcacheedit_SOURCES) $(src_iblinkinfo_SOURCES) \

 	$(src_ibnetdiscover_SOURCES) $(src_ibping_SOURCES) \

@@ -244,7 +251,8 @@

 	$(src_ibtracert_SOURCES) $(src_mcm_rereg_test_SOURCES) \

 	$(src_perfquery_SOURCES) $(src_saquery_SOURCES) \

 	$(src_sminfo_SOURCES) $(src_smpdump_SOURCES) \

-	$(src_smpquery_SOURCES) $(src_vendstat_SOURCES)

+	$(src_smpquery_SOURCES) $(src_vendstat_SOURCES) \

+	$(src_solaris_set_nodedesc_SOURCES)

 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

 	html-recursive info-recursive install-data-recursive \

 	install-dvi-recursive install-exec-recursive \

@@ -252,7 +260,11 @@

 	install-pdf-recursive install-ps-recursive install-recursive \

 	installcheck-recursive installdirs-recursive pdf-recursive \

 	ps-recursive uninstall-recursive

-man8dir = $(mandir)/man8

+src_solaris_set_nodedesc_SOURCES = src/solaris_set_nodedesc.c src/ibdiag_common.c

+src_solaris_set_nodedesc_CFLAGS = -Wall $(DBGFLAGS)

+src_solaris_set_nodedesc_LDFLAGS =

+

+man8dir = $(mandir)/man1m

 NROFF = nroff

 MANS = $(man_MANS)

 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\

@@ -610,8 +622,8 @@

 	while read type dir files; do \

 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

 	    test -z "$$files" || { \

-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \

-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \

+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) -m 755 $$files '$(DESTDIR)$(sbindir)$$dir'"; \

+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) -m 755 $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \

 	    } \

 	; done

@@ -633,6 +645,13 @@

 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

 	echo " rm -f" $$list; \

 	rm -f $$list

+

+clean-sbinSCRIPTS:

+	@list=`ls scripts/*.in`; for p in $$list; do \

+	  f=`echo $$p | sed 's/\.in//'`; \

+	  echo " rm -f $$f"; \

+	  rm -f $$f ; \

+	done

 src/$(am__dirstamp):

 	@$(MKDIR_P) src

 	@: > src/$(am__dirstamp)

@@ -693,6 +712,10 @@

 src/vendstat$(EXEEXT): $(src_vendstat_OBJECTS) $(src_vendstat_DEPENDENCIES) src/$(am__dirstamp)

 	@rm -f src/vendstat$(EXEEXT)

 	$(LINK) $(src_vendstat_OBJECTS) $(src_vendstat_LDADD) $(LIBS)

+	$(LINK) $(src_vendstat_OBJECTS) $(src_vendstat_LDADD) $(LIBS)

+src/solaris_set_nodedesc$(EXEEXT): $(src_solaris_set_nodedesc_OBJECTS) $(src_solaris_set_nodedesc_DEPENDENCIES) src/$(am__dirstamp)

+	@rm -f src/solaris_set_nodedesc$(EXEEXT)

+	$(LINK) $(src_solaris_set_nodedesc_LDFLAGS) $(src_solaris_set_nodedesc_OBJECTS) $(src_solaris_set_nodedesc_LDADD) $(LIBS)

 install-sbinSCRIPTS: $(sbin_SCRIPTS)

 	@$(NORMAL_INSTALL)

 	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"

@@ -754,6 +777,8 @@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smpdump.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smpquery.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vendstat.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/src_solaris_set_nodedesc-ibdiag_common.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/src_solaris_set_nodedesc-solaris_set_nodedesc.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

@@ -1056,6 +1081,34 @@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vendstat.obj `if test -f 'src/vendstat.c'; then $(CYGPATH_W) 'src/vendstat.c'; else $(CYGPATH_W) '$(srcdir)/src/vendstat.c'; fi`

+src_solaris_set_nodedesc-solaris_set_nodedesc.o: src/solaris_set_nodedesc.c

+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_solaris_set_nodedesc_CFLAGS) $(CFLAGS) -MT src_solaris_set_nodedesc-solaris_set_nodedesc.o -MD -MP -MF "$(DEPDIR)/src_solaris_set_nodedesc-solaris_set_nodedesc.Tpo" -c -o src_solaris_set_nodedesc-solaris_set_nodedesc.o `test -f 'src/solaris_set_nodedesc.c' || echo '$(srcdir)/'`src/solaris_set_nodedesc.c; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/src_solaris_set_nodedesc-solaris_set_nodedesc.Tpo" "$(DEPDIR)/src_solaris_set_nodedesc-solaris_set_nodedesc.Po"; else rm -f "$(DEPDIR)/src_solaris_set_nodedesc-solaris_set_nodedesc.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/solaris_set_nodedesc.c' object='src_solaris_set_nodedesc-solaris_set_nodedesc.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_solaris_set_nodedesc_CFLAGS) $(CFLAGS) -c -o src_solaris_set_nodedesc-solaris_set_nodedesc.o `test -f 'src/solaris_set_nodedesc.c' || echo '$(srcdir)/'`src/solaris_set_nodedesc.c

+

+src_solaris_set_nodedesc-solaris_set_nodedesc.obj: src/solaris_set_nodedesc.c

+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_solaris_set_nodedesc_CFLAGS) $(CFLAGS) -MT src_solaris_set_nodedesc-solaris_set_nodedesc.obj -MD -MP -MF "$(DEPDIR)/src_solaris_set_nodedesc-solaris_set_nodedesc.Tpo" -c -o src_solaris_set_nodedesc-solaris_set_nodedesc.obj `if test -f 'src/solaris_set_nodedesc.c'; then $(CYGPATH_W) 'src/solaris_set_nodedesc.c'; else $(CYGPATH_W) '$(srcdir)/src/solaris_set_nodedesc.c'; fi`; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/src_solaris_set_nodedesc-solaris_set_nodedesc.Tpo" "$(DEPDIR)/src_solaris_set_nodedesc-solaris_set_nodedesc.Po"; else rm -f "$(DEPDIR)/src_solaris_set_nodedesc-solaris_set_nodedesc.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/solaris_set_nodedesc.c' object='src_solaris_set_nodedesc-solaris_set_nodedesc.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_solaris_set_nodedesc_CFLAGS) $(CFLAGS) -c -o src_solaris_set_nodedesc-solaris_set_nodedesc.obj `if test -f 'src/solaris_set_nodedesc.c'; then $(CYGPATH_W) 'src/solaris_set_nodedesc.c'; else $(CYGPATH_W) '$(srcdir)/src/solaris_set_nodedesc.c'; fi`

+

+src_solaris_set_nodedesc-ibdiag_common.o: src/ibdiag_common.c

+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_solaris_set_nodedesc_CFLAGS) $(CFLAGS) -MT src_solaris_set_nodedesc-ibdiag_common.o -MD -MP -MF "$(DEPDIR)/src_solaris_set_nodedesc-ibdiag_common.Tpo" -c -o src_solaris_set_nodedesc-ibdiag_common.o `test -f 'src/ibdiag_common.c' || echo '$(srcdir)/'`src/ibdiag_common.c; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/src_solaris_set_nodedesc-ibdiag_common.Tpo" "$(DEPDIR)/src_solaris_set_nodedesc-ibdiag_common.Po"; else rm -f "$(DEPDIR)/src_solaris_set_nodedesc-ibdiag_common.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ibdiag_common.c' object='src_solaris_set_nodedesc-ibdiag_common.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_solaris_set_nodedesc_CFLAGS) $(CFLAGS) -c -o src_solaris_set_nodedesc-ibdiag_common.o `test -f 'src/ibdiag_common.c' || echo '$(srcdir)/'`src/ibdiag_common.c

+

+src_solaris_set_nodedesc-ibdiag_common.obj: src/ibdiag_common.c

+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_solaris_set_nodedesc_CFLAGS) $(CFLAGS) -MT src_solaris_set_nodedesc-ibdiag_common.obj -MD -MP -MF "$(DEPDIR)/src_solaris_set_nodedesc-ibdiag_common.Tpo" -c -o src_solaris_set_nodedesc-ibdiag_common.obj `if test -f 'src/ibdiag_common.c'; then $(CYGPATH_W) 'src/ibdiag_common.c'; else $(CYGPATH_W) '$(srcdir)/src/ibdiag_common.c'; fi`; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/src_solaris_set_nodedesc-ibdiag_common.Tpo" "$(DEPDIR)/src_solaris_set_nodedesc-ibdiag_common.Po"; else rm -f "$(DEPDIR)/src_solaris_set_nodedesc-ibdiag_common.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ibdiag_common.c' object='src_solaris_set_nodedesc-ibdiag_common.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_solaris_set_nodedesc_CFLAGS) $(CFLAGS) -c -o src_solaris_set_nodedesc-ibdiag_common.obj `if test -f 'src/ibdiag_common.c'; then $(CYGPATH_W) 'src/ibdiag_common.c'; else $(CYGPATH_W) '$(srcdir)/src/ibdiag_common.c'; fi`

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -1080,6 +1133,10 @@

 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \

 	sed 'N;N;s,\n, ,g' | { \

 	list=; while read file base inst; do \

+	  ext='1m'; \

+	  inst=`echo $$inst | sed -e 's/\\.[0-9a-z]*$$//'`; \

+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \

+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \

 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \

 	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \

 	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \

@@ -1100,6 +1157,10 @@

 	  sed -n '/\.8[a-z]*$$/p'; \

 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \

 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \

+	ext='1m'; \

+	files=`echo $$files | sed -e 's/\\.[0-9a-z]*$$//'`; \

+	files=`echo $$files | sed -e 's/^.*\///'`; \

+	files=`echo $$files | sed '$(transform)'`.$$ext; \ 

 	test -z "$$files" || { \

 	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \

 	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }

@@ -1470,7 +1531,7 @@

 clean: clean-recursive

 clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \

-	clean-sbinPROGRAMS mostlyclean-am

+	clean-sbinPROGRAMS clean-sbinSCRIPTS mostlyclean-am

 distclean: distclean-recursive

 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)

@@ -1551,7 +1612,8 @@

 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

 	all all-am am--refresh check check-am clean clean-generic \

-	clean-libtool clean-noinstLIBRARIES clean-sbinPROGRAMS ctags \

+	clean-libtool clean-noinstLIBRARIES clean-sbinPROGRAMS \

+	clean-sbinSCRIPTS ctags \

 	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \

 	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \

 	distclean distclean-compile distclean-generic distclean-hdr \

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibcheckportstate.in infiniband-diags-1.5.8/scripts/ibcheckportstate.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibcheckportstate.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibcheckportstate.in	Thu Feb 24 11:26:53 2011

@@ -73,7 +73,7 @@

 portnum=$2

 if [ "$guid_addr" ]; then

-	if ! lid=`$IBPATH/ibaddr $ca_info -G -L $1 | awk '/failed/{exit -1} {print $3}'`; then

+	if ! lid=`$IBPATH/ibaddr $ca_info -G -L $1 | gawk '/failed/{exit -1} {print $3}'`; then

 		echo -n "guid $1 address resolution: "

 		red "FAILED"

 		exit -1

@@ -81,7 +81,7 @@

 	guid=$1

 else

 	lid=$1

-	if ! temp=`$IBPATH/ibaddr $ca_info -L $1 | awk '/failed/{exit -1} {print $1}'`; then

+	if ! temp=`$IBPATH/ibaddr $ca_info -L $1 | gawk '/failed/{exit -1} {print $1}'`; then

 		echo -n "lid $1 address resolution: "

 		red "FAILED"

 		exit -1

@@ -91,7 +91,7 @@

 text="`eval $IBPATH/smpquery $ca_info portinfo $lid $portnum`"

 rv=$?

-if echo "$text" | awk -v mono=$bw -F '[.:]*' '

+if echo "$text" | gawk -v mono=$bw -F '[.:]*' '

 function blue(s)

 {

 	if (mono)

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibhosts.in infiniband-diags-1.5.8/scripts/ibhosts.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibhosts.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibhosts.in	Thu Feb 24 11:26:56 2011

@@ -49,7 +49,7 @@

 text="`eval $netcmd`"

 rv=$?

-echo "$text" | awk '

+echo "$text" | gawk '

 /^Ca/	{print $1 "\t: 0x" substr($3, 4, 16) " ports " $2 " "\

 		substr($0, match($0, "#[ \t]*")+RLENGTH)}

 /^ib/	{print $0; next}

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/set_nodedesc.sh infiniband-diags-1.5.8/scripts/set_nodedesc.sh

--- /tmp/infiniband-diags-1.5.8/scripts/set_nodedesc.sh	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/set_nodedesc.sh	Fri Feb 25 03:09:27 2011

@@ -1,5 +1,13 @@

 #!/bin/bash

+# Call solaris_set_nodedesc, if operating system is SunOS

+os=`uname -s`

+if [ $os == "SunOS" ]; then

+	solaris_set_nodedesc "$@"

+	rc=$?

+	exit $rc

+fi

+

 if [ -f /etc/sysconfig/network ]; then

 . /etc/sysconfig/network

 fi

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibchecknode.in infiniband-diags-1.5.8/scripts/ibchecknode.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibchecknode.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibchecknode.in	Thu Feb 24 11:26:52 2011

@@ -71,7 +71,7 @@

 fi

 if [ "$guid_addr" ]; then

-	if ! lid=`$IBPATH/ibaddr $ca_info -G -L $1 | awk '/failed/{exit -1} {print $3}'`; then

+	if ! lid=`$IBPATH/ibaddr $ca_info -G -L $1 | gawk '/failed/{exit -1} {print $3}'`; then

 		echo -n "guid $1 address resolution: "

 		red "FAILED"

 		exit -1

@@ -78,7 +78,7 @@

 	fi

 else

 	lid=$1

-	if ! temp=`$IBPATH/ibaddr $ca_info -L $1 | awk '/failed/{exit -1} {print $1}'`; then

+	if ! temp=`$IBPATH/ibaddr $ca_info -L $1 | gawk '/failed/{exit -1} {print $1}'`; then

 		echo -n "lid $1 address resolution: "

 		red "FAILED"

 		exit -1

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibcheckstate.in infiniband-diags-1.5.8/scripts/ibcheckstate.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibcheckstate.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibcheckstate.in	Thu Feb 24 11:26:53 2011

@@ -69,7 +69,7 @@

 text="`eval $netcmd`"

 rv=$?

-echo "$text" | awk '

+echo "$text" | gawk '

 BEGIN {

 	ne=0

 	pe=0

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibswitches.in infiniband-diags-1.5.8/scripts/ibswitches.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibswitches.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibswitches.in	Thu Feb 24 11:26:58 2011

@@ -49,7 +49,7 @@

 text="`eval $netcmd`"

 rv=$?

-echo "$text" | awk '

+echo "$text" | gawk '

 /^Switch/	{

 			l=$0

 			desc=substr(l, match(l, "#[ \t]*")+RLENGTH)

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibclearcounters.in infiniband-diags-1.5.8/scripts/ibclearcounters.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibclearcounters.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibclearcounters.in	Thu Feb 24 11:26:54 2011

@@ -59,7 +59,7 @@

 text="`eval $netcmd`"

 rv=$?

-echo "$text" | awk '

+echo "$text" | gawk '

 function clear_counters(lid)

 {

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibcheckerrors.in infiniband-diags-1.5.8/scripts/ibcheckerrors.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibcheckerrors.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibcheckerrors.in	Thu Feb 24 11:26:52 2011

@@ -74,7 +74,7 @@

 text="`eval $netcmd`"

 rv=$?

-echo "$text" | awk '

+echo "$text" | gawk '

 BEGIN {

 	ne=0

 }

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibprintswitch.pl infiniband-diags-1.5.8/scripts/ibprintswitch.pl

--- /tmp/infiniband-diags-1.5.8/scripts/ibprintswitch.pl	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibprintswitch.pl	Thu Feb 24 11:26:57 2011

@@ -84,7 +84,7 @@

 if ($list_switches) {

 	system("ibswitches $cache_file");

-	exit 1;

+	exit $?;

 }

 if ($target_switch eq "") {

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibprintrt.pl infiniband-diags-1.5.8/scripts/ibprintrt.pl

--- /tmp/infiniband-diags-1.5.8/scripts/ibprintrt.pl	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibprintrt.pl	Thu Feb 24 11:26:57 2011

@@ -84,7 +84,7 @@

 if ($list_rts) {

 	system("ibrouters $cache_file");

-	exit 1;

+	exit $?;

 }

 if ($target_rt eq "") {

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibclearerrors.in infiniband-diags-1.5.8/scripts/ibclearerrors.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibclearerrors.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibclearerrors.in	Thu Feb 24 11:26:54 2011

@@ -63,7 +63,7 @@

 text="`eval $netcmd`"

 rv=$?

-echo "$text" | awk '

+echo "$text" | gawk '

 function clear_all_errors(lid, port)

 {

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibdatacounters.in infiniband-diags-1.5.8/scripts/ibdatacounters.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibdatacounters.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibdatacounters.in	Thu Feb 24 11:26:54 2011

@@ -74,7 +74,7 @@

 text="`eval $netcmd`"

 rv=$?

-echo "$text" | awk '

+echo "$text" | gawk '

 BEGIN {

 	ne=0

 }

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibcheckerrs.in infiniband-diags-1.5.8/scripts/ibcheckerrs.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibcheckerrs.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibcheckerrs.in	Fri Feb 25 03:09:27 2011

@@ -136,7 +136,7 @@

 fi

 if [ "$guid_addr" ]; then

-	if ! lid=`$IBPATH/ibaddr $ca_info -G -L $1 | awk '/failed/{exit -1} {print $3}'`; then

+	if ! lid=`$IBPATH/ibaddr $ca_info -G -L $1 | gawk '/failed/{exit -1} {print $3}'`; then

 		echo -n "guid $1 address resolution: "

 		red "FAILED"

 		exit -1

@@ -144,7 +144,7 @@

 	guid=$1

 else

 	lid=$1

-	if ! temp=`$IBPATH/ibaddr $ca_info -L $1 | awk '/failed/{exit -1} {print $1}'`; then

+	if ! temp=`$IBPATH/ibaddr $ca_info -L $1 | gawk '/failed/{exit -1} {print $1}'`; then

 		echo -n "lid $1 address resolution: "

 		red "FAILED"

 		exit -1

@@ -163,7 +163,7 @@

 	exit 0

 fi

-if echo "$text" | awk -v mono=$bw -v brief=$brief -F '[.:]*' '

+if echo "$text" | gawk -v mono=$bw -v brief=$brief -F '[.:]*' '

 function blue(s)

 {

 	if (brief == "yes") {

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibrouters.in infiniband-diags-1.5.8/scripts/ibrouters.in

--- /tmp/infiniband-diags-1.5.8/scripts/ibrouters.in	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibrouters.in	Thu Feb 24 11:26:57 2011

@@ -49,7 +49,7 @@

 text="`eval $netcmd`"

 rv=$?

-echo "$text" | awk '

+echo "$text" | gawk '

 /^Rt/	{print $1 "\t: 0x" substr($3, 4, 16) " ports " $2 " "\

 		substr($0, match($0, "#[ \t]*")+RLENGTH)}

 /^ib/	{print $0; next}

diff -r -u /tmp/infiniband-diags-1.5.8/scripts/ibstatus infiniband-diags-1.5.8/scripts/ibstatus

--- /tmp/infiniband-diags-1.5.8/scripts/ibstatus	Wed Feb 16 02:13:21 2011

+++ infiniband-diags-1.5.8/scripts/ibstatus	Fri Feb 25 03:09:27 2011

@@ -2,8 +2,9 @@

 # Usage ibstatus [devname[:port]]

-infiniband_base="/sys/class/infiniband"

-def_ibdev="mthca0"

+ibvdevinfo="/usr/bin/ibv_devinfo"

+ibvdevinfo_results="/tmp/ibvdevinfo.output.$$"

+tmpout="/tmp/tmpout.$$"

 usage() {

 	prog=`basename $0`

@@ -10,58 +11,128 @@

 	echo "Usage: " $prog " [-h] [devname[:portnum]]"

 	echo "	-h:	this help screen"

 	echo "	Examples:"

-	echo "		$prog mthca1		# shows status of all ports of 'mthca1'"

-	echo "		$prog mthca0:2	# shows status port number 2 of 'mthca0'"

-	echo "		$prog		# default: shows status of all '$def_ibdev' ports"

-	exit -1

+	echo "		$prog mlx4_1		# shows status of all ports of 'mlx4_1'"

+	echo "		$prog mlx4_0:2	# shows status port number 2 of 'mlx4_0'"

+	echo "		$prog		# default: shows status of all IB ports"

+	exit 0

 }

-fatal() {

-	echo "Fatal error: " $*

-	exit -1

+get_status_ports() {

+	nawk '

+	BEGIN {

+		hcaid_in="'"$1"'"

+		port_in="'"$2"'"

+		if (hcaid_in == "+") {

+			hcaid_hit=1

+			if (port_in == "+")

+				port_hit=1

+		}

+	}

+	{

+		if ($0 ~ "hca_id") {

+			if (hcaid_in == "+") {

+				cur_hcaid = $2

+			} else if (hcaid_in == $2) {

+				hcaid_hit=1

+				if (port_in == "+")

+					port_hit=1

+			} else if (hcaid_hit == 1)

+				exit 0

+		}

+		if (hcaid_hit == 1) {

+			if ($0 ~ "port:") {

+				if (port_in == "+") {

+					cur_port=$2;

+				} else if (port_in == $2) {

+					port_hit=1

+				} else if (port_hit == 1)

+					exit 0

+			}

+		}

+		if (hcaid_hit == 1 && port_hit == 1) {

+			if ($0 ~ "state:" && $0 !~ "phys_state:") {

+				state=$2;

+				staten=$3

+			} else if ($0 ~ "sm_lid:") {

+				sm_lid=$2

+			} else if ($0 ~ "port_lid:") {

+				port_lid=$2

+			} else if ($0 ~ "active_width:") {

+				width = $2

+				sub("X$", "", width)

+			} else if ($0 ~ "active_speed:") {

+				speed=$2

+			} else if ($0 ~ "phys_state:") {

+				pstate=$2

+				pstaten=$3

+			} else if ($0 ~ "link_layer:") {

+				link=$2

+			} else if ($0 ~ "GID"){

+				gid=$NF

+				if (hcaid_in == "+") {

+					printf("Infiniband device '\''%s'\'' port %d status:\n", cur_hcaid, cur_port);

+				} else if (port_in == "+") {

+					printf("Infiniband device '\''%s'\'' port %d status:\n", hcaid_in, cur_port);

+				} else {

+					printf("Infiniband device '\''%s'\'' port %d status:\n", hcaid_in, port_in);

+				}

+				printf("\tdefault gid:\t%s\n", gid)

+				printf("\tstate:\t\t%d: %s\n", staten, state); 

+				printf("\tphys state:\t%d: %s\n", pstaten, pstate);

+				printf("\tsm lid:\t\t0x%x\n", sm_lid)

+				printf("\tbase lid:\t0x%x\n", port_lid)