[Pkg-ofed-commits] r269 - in branches/ofed-1.4.1upgrade/opensm/trunk: . complib config debian doc include include/opensm libvendor man opensm osmeventplugin osmtest scripts

Guy Coates gmpc-guest at alioth.debian.org
Thu May 28 09:49:16 UTC 2009


Author: gmpc-guest
Date: 2009-05-28 21:49:16 +0000 (Thu, 28 May 2009)
New Revision: 269

Modified:
   branches/ofed-1.4.1upgrade/opensm/trunk/Makefile.in
   branches/ofed-1.4.1upgrade/opensm/trunk/aclocal.m4
   branches/ofed-1.4.1upgrade/opensm/trunk/complib/Makefile.in
   branches/ofed-1.4.1upgrade/opensm/trunk/config/config.guess
   branches/ofed-1.4.1upgrade/opensm/trunk/config/config.sub
   branches/ofed-1.4.1upgrade/opensm/trunk/configure
   branches/ofed-1.4.1upgrade/opensm/trunk/configure.in
   branches/ofed-1.4.1upgrade/opensm/trunk/debian/changelog
   branches/ofed-1.4.1upgrade/opensm/trunk/debian/rules
   branches/ofed-1.4.1upgrade/opensm/trunk/doc/opensm_release_notes-3.2.txt
   branches/ofed-1.4.1upgrade/opensm/trunk/include/Makefile.in
   branches/ofed-1.4.1upgrade/opensm/trunk/include/opensm/osm_config.h
   branches/ofed-1.4.1upgrade/opensm/trunk/include/opensm/osm_version.h
   branches/ofed-1.4.1upgrade/opensm/trunk/libvendor/Makefile.in
   branches/ofed-1.4.1upgrade/opensm/trunk/man/opensm.8
   branches/ofed-1.4.1upgrade/opensm/trunk/opensm.spec
   branches/ofed-1.4.1upgrade/opensm/trunk/opensm/Makefile.in
   branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_node_info_rcv.c
   branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_port_info_rcv.c
   branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_qos_parser_y.c
   branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_qos_parser_y.h
   branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_state_mgr.c
   branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_ucast_mgr.c
   branches/ofed-1.4.1upgrade/opensm/trunk/osmeventplugin/Makefile.in
   branches/ofed-1.4.1upgrade/opensm/trunk/osmtest/Makefile.in
   branches/ofed-1.4.1upgrade/opensm/trunk/scripts/opensm.init
   branches/ofed-1.4.1upgrade/opensm/trunk/scripts/redhat-opensm.init
   branches/ofed-1.4.1upgrade/opensm/trunk/scripts/sldd.sh
Log:
Add new opensm from OFED 1.4.1


Modified: branches/ofed-1.4.1upgrade/opensm/trunk/Makefile.in
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/Makefile.in	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/Makefile.in	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -302,7 +302,7 @@
 	-rm -rf .libs _libs
 
 distclean-libtool:
-	-rm -f libtool
+	-rm -f libtool config.lt
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
@@ -314,8 +314,8 @@
 	  esac; \
 	done; \
 	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
+	  if test -f $$i; then file=$$i; \
+	  else file=$(srcdir)/$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  case "$$ext" in \
 	    8*) ;; \
@@ -424,7 +424,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/aclocal.m4
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/aclocal.m4	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/aclocal.m4	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
@@ -13,13 +13,13 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.63],,
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
 [m4_warning([this file was generated for autoconf 2.63.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,7 @@
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10.2], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -48,12 +48,12 @@
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -303,19 +303,28 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 3
+#serial 4
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
+[# Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file.  Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*)   set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
   # Check whether this is an Automake generated Makefile or not.
@@ -647,13 +656,13 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -670,7 +679,7 @@
 # ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 # -------------------------------------------

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/complib/Makefile.in
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/complib/Makefile.in	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/complib/Makefile.in	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -297,8 +297,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -544,7 +544,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/config/config.guess
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/config/config.guess	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/config/config.guess	2009-05-28 21:49:16 UTC (rev 269)
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2008-09-28'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -813,7 +813,7 @@
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    EM64T | authenticamd | genuineintel)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -952,6 +952,9 @@
 	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -1002,9 +1005,6 @@
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
 		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
-		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
@@ -1235,6 +1235,9 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/config/config.sub
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/config/config.sub	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/config/config.sub	2009-05-28 21:49:16 UTC (rev 269)
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2008-09-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -250,12 +250,14 @@
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
 	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -286,7 +288,7 @@
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -331,12 +333,14 @@
 	| ip2k-* | iq2000-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
 	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -364,14 +368,14 @@
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -459,6 +463,10 @@
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -526,6 +534,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -1146,6 +1158,10 @@
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1266,7 +1282,7 @@
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1406,6 +1422,9 @@
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/configure
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/configure	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/configure	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for opensm 3.2.5_20081207.
+# Generated by GNU Autoconf 2.63 for opensm 3.2.6_20090317.
 #
 # Report bugs to <general at lists.openfabrics.org>.
 #
@@ -745,8 +745,8 @@
 # Identity of this package.
 PACKAGE_NAME='opensm'
 PACKAGE_TARNAME='opensm'
-PACKAGE_VERSION='3.2.5_20081207'
-PACKAGE_STRING='opensm 3.2.5_20081207'
+PACKAGE_VERSION='3.2.6_20090317'
+PACKAGE_STRING='opensm 3.2.6_20090317'
 PACKAGE_BUGREPORT='general at lists.openfabrics.org'
 
 ac_unique_file="opensm/osm_opensm.c"
@@ -1514,7 +1514,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opensm 3.2.5_20081207 to adapt to many kinds of systems.
+\`configure' configures opensm 3.2.6_20090317 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1584,7 +1584,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opensm 3.2.5_20081207:";;
+     short | recursive ) echo "Configuration of opensm 3.2.6_20090317:";;
    esac
   cat <<\_ACEOF
 
@@ -1721,7 +1721,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opensm configure 3.2.5_20081207
+opensm configure 3.2.6_20090317
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1735,7 +1735,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opensm $as_me 3.2.5_20081207, which was
+It was created by opensm $as_me 3.2.6_20090317, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2454,7 +2454,7 @@
 
 # Define the identity of the package.
  PACKAGE='opensm'
- VERSION='3.2.5_20081207'
+ VERSION='3.2.6_20090317'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13813,7 +13813,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opensm $as_me 3.2.5_20081207, which was
+This file was extended by opensm $as_me 3.2.6_20090317, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13876,7 +13876,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-opensm config.status 3.2.5_20081207
+opensm config.status 3.2.6_20090317
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -14926,7 +14926,16 @@
 
 
   case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file.  Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*)   set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
   # Check whether this is an Automake generated Makefile or not.

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/configure.in
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/configure.in	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/configure.in	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(opensm, 3.2.5_20081207, general at lists.openfabrics.org)
+AC_INIT(opensm, 3.2.6_20090317, general at lists.openfabrics.org)
 AC_CONFIG_SRCDIR([opensm/osm_opensm.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS(include/config.h include/opensm/osm_config.h)

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/debian/changelog
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/debian/changelog	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/debian/changelog	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,3 +1,9 @@
+opensm (3.2.6-20090317-1) unstable; urgency=low
+	
+  * OFED 1.4.1 New upstream release
+
+ -- Guy Coates <gmpc at sanger.ac.uk>  Thu, 28 May 2009 22:40:08 +0100
+
 opensm (3.2.5-1) unstable; urgency=low
 
   * Initial release (Closes: #521418) 

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/debian/rules
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/debian/rules	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/debian/rules	2009-05-28 21:49:16 UTC (rev 269)
@@ -25,12 +25,6 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
 	--sysconfdir=/etc --localstatedir=/var/run
 

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/doc/opensm_release_notes-3.2.txt
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/doc/opensm_release_notes-3.2.txt	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/doc/opensm_release_notes-3.2.txt	2009-05-28 21:49:16 UTC (rev 269)
@@ -3,14 +3,14 @@
 
 Version: OpenSM 3.2.x
 Repo:    git://git.openfabrics.org/~sashak/management.git
-Date:    Dec 2008
+Date:    Mar 2009
 
 1 Overview
 ----------
 This document describes the contents of the OpenSM 3.2 release.
 OpenSM is an InfiniBand compliant Subnet Manager and Administration,
 and runs on top of OpenIB. The OpenSM version for this release
-is opensm-3.2.5
+is opensm-3.2.6
 
 This document includes the following sections:
 1 This Overview section (describing new features and software
@@ -316,6 +316,8 @@
 
 * Don't startup automatically on SuSE based systems
 
+* Discovery bug, where some ports were leaved unlinked (without remote side).
+
 4.2 Other Bug Fixes
 
 * opensm/osm_console.c: fix seg fault when running "portstatus ca" in
@@ -396,6 +398,12 @@
 
 * opensm: don't reassign zeroed params from config file
 
+* opensm: update LFTs when entering master
+
+* opensm: invalidate routing cache when entering master state
+
+* opensm/osm_port_info_rcv.c: don't clear sw->need_update if port 0 is active
+
 * Other less critical or visible bugs were also fixed.
 
 5 Main Verification Flows

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/include/Makefile.in
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/include/Makefile.in	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/include/Makefile.in	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -237,8 +237,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -380,7 +380,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/include/opensm/osm_config.h
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/include/opensm/osm_config.h	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/include/opensm/osm_config.h	2009-05-28 21:49:16 UTC (rev 269)
@@ -30,22 +30,22 @@
 /* #undef ENABLE_OSM_PERF_MGR_PROFILE */
 
 /* Define a default node name map file */
-#define HAVE_DEFAULT_NODENAME_MAP "/usr/local/etc/opensm/ib-node-name-map"
+#define HAVE_DEFAULT_NODENAME_MAP "/etc/opensm/ib-node-name-map"
 
 /* Define a default OpenSM config file */
-#define HAVE_DEFAULT_OPENSM_CONFIG_FILE "/usr/local/etc/opensm/opensm.conf"
+#define HAVE_DEFAULT_OPENSM_CONFIG_FILE "/etc/opensm/opensm.conf"
 
 /* Define a Partition config file */
-#define HAVE_DEFAULT_PARTITION_CONFIG_FILE "/usr/local/etc/opensm/partitions.conf"
+#define HAVE_DEFAULT_PARTITION_CONFIG_FILE "/etc/opensm/partitions.conf"
 
 /* Define a Prefix Routes config file */
-#define HAVE_DEFAULT_PREFIX_ROUTES_FILE "/usr/local/etc/opensm/prefix-routes.conf"
+#define HAVE_DEFAULT_PREFIX_ROUTES_FILE "/etc/opensm/prefix-routes.conf"
 
 /* Define a QOS policy config file */
-#define HAVE_DEFAULT_QOS_POLICY_FILE "/usr/local/etc/opensm/qos-policy.conf"
+#define HAVE_DEFAULT_QOS_POLICY_FILE "/etc/opensm/qos-policy.conf"
 
 /* Define OpenSM config directory */
-#define OPENSM_CONFIG_DIR "/usr/local/etc/opensm"
+#define OPENSM_CONFIG_DIR "/etc/opensm"
 
 /* Define as 1 for vapi vendor */
 /* #undef OSM_VENDOR_INTF_MTL */

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/include/opensm/osm_version.h
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/include/opensm/osm_version.h	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/include/opensm/osm_version.h	2009-05-28 21:49:16 UTC (rev 269)
@@ -45,7 +45,7 @@
 *
 * SYNOPSIS
 */
-#define OSM_VERSION "OpenSM 3.2.5_20081207"
+#define OSM_VERSION "OpenSM 3.2.6_20090317"
 /********/
 
 #endif				/* _OSM_VERSION_H_ */

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/libvendor/Makefile.in
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/libvendor/Makefile.in	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/libvendor/Makefile.in	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -346,8 +346,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -647,7 +647,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/man/opensm.8
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/man/opensm.8	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/man/opensm.8	2009-05-28 21:49:16 UTC (rev 269)
@@ -86,7 +86,7 @@
 .TP
 \fB\-F\fR, \fB\-\-config\fR <config file>
 The name of the OpenSM config file. When not specified
-\fB\% /usr/local/etc/opensm/opensm.conf\fP will be used (if exists).
+\fB\% /etc/opensm/opensm.conf\fP will be used (if exists).
 .TP
 \fB\-c\fR, \fB\-\-create-config\fR <file name>
 OpenSM will dump its configuration to the specified file and exit.
@@ -250,21 +250,21 @@
 .TP
 \fB\-P\fR, \fB\-\-Pconfig\fR <partition config file>
 This option defines the optional partition configuration file.
-The default name is \fB\%/usr/local/etc/opensm/partitions.conf\fP.
+The default name is \fB\%/etc/opensm/partitions.conf\fP.
 .TP
 \fB\-\-prefix_routes_file\fR <file name>
 Prefix routes control how the SA responds to path record queries for
 off-subnet DGIDs.  By default, the SA fails such queries. The
 .B PREFIX ROUTES
 section below describes the format of the configuration file.
-The default path is \fB\%/usr/local/etc/opensm/prefix\-routes.conf\fP.
+The default path is \fB\%/etc/opensm/prefix\-routes.conf\fP.
 .TP
 \fB\-Q\fR, \fB\-\-qos\fR
 This option enables QoS setup. It is disabled by default.
 .TP
 \fB\-Y\fR, \fB\-\-qos_policy_file\fR <file name>
 This option defines the optional QoS policy file. The default
-name is \fB\%/usr/local/etc/opensm/qos-policy.conf\fP.
+name is \fB\%/etc/opensm/qos-policy.conf\fP.
 .TP
 \fB\-N\fR, \fB\-\-no_part_enforce\fR
 This option disables partition enforcement on switch external ports.
@@ -377,7 +377,7 @@
 .SH PARTITION CONFIGURATION
 .PP
 The default name of OpenSM partitions configuration file is
-\fB\%/usr/local/etc/opensm/partitions.conf\fP. The default may be changed by using
+\fB\%/etc/opensm/partitions.conf\fP. The default may be changed by using
 --Pconfig (-P) option with OpenSM.
 
 The default partition will be created by OpenSM unconditionally even
@@ -972,23 +972,23 @@
 
 .SH FILES
 .TP
-.B /usr/local/etc/opensm/opensm.conf
+.B /etc/opensm/opensm.conf
 default OpenSM config file.
 
 .TP
-.B /usr/local/etc/opensm/ib-node-name-map
+.B /etc/opensm/ib-node-name-map
 default node name map file.  See ibnetdiscover for more information on format.
 
 .TP
-.B /usr/local/etc/opensm/partitions.conf
+.B /etc/opensm/partitions.conf
 default partition config file
 
 .TP
-.B /usr/local/etc/opensm/qos-policy.conf
+.B /etc/opensm/qos-policy.conf
 default QOS policy config file
 
 .TP
-.B /usr/local/etc/opensm/prefix-routes.conf
+.B /etc/opensm/prefix-routes.conf
 default prefix routes file.
 
 .SH AUTHORS

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/opensm/Makefile.in
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/opensm/Makefile.in	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/opensm/Makefile.in	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -383,8 +383,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -618,7 +618,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_node_info_rcv.c
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_node_info_rcv.c	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_node_info_rcv.c	2009-05-28 21:49:16 UTC (rev 269)
@@ -154,18 +154,17 @@
 		goto _exit;
 	}
 
-	/*
-	   We have seen this neighbor node before, but we might
-	   not have seen this port on the neighbor node before.
-	   We should not set links to an uninitialized port on the
-	   neighbor, so check validity up front.  If it's not
-	   valid, do nothing, since we'll see this link again
-	   when we probe the neighbor.
-	 */
+	/* When setting the link, ports on both
+	   sides of the link should be initialized */
 	if (!osm_node_link_has_valid_ports(p_node, port_num,
 					   p_neighbor_node,
-					   p_ni_context->port_num))
+					   p_ni_context->port_num)) {
+		OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
+			"Link at node 0x%" PRIx64 ", port %u - no valid ports\n",
+			cl_ntoh64(osm_node_get_node_guid(p_node)), port_num);
+		CL_ASSERT(0);
 		goto _exit;
+	}
 
 	if (osm_node_link_exists(p_node, port_num,
 				 p_neighbor_node, p_ni_context->port_num)) {
@@ -537,8 +536,26 @@
 				     IN osm_node_t * const p_node,
 				     IN const osm_madw_t * const p_madw)
 {
+
+	ib_smp_t *p_smp;
+	ib_node_info_t *p_ni;
+	uint8_t port_num;
+
 	OSM_LOG_ENTER(sm->p_log);
 
+	p_smp = osm_madw_get_smp_ptr(p_madw);
+	p_ni = (ib_node_info_t *) ib_smp_get_payload_ptr(p_smp);
+	port_num = ib_node_info_get_local_port_num(p_ni);
+
+	if (!osm_node_get_physp_ptr(p_node, port_num)) {
+		OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
+			"Creating physp for node GUID:0x%"
+			PRIx64 ", port %u\n",
+			cl_ntoh64(osm_node_get_node_guid(p_node)),
+			port_num);
+		osm_node_init_physp(p_node, p_madw);
+	}
+
 	/*
 	   If this switch has already been probed during this sweep,
 	   then don't bother reprobing it.

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_port_info_rcv.c
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_port_info_rcv.c	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_port_info_rcv.c	2009-05-28 21:49:16 UTC (rev 269)
@@ -317,7 +317,7 @@
 	}
 
 	if (ib_port_info_get_port_state(p_pi) > IB_LINK_INIT && p_node->sw &&
-	    p_node->sw->need_update == 1)
+	    p_node->sw->need_update == 1 && port_num != 0)
 		p_node->sw->need_update = 0;
 
 	if (p_physp->need_update)

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_qos_parser_y.c
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_qos_parser_y.c	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_qos_parser_y.c	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
 
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,7 +28,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -47,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -55,175 +54,20 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 
 
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TK_NUMBER = 258,
-     TK_DASH = 259,
-     TK_DOTDOT = 260,
-     TK_COMMA = 261,
-     TK_ASTERISK = 262,
-     TK_TEXT = 263,
-     TK_QOS_ULPS_START = 264,
-     TK_QOS_ULPS_END = 265,
-     TK_PORT_GROUPS_START = 266,
-     TK_PORT_GROUPS_END = 267,
-     TK_PORT_GROUP_START = 268,
-     TK_PORT_GROUP_END = 269,
-     TK_QOS_SETUP_START = 270,
-     TK_QOS_SETUP_END = 271,
-     TK_VLARB_TABLES_START = 272,
-     TK_VLARB_TABLES_END = 273,
-     TK_VLARB_SCOPE_START = 274,
-     TK_VLARB_SCOPE_END = 275,
-     TK_SL2VL_TABLES_START = 276,
-     TK_SL2VL_TABLES_END = 277,
-     TK_SL2VL_SCOPE_START = 278,
-     TK_SL2VL_SCOPE_END = 279,
-     TK_QOS_LEVELS_START = 280,
-     TK_QOS_LEVELS_END = 281,
-     TK_QOS_LEVEL_START = 282,
-     TK_QOS_LEVEL_END = 283,
-     TK_QOS_MATCH_RULES_START = 284,
-     TK_QOS_MATCH_RULES_END = 285,
-     TK_QOS_MATCH_RULE_START = 286,
-     TK_QOS_MATCH_RULE_END = 287,
-     TK_NAME = 288,
-     TK_USE = 289,
-     TK_PORT_GUID = 290,
-     TK_PORT_NAME = 291,
-     TK_PARTITION = 292,
-     TK_NODE_TYPE = 293,
-     TK_GROUP = 294,
-     TK_ACROSS = 295,
-     TK_VLARB_HIGH = 296,
-     TK_VLARB_LOW = 297,
-     TK_VLARB_HIGH_LIMIT = 298,
-     TK_TO = 299,
-     TK_FROM = 300,
-     TK_ACROSS_TO = 301,
-     TK_ACROSS_FROM = 302,
-     TK_SL2VL_TABLE = 303,
-     TK_SL = 304,
-     TK_MTU_LIMIT = 305,
-     TK_RATE_LIMIT = 306,
-     TK_PACKET_LIFE = 307,
-     TK_PATH_BITS = 308,
-     TK_QOS_CLASS = 309,
-     TK_SOURCE = 310,
-     TK_DESTINATION = 311,
-     TK_SERVICE_ID = 312,
-     TK_QOS_LEVEL_NAME = 313,
-     TK_PKEY = 314,
-     TK_NODE_TYPE_ROUTER = 315,
-     TK_NODE_TYPE_CA = 316,
-     TK_NODE_TYPE_SWITCH = 317,
-     TK_NODE_TYPE_SELF = 318,
-     TK_NODE_TYPE_ALL = 319,
-     TK_ULP_DEFAULT = 320,
-     TK_ULP_ANY_SERVICE_ID = 321,
-     TK_ULP_ANY_PKEY = 322,
-     TK_ULP_ANY_TARGET_PORT_GUID = 323,
-     TK_ULP_SDP_DEFAULT = 324,
-     TK_ULP_SDP_PORT = 325,
-     TK_ULP_RDS_DEFAULT = 326,
-     TK_ULP_RDS_PORT = 327,
-     TK_ULP_ISER_DEFAULT = 328,
-     TK_ULP_ISER_PORT = 329,
-     TK_ULP_SRP_GUID = 330,
-     TK_ULP_IPOIB_DEFAULT = 331,
-     TK_ULP_IPOIB_PKEY = 332
-   };
-#endif
-/* Tokens.  */
-#define TK_NUMBER 258
-#define TK_DASH 259
-#define TK_DOTDOT 260
-#define TK_COMMA 261
-#define TK_ASTERISK 262
-#define TK_TEXT 263
-#define TK_QOS_ULPS_START 264
-#define TK_QOS_ULPS_END 265
-#define TK_PORT_GROUPS_START 266
-#define TK_PORT_GROUPS_END 267
-#define TK_PORT_GROUP_START 268
-#define TK_PORT_GROUP_END 269
-#define TK_QOS_SETUP_START 270
-#define TK_QOS_SETUP_END 271
-#define TK_VLARB_TABLES_START 272
-#define TK_VLARB_TABLES_END 273
-#define TK_VLARB_SCOPE_START 274
-#define TK_VLARB_SCOPE_END 275
-#define TK_SL2VL_TABLES_START 276
-#define TK_SL2VL_TABLES_END 277
-#define TK_SL2VL_SCOPE_START 278
-#define TK_SL2VL_SCOPE_END 279
-#define TK_QOS_LEVELS_START 280
-#define TK_QOS_LEVELS_END 281
-#define TK_QOS_LEVEL_START 282
-#define TK_QOS_LEVEL_END 283
-#define TK_QOS_MATCH_RULES_START 284
-#define TK_QOS_MATCH_RULES_END 285
-#define TK_QOS_MATCH_RULE_START 286
-#define TK_QOS_MATCH_RULE_END 287
-#define TK_NAME 288
-#define TK_USE 289
-#define TK_PORT_GUID 290
-#define TK_PORT_NAME 291
-#define TK_PARTITION 292
-#define TK_NODE_TYPE 293
-#define TK_GROUP 294
-#define TK_ACROSS 295
-#define TK_VLARB_HIGH 296
-#define TK_VLARB_LOW 297
-#define TK_VLARB_HIGH_LIMIT 298
-#define TK_TO 299
-#define TK_FROM 300
-#define TK_ACROSS_TO 301
-#define TK_ACROSS_FROM 302
-#define TK_SL2VL_TABLE 303
-#define TK_SL 304
-#define TK_MTU_LIMIT 305
-#define TK_RATE_LIMIT 306
-#define TK_PACKET_LIFE 307
-#define TK_PATH_BITS 308
-#define TK_QOS_CLASS 309
-#define TK_SOURCE 310
-#define TK_DESTINATION 311
-#define TK_SERVICE_ID 312
-#define TK_QOS_LEVEL_NAME 313
-#define TK_PKEY 314
-#define TK_NODE_TYPE_ROUTER 315
-#define TK_NODE_TYPE_CA 316
-#define TK_NODE_TYPE_SWITCH 317
-#define TK_NODE_TYPE_SELF 318
-#define TK_NODE_TYPE_ALL 319
-#define TK_ULP_DEFAULT 320
-#define TK_ULP_ANY_SERVICE_ID 321
-#define TK_ULP_ANY_PKEY 322
-#define TK_ULP_ANY_TARGET_PORT_GUID 323
-#define TK_ULP_SDP_DEFAULT 324
-#define TK_ULP_SDP_PORT 325
-#define TK_ULP_RDS_DEFAULT 326
-#define TK_ULP_RDS_PORT 327
-#define TK_ULP_ISER_DEFAULT 328
-#define TK_ULP_ISER_PORT 329
-#define TK_ULP_SRP_GUID 330
-#define TK_ULP_IPOIB_DEFAULT 331
-#define TK_ULP_IPOIB_PKEY 332
+/* Copy the first part of user declarations.  */
 
-
-
-
-/* Copy the first part of user declarations.  */
+/* Line 189 of yacc.c  */
 #line 1 "osm_qos_parser_y.y"
 
 /*
@@ -411,6 +255,9 @@
 
 
 
+/* Line 189 of yacc.c  */
+#line 260 "osm_qos_parser_y.c"
+
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -429,20 +276,183 @@
 # define YYTOKEN_TABLE 0
 #endif
 
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     TK_NUMBER = 258,
+     TK_DASH = 259,
+     TK_DOTDOT = 260,
+     TK_COMMA = 261,
+     TK_ASTERISK = 262,
+     TK_TEXT = 263,
+     TK_QOS_ULPS_START = 264,
+     TK_QOS_ULPS_END = 265,
+     TK_PORT_GROUPS_START = 266,
+     TK_PORT_GROUPS_END = 267,
+     TK_PORT_GROUP_START = 268,
+     TK_PORT_GROUP_END = 269,
+     TK_QOS_SETUP_START = 270,
+     TK_QOS_SETUP_END = 271,
+     TK_VLARB_TABLES_START = 272,
+     TK_VLARB_TABLES_END = 273,
+     TK_VLARB_SCOPE_START = 274,
+     TK_VLARB_SCOPE_END = 275,
+     TK_SL2VL_TABLES_START = 276,
+     TK_SL2VL_TABLES_END = 277,
+     TK_SL2VL_SCOPE_START = 278,
+     TK_SL2VL_SCOPE_END = 279,
+     TK_QOS_LEVELS_START = 280,
+     TK_QOS_LEVELS_END = 281,
+     TK_QOS_LEVEL_START = 282,
+     TK_QOS_LEVEL_END = 283,
+     TK_QOS_MATCH_RULES_START = 284,
+     TK_QOS_MATCH_RULES_END = 285,
+     TK_QOS_MATCH_RULE_START = 286,
+     TK_QOS_MATCH_RULE_END = 287,
+     TK_NAME = 288,
+     TK_USE = 289,
+     TK_PORT_GUID = 290,
+     TK_PORT_NAME = 291,
+     TK_PARTITION = 292,
+     TK_NODE_TYPE = 293,
+     TK_GROUP = 294,
+     TK_ACROSS = 295,
+     TK_VLARB_HIGH = 296,
+     TK_VLARB_LOW = 297,
+     TK_VLARB_HIGH_LIMIT = 298,
+     TK_TO = 299,
+     TK_FROM = 300,
+     TK_ACROSS_TO = 301,
+     TK_ACROSS_FROM = 302,
+     TK_SL2VL_TABLE = 303,
+     TK_SL = 304,
+     TK_MTU_LIMIT = 305,
+     TK_RATE_LIMIT = 306,
+     TK_PACKET_LIFE = 307,
+     TK_PATH_BITS = 308,
+     TK_QOS_CLASS = 309,
+     TK_SOURCE = 310,
+     TK_DESTINATION = 311,
+     TK_SERVICE_ID = 312,
+     TK_QOS_LEVEL_NAME = 313,
+     TK_PKEY = 314,
+     TK_NODE_TYPE_ROUTER = 315,
+     TK_NODE_TYPE_CA = 316,
+     TK_NODE_TYPE_SWITCH = 317,
+     TK_NODE_TYPE_SELF = 318,
+     TK_NODE_TYPE_ALL = 319,
+     TK_ULP_DEFAULT = 320,
+     TK_ULP_ANY_SERVICE_ID = 321,
+     TK_ULP_ANY_PKEY = 322,
+     TK_ULP_ANY_TARGET_PORT_GUID = 323,
+     TK_ULP_SDP_DEFAULT = 324,
+     TK_ULP_SDP_PORT = 325,
+     TK_ULP_RDS_DEFAULT = 326,
+     TK_ULP_RDS_PORT = 327,
+     TK_ULP_ISER_DEFAULT = 328,
+     TK_ULP_ISER_PORT = 329,
+     TK_ULP_SRP_GUID = 330,
+     TK_ULP_IPOIB_DEFAULT = 331,
+     TK_ULP_IPOIB_PKEY = 332
+   };
+#endif
+/* Tokens.  */
+#define TK_NUMBER 258
+#define TK_DASH 259
+#define TK_DOTDOT 260
+#define TK_COMMA 261
+#define TK_ASTERISK 262
+#define TK_TEXT 263
+#define TK_QOS_ULPS_START 264
+#define TK_QOS_ULPS_END 265
+#define TK_PORT_GROUPS_START 266
+#define TK_PORT_GROUPS_END 267
+#define TK_PORT_GROUP_START 268
+#define TK_PORT_GROUP_END 269
+#define TK_QOS_SETUP_START 270
+#define TK_QOS_SETUP_END 271
+#define TK_VLARB_TABLES_START 272
+#define TK_VLARB_TABLES_END 273
+#define TK_VLARB_SCOPE_START 274
+#define TK_VLARB_SCOPE_END 275
+#define TK_SL2VL_TABLES_START 276
+#define TK_SL2VL_TABLES_END 277
+#define TK_SL2VL_SCOPE_START 278
+#define TK_SL2VL_SCOPE_END 279
+#define TK_QOS_LEVELS_START 280
+#define TK_QOS_LEVELS_END 281
+#define TK_QOS_LEVEL_START 282
+#define TK_QOS_LEVEL_END 283
+#define TK_QOS_MATCH_RULES_START 284
+#define TK_QOS_MATCH_RULES_END 285
+#define TK_QOS_MATCH_RULE_START 286
+#define TK_QOS_MATCH_RULE_END 287
+#define TK_NAME 288
+#define TK_USE 289
+#define TK_PORT_GUID 290
+#define TK_PORT_NAME 291
+#define TK_PARTITION 292
+#define TK_NODE_TYPE 293
+#define TK_GROUP 294
+#define TK_ACROSS 295
+#define TK_VLARB_HIGH 296
+#define TK_VLARB_LOW 297
+#define TK_VLARB_HIGH_LIMIT 298
+#define TK_TO 299
+#define TK_FROM 300
+#define TK_ACROSS_TO 301
+#define TK_ACROSS_FROM 302
+#define TK_SL2VL_TABLE 303
+#define TK_SL 304
+#define TK_MTU_LIMIT 305
+#define TK_RATE_LIMIT 306
+#define TK_PACKET_LIFE 307
+#define TK_PATH_BITS 308
+#define TK_QOS_CLASS 309
+#define TK_SOURCE 310
+#define TK_DESTINATION 311
+#define TK_SERVICE_ID 312
+#define TK_QOS_LEVEL_NAME 313
+#define TK_PKEY 314
+#define TK_NODE_TYPE_ROUTER 315
+#define TK_NODE_TYPE_CA 316
+#define TK_NODE_TYPE_SWITCH 317
+#define TK_NODE_TYPE_SELF 318
+#define TK_NODE_TYPE_ALL 319
+#define TK_ULP_DEFAULT 320
+#define TK_ULP_ANY_SERVICE_ID 321
+#define TK_ULP_ANY_PKEY 322
+#define TK_ULP_ANY_TARGET_PORT_GUID 323
+#define TK_ULP_SDP_DEFAULT 324
+#define TK_ULP_SDP_PORT 325
+#define TK_ULP_RDS_DEFAULT 326
+#define TK_ULP_RDS_PORT 327
+#define TK_ULP_ISER_DEFAULT 328
+#define TK_ULP_ISER_PORT 329
+#define TK_ULP_SRP_GUID 330
+#define TK_ULP_IPOIB_DEFAULT 331
+#define TK_ULP_IPOIB_PKEY 332
+
+
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
-
 /* Copy the second part of user declarations.  */
 
 
-/* Line 216 of yacc.c.  */
-#line 446 "osm_qos_parser_y.c"
+/* Line 264 of yacc.c  */
+#line 456 "osm_qos_parser_y.c"
 
 #ifdef short
 # undef short
@@ -517,14 +527,14 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int i)
+YYID (int yyi)
 #else
 static int
-YYID (i)
-    int i;
+YYID (yyi)
+    int yyi;
 #endif
 {
-  return i;
+  return yyi;
 }
 #endif
 
@@ -605,9 +615,9 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -641,12 +651,12 @@
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -879,28 +889,28 @@
   "qos_level_end", "qos_level_entries", "qos_level_entry",
   "qos_match_rules_section", "qos_match_rules", "qos_match_rule",
   "qos_match_rule_start", "qos_match_rule_end", "qos_match_rule_entries",
-  "qos_match_rule_entry", "qos_ulp", "@1", "@2", "@3", "@4", "@5", "@6",
-  "@7", "@8", "@9", "@10", "@11", "@12", "qos_ulp_type_any_service",
-  "qos_ulp_type_any_pkey", "qos_ulp_type_any_target_port_guid",
-  "qos_ulp_type_sdp_default", "qos_ulp_type_sdp_port",
-  "qos_ulp_type_rds_default", "qos_ulp_type_rds_port",
-  "qos_ulp_type_iser_default", "qos_ulp_type_iser_port",
-  "qos_ulp_type_srp_guid", "qos_ulp_type_ipoib_default",
-  "qos_ulp_type_ipoib_pkey", "qos_ulp_sl", "port_group_name",
-  "port_group_name_start", "port_group_use", "port_group_use_start",
-  "port_group_port_name", "port_group_port_name_start",
-  "port_group_port_guid", "port_group_port_guid_start", "port_group_pkey",
-  "port_group_pkey_start", "port_group_partition",
-  "port_group_partition_start", "port_group_node_type",
-  "port_group_node_type_start", "port_group_node_type_list",
-  "node_type_item", "node_type_ca", "node_type_switch", "node_type_router",
-  "node_type_all", "node_type_self", "vlarb_scope_group",
-  "vlarb_scope_group_start", "vlarb_scope_across",
-  "vlarb_scope_across_start", "vlarb_scope_vlarb_high_limit",
-  "vlarb_scope_vlarb_high_limit_start", "vlarb_scope_vlarb_high",
-  "vlarb_scope_vlarb_high_start", "vlarb_scope_vlarb_low",
-  "vlarb_scope_vlarb_low_start", "sl2vl_scope_group",
-  "sl2vl_scope_group_start", "sl2vl_scope_across",
+  "qos_match_rule_entry", "qos_ulp", "$@1", "$@2", "$@3", "$@4", "$@5",
+  "$@6", "$@7", "$@8", "$@9", "$@10", "$@11", "$@12",
+  "qos_ulp_type_any_service", "qos_ulp_type_any_pkey",
+  "qos_ulp_type_any_target_port_guid", "qos_ulp_type_sdp_default",
+  "qos_ulp_type_sdp_port", "qos_ulp_type_rds_default",
+  "qos_ulp_type_rds_port", "qos_ulp_type_iser_default",
+  "qos_ulp_type_iser_port", "qos_ulp_type_srp_guid",
+  "qos_ulp_type_ipoib_default", "qos_ulp_type_ipoib_pkey", "qos_ulp_sl",
+  "port_group_name", "port_group_name_start", "port_group_use",
+  "port_group_use_start", "port_group_port_name",
+  "port_group_port_name_start", "port_group_port_guid",
+  "port_group_port_guid_start", "port_group_pkey", "port_group_pkey_start",
+  "port_group_partition", "port_group_partition_start",
+  "port_group_node_type", "port_group_node_type_start",
+  "port_group_node_type_list", "node_type_item", "node_type_ca",
+  "node_type_switch", "node_type_router", "node_type_all",
+  "node_type_self", "vlarb_scope_group", "vlarb_scope_group_start",
+  "vlarb_scope_across", "vlarb_scope_across_start",
+  "vlarb_scope_vlarb_high_limit", "vlarb_scope_vlarb_high_limit_start",
+  "vlarb_scope_vlarb_high", "vlarb_scope_vlarb_high_start",
+  "vlarb_scope_vlarb_low", "vlarb_scope_vlarb_low_start",
+  "sl2vl_scope_group", "sl2vl_scope_group_start", "sl2vl_scope_across",
   "sl2vl_scope_across_start", "sl2vl_scope_across_from",
   "sl2vl_scope_across_from_start", "sl2vl_scope_across_to",
   "sl2vl_scope_across_to_start", "sl2vl_scope_from",
@@ -1416,17 +1426,20 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 #else
 static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
 
@@ -1460,11 +1473,11 @@
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "\n");
     }
 }
 
@@ -1744,10 +1757,8 @@
 	break;
     }
 }
-
 
 /* Prevent warnings from -Wmissing-prototypes.  */
-
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -1763,11 +1774,10 @@
 #endif /* ! YYPARSE_PARAM */
 
 
-
-/* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1775,9 +1785,9 @@
 
 
 
-/*----------.
-| yyparse.  |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1801,66 +1811,68 @@
 #endif
 #endif
 {
-  
-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
 
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
 
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
 
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
 
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
 
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+    YYSIZE_T yystacksize;
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
+  yychar = YYEMPTY; /* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
-
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -1890,7 +1902,6 @@
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
-
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -1898,7 +1909,6 @@
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
-
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1921,9 +1931,8 @@
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1934,7 +1943,6 @@
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1944,6 +1952,9 @@
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
   goto yybackup;
 
 /*-----------.
@@ -1952,16 +1963,16 @@
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1993,20 +2004,16 @@
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -2046,6 +2053,8 @@
   switch (yyn)
     {
         case 17:
+
+/* Line 1455 of yacc.c  */
 #line 354 "osm_qos_parser_y.y"
     {
                         __parser_port_group_start();
@@ -2053,6 +2062,8 @@
     break;
 
   case 18:
+
+/* Line 1455 of yacc.c  */
 #line 359 "osm_qos_parser_y.y"
     {
                         if ( __parser_port_group_end() )
@@ -2061,6 +2072,8 @@
     break;
 
   case 36:
+
+/* Line 1455 of yacc.c  */
 #line 422 "osm_qos_parser_y.y"
     {
                         __parser_vlarb_scope_start();
@@ -2068,6 +2081,8 @@
     break;
 
   case 37:
+
+/* Line 1455 of yacc.c  */
 #line 427 "osm_qos_parser_y.y"
     {
                         if ( __parser_vlarb_scope_end() )
@@ -2076,6 +2091,8 @@
     break;
 
   case 49:
+
+/* Line 1455 of yacc.c  */
 #line 468 "osm_qos_parser_y.y"
     {
                         __parser_sl2vl_scope_start();
@@ -2083,6 +2100,8 @@
     break;
 
   case 50:
+
+/* Line 1455 of yacc.c  */
 #line 473 "osm_qos_parser_y.y"
     {
                         if ( __parser_sl2vl_scope_end() )
@@ -2091,6 +2110,8 @@
     break;
 
   case 64:
+
+/* Line 1455 of yacc.c  */
 #line 539 "osm_qos_parser_y.y"
     {
                         __parser_qos_level_start();
@@ -2098,6 +2119,8 @@
     break;
 
   case 65:
+
+/* Line 1455 of yacc.c  */
 #line 544 "osm_qos_parser_y.y"
     {
                         if ( __parser_qos_level_end() )
@@ -2106,6 +2129,8 @@
     break;
 
   case 80:
+
+/* Line 1455 of yacc.c  */
 #line 593 "osm_qos_parser_y.y"
     {
                         __parser_match_rule_start();
@@ -2113,6 +2138,8 @@
     break;
 
   case 81:
+
+/* Line 1455 of yacc.c  */
 #line 598 "osm_qos_parser_y.y"
     {
                         if ( __parser_match_rule_end() )
@@ -2121,6 +2148,8 @@
     break;
 
   case 91:
+
+/* Line 1455 of yacc.c  */
 #line 636 "osm_qos_parser_y.y"
     {
                         /* parsing default ulp rule: "default: num" */
@@ -2142,6 +2171,8 @@
     break;
 
   case 92:
+
+/* Line 1455 of yacc.c  */
 #line 654 "osm_qos_parser_y.y"
     {
                         /* "any, service-id ... : sl" - one instance of list of ranges */
@@ -2166,6 +2197,8 @@
     break;
 
   case 94:
+
+/* Line 1455 of yacc.c  */
 #line 675 "osm_qos_parser_y.y"
     {
                         /* "any, pkey ... : sl" - one instance of list of ranges */
@@ -2190,6 +2223,8 @@
     break;
 
   case 96:
+
+/* Line 1455 of yacc.c  */
 #line 696 "osm_qos_parser_y.y"
     {
                         /* any, target-port-guid ... : sl */
@@ -2228,6 +2263,8 @@
     break;
 
   case 98:
+
+/* Line 1455 of yacc.c  */
 #line 731 "osm_qos_parser_y.y"
     {
                         /* "sdp : sl" - default SL for SDP */
@@ -2244,6 +2281,8 @@
     break;
 
   case 100:
+
+/* Line 1455 of yacc.c  */
 #line 744 "osm_qos_parser_y.y"
     {
                         /* sdp with port numbers */
@@ -2280,6 +2319,8 @@
     break;
 
   case 102:
+
+/* Line 1455 of yacc.c  */
 #line 777 "osm_qos_parser_y.y"
     {
                         /* "rds : sl" - default SL for RDS */
@@ -2296,6 +2337,8 @@
     break;
 
   case 104:
+
+/* Line 1455 of yacc.c  */
 #line 790 "osm_qos_parser_y.y"
     {
                         /* rds with port numbers */
@@ -2332,6 +2375,8 @@
     break;
 
   case 106:
+
+/* Line 1455 of yacc.c  */
 #line 823 "osm_qos_parser_y.y"
     {
                         /* "iSER : sl" - default SL for iSER */
@@ -2348,6 +2393,8 @@
     break;
 
   case 108:
+
+/* Line 1455 of yacc.c  */
 #line 836 "osm_qos_parser_y.y"
     {
                         /* iser with port numbers */
@@ -2384,6 +2431,8 @@
     break;
 
   case 110:
+
+/* Line 1455 of yacc.c  */
 #line 869 "osm_qos_parser_y.y"
     {
                         /* srp with target guids - this rule is similar
@@ -2423,6 +2472,8 @@
     break;
 
   case 112:
+
+/* Line 1455 of yacc.c  */
 #line 905 "osm_qos_parser_y.y"
     {
                         /* ipoib w/o any pkeys (default pkey) */
@@ -2446,6 +2497,8 @@
     break;
 
   case 114:
+
+/* Line 1455 of yacc.c  */
 #line 925 "osm_qos_parser_y.y"
     {
                         /* ipoib with pkeys */
@@ -2479,66 +2532,92 @@
     break;
 
   case 116:
+
+/* Line 1455 of yacc.c  */
 #line 957 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 117:
+
+/* Line 1455 of yacc.c  */
 #line 960 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 118:
+
+/* Line 1455 of yacc.c  */
 #line 963 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 119:
+
+/* Line 1455 of yacc.c  */
 #line 966 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 120:
+
+/* Line 1455 of yacc.c  */
 #line 969 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 121:
+
+/* Line 1455 of yacc.c  */
 #line 972 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 122:
+
+/* Line 1455 of yacc.c  */
 #line 975 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 123:
+
+/* Line 1455 of yacc.c  */
 #line 978 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 124:
+
+/* Line 1455 of yacc.c  */
 #line 981 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 125:
+
+/* Line 1455 of yacc.c  */
 #line 984 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 126:
+
+/* Line 1455 of yacc.c  */
 #line 987 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 127:
+
+/* Line 1455 of yacc.c  */
 #line 990 "osm_qos_parser_y.y"
     { __parser_ulp_match_rule_start(); }
     break;
 
   case 128:
+
+/* Line 1455 of yacc.c  */
 #line 993 "osm_qos_parser_y.y"
     {
                         /* get the SL for ULP rules */
@@ -2569,6 +2648,8 @@
     break;
 
   case 129:
+
+/* Line 1455 of yacc.c  */
 #line 1032 "osm_qos_parser_y.y"
     {
                             /* 'name' of 'port-group' - one instance */
@@ -2594,6 +2675,8 @@
     break;
 
   case 130:
+
+/* Line 1455 of yacc.c  */
 #line 1055 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2601,6 +2684,8 @@
     break;
 
   case 131:
+
+/* Line 1455 of yacc.c  */
 #line 1060 "osm_qos_parser_y.y"
     {
                             /* 'use' of 'port-group' - one instance */
@@ -2626,6 +2711,8 @@
     break;
 
   case 132:
+
+/* Line 1455 of yacc.c  */
 #line 1083 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2633,6 +2720,8 @@
     break;
 
   case 133:
+
+/* Line 1455 of yacc.c  */
 #line 1088 "osm_qos_parser_y.y"
     {
                             /* 'port-name' in 'port-group' - any num of instances */
@@ -2701,6 +2790,8 @@
     break;
 
   case 134:
+
+/* Line 1455 of yacc.c  */
 #line 1154 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2708,6 +2799,8 @@
     break;
 
   case 135:
+
+/* Line 1455 of yacc.c  */
 #line 1159 "osm_qos_parser_y.y"
     {
                             /* 'port-guid' in 'port-group' - any num of instances */
@@ -2730,6 +2823,8 @@
     break;
 
   case 136:
+
+/* Line 1455 of yacc.c  */
 #line 1179 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2737,6 +2832,8 @@
     break;
 
   case 137:
+
+/* Line 1455 of yacc.c  */
 #line 1184 "osm_qos_parser_y.y"
     {
                             /* 'pkey' in 'port-group' - any num of instances */
@@ -2759,6 +2856,8 @@
     break;
 
   case 138:
+
+/* Line 1455 of yacc.c  */
 #line 1204 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2766,6 +2865,8 @@
     break;
 
   case 139:
+
+/* Line 1455 of yacc.c  */
 #line 1209 "osm_qos_parser_y.y"
     {
                             /* 'partition' in 'port-group' - any num of instances */
@@ -2776,6 +2877,8 @@
     break;
 
   case 140:
+
+/* Line 1455 of yacc.c  */
 #line 1217 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2783,6 +2886,8 @@
     break;
 
   case 141:
+
+/* Line 1455 of yacc.c  */
 #line 1222 "osm_qos_parser_y.y"
     {
                             /* 'node-type' in 'port-group' - any num of instances */
@@ -2790,6 +2895,8 @@
     break;
 
   case 142:
+
+/* Line 1455 of yacc.c  */
 #line 1227 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2797,6 +2904,8 @@
     break;
 
   case 150:
+
+/* Line 1455 of yacc.c  */
 #line 1243 "osm_qos_parser_y.y"
     {
                             p_current_port_group->node_types |=
@@ -2805,6 +2914,8 @@
     break;
 
   case 151:
+
+/* Line 1455 of yacc.c  */
 #line 1249 "osm_qos_parser_y.y"
     {
                             p_current_port_group->node_types |=
@@ -2813,6 +2924,8 @@
     break;
 
   case 152:
+
+/* Line 1455 of yacc.c  */
 #line 1255 "osm_qos_parser_y.y"
     {
                             p_current_port_group->node_types |=
@@ -2821,6 +2934,8 @@
     break;
 
   case 153:
+
+/* Line 1455 of yacc.c  */
 #line 1261 "osm_qos_parser_y.y"
     {
                             p_current_port_group->node_types |=
@@ -2831,6 +2946,8 @@
     break;
 
   case 154:
+
+/* Line 1455 of yacc.c  */
 #line 1269 "osm_qos_parser_y.y"
     {
                             osm_port_t * p_osm_port =
@@ -2844,6 +2961,8 @@
     break;
 
   case 155:
+
+/* Line 1455 of yacc.c  */
 #line 1291 "osm_qos_parser_y.y"
     {
                             /* 'group' in 'vlarb-scope' - any num of instances */
@@ -2863,6 +2982,8 @@
     break;
 
   case 156:
+
+/* Line 1455 of yacc.c  */
 #line 1308 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2870,6 +2991,8 @@
     break;
 
   case 157:
+
+/* Line 1455 of yacc.c  */
 #line 1313 "osm_qos_parser_y.y"
     {
                             /* 'across' in 'vlarb-scope' - any num of instances */
@@ -2889,6 +3012,8 @@
     break;
 
   case 158:
+
+/* Line 1455 of yacc.c  */
 #line 1330 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2896,6 +3021,8 @@
     break;
 
   case 159:
+
+/* Line 1455 of yacc.c  */
 #line 1335 "osm_qos_parser_y.y"
     {
                             /* 'vl-high-limit' in 'vlarb-scope' - one instance of one number */
@@ -2916,6 +3043,8 @@
     break;
 
   case 160:
+
+/* Line 1455 of yacc.c  */
 #line 1353 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2923,6 +3052,8 @@
     break;
 
   case 161:
+
+/* Line 1455 of yacc.c  */
 #line 1358 "osm_qos_parser_y.y"
     {
                             /* 'vlarb-high' in 'vlarb-scope' - list of pairs of numbers with ':' and ',' */
@@ -2942,6 +3073,8 @@
     break;
 
   case 162:
+
+/* Line 1455 of yacc.c  */
 #line 1375 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2949,6 +3082,8 @@
     break;
 
   case 163:
+
+/* Line 1455 of yacc.c  */
 #line 1380 "osm_qos_parser_y.y"
     {
                             /* 'vlarb-low' in 'vlarb-scope' - list of pairs of numbers with ':' and ',' */
@@ -2968,6 +3103,8 @@
     break;
 
   case 164:
+
+/* Line 1455 of yacc.c  */
 #line 1397 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -2975,6 +3112,8 @@
     break;
 
   case 165:
+
+/* Line 1455 of yacc.c  */
 #line 1413 "osm_qos_parser_y.y"
     {
                             /* 'group' in 'sl2vl-scope' - any num of instances */
@@ -2994,6 +3133,8 @@
     break;
 
   case 166:
+
+/* Line 1455 of yacc.c  */
 #line 1430 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3001,6 +3142,8 @@
     break;
 
   case 167:
+
+/* Line 1455 of yacc.c  */
 #line 1435 "osm_qos_parser_y.y"
     {
                             /* 'across' in 'sl2vl-scope' - any num of instances */
@@ -3022,6 +3165,8 @@
     break;
 
   case 168:
+
+/* Line 1455 of yacc.c  */
 #line 1454 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3029,6 +3174,8 @@
     break;
 
   case 169:
+
+/* Line 1455 of yacc.c  */
 #line 1459 "osm_qos_parser_y.y"
     {
                             /* 'across-from' in 'sl2vl-scope' - any num of instances */
@@ -3048,6 +3195,8 @@
     break;
 
   case 170:
+
+/* Line 1455 of yacc.c  */
 #line 1476 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3055,6 +3204,8 @@
     break;
 
   case 171:
+
+/* Line 1455 of yacc.c  */
 #line 1481 "osm_qos_parser_y.y"
     {
                             /* 'across-to' in 'sl2vl-scope' - any num of instances */
@@ -3075,6 +3226,8 @@
     break;
 
   case 172:
+
+/* Line 1455 of yacc.c  */
 #line 1499 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3082,6 +3235,8 @@
     break;
 
   case 173:
+
+/* Line 1455 of yacc.c  */
 #line 1504 "osm_qos_parser_y.y"
     {
                             /* 'from' in 'sl2vl-scope' - any num of instances */
@@ -3089,6 +3244,8 @@
     break;
 
   case 174:
+
+/* Line 1455 of yacc.c  */
 #line 1509 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3096,6 +3253,8 @@
     break;
 
   case 175:
+
+/* Line 1455 of yacc.c  */
 #line 1514 "osm_qos_parser_y.y"
     {
                             /* 'to' in 'sl2vl-scope' - any num of instances */
@@ -3103,6 +3262,8 @@
     break;
 
   case 176:
+
+/* Line 1455 of yacc.c  */
 #line 1519 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3110,6 +3271,8 @@
     break;
 
   case 179:
+
+/* Line 1455 of yacc.c  */
 #line 1528 "osm_qos_parser_y.y"
     {
                             int i;
@@ -3119,6 +3282,8 @@
     break;
 
   case 182:
+
+/* Line 1455 of yacc.c  */
 #line 1539 "osm_qos_parser_y.y"
     {
                             int i;
@@ -3128,6 +3293,8 @@
     break;
 
   case 183:
+
+/* Line 1455 of yacc.c  */
 #line 1546 "osm_qos_parser_y.y"
     {
                             int i;
@@ -3162,6 +3329,8 @@
     break;
 
   case 184:
+
+/* Line 1455 of yacc.c  */
 #line 1578 "osm_qos_parser_y.y"
     {
                             int i;
@@ -3196,6 +3365,8 @@
     break;
 
   case 185:
+
+/* Line 1455 of yacc.c  */
 #line 1611 "osm_qos_parser_y.y"
     {
                             /* 'sl2vl-table' - one instance of exactly
@@ -3241,6 +3412,8 @@
     break;
 
   case 186:
+
+/* Line 1455 of yacc.c  */
 #line 1654 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3248,6 +3421,8 @@
     break;
 
   case 187:
+
+/* Line 1455 of yacc.c  */
 #line 1671 "osm_qos_parser_y.y"
     {
                             /* 'name' of 'qos-level' - one instance */
@@ -3273,6 +3448,8 @@
     break;
 
   case 188:
+
+/* Line 1455 of yacc.c  */
 #line 1694 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3280,6 +3457,8 @@
     break;
 
   case 189:
+
+/* Line 1455 of yacc.c  */
 #line 1699 "osm_qos_parser_y.y"
     {
                             /* 'use' of 'qos-level' - one instance */
@@ -3305,6 +3484,8 @@
     break;
 
   case 190:
+
+/* Line 1455 of yacc.c  */
 #line 1722 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3312,6 +3493,8 @@
     break;
 
   case 191:
+
+/* Line 1455 of yacc.c  */
 #line 1727 "osm_qos_parser_y.y"
     {
                             /* 'sl' in 'qos-level' - one instance */
@@ -3334,6 +3517,8 @@
     break;
 
   case 192:
+
+/* Line 1455 of yacc.c  */
 #line 1747 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3341,6 +3526,8 @@
     break;
 
   case 193:
+
+/* Line 1455 of yacc.c  */
 #line 1752 "osm_qos_parser_y.y"
     {
                             /* 'mtu-limit' in 'qos-level' - one instance */
@@ -3363,6 +3550,8 @@
     break;
 
   case 194:
+
+/* Line 1455 of yacc.c  */
 #line 1772 "osm_qos_parser_y.y"
     {
                             /* 'mtu-limit' in 'qos-level' - one instance */
@@ -3371,6 +3560,8 @@
     break;
 
   case 195:
+
+/* Line 1455 of yacc.c  */
 #line 1778 "osm_qos_parser_y.y"
     {
                             /* 'rate-limit' in 'qos-level' - one instance */
@@ -3393,6 +3584,8 @@
     break;
 
   case 196:
+
+/* Line 1455 of yacc.c  */
 #line 1798 "osm_qos_parser_y.y"
     {
                             /* 'rate-limit' in 'qos-level' - one instance */
@@ -3401,6 +3594,8 @@
     break;
 
   case 197:
+
+/* Line 1455 of yacc.c  */
 #line 1804 "osm_qos_parser_y.y"
     {
                             /* 'packet-life' in 'qos-level' - one instance */
@@ -3423,6 +3618,8 @@
     break;
 
   case 198:
+
+/* Line 1455 of yacc.c  */
 #line 1824 "osm_qos_parser_y.y"
     {
                             /* 'packet-life' in 'qos-level' - one instance */
@@ -3431,6 +3628,8 @@
     break;
 
   case 199:
+
+/* Line 1455 of yacc.c  */
 #line 1830 "osm_qos_parser_y.y"
     {
                             /* 'path-bits' in 'qos-level' - any num of instances */
@@ -3468,6 +3667,8 @@
     break;
 
   case 200:
+
+/* Line 1455 of yacc.c  */
 #line 1865 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3475,6 +3676,8 @@
     break;
 
   case 201:
+
+/* Line 1455 of yacc.c  */
 #line 1870 "osm_qos_parser_y.y"
     {
                             /* 'pkey' in 'qos-level' - num of instances of list of ranges */
@@ -3510,6 +3713,8 @@
     break;
 
   case 202:
+
+/* Line 1455 of yacc.c  */
 #line 1903 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3517,6 +3722,8 @@
     break;
 
   case 203:
+
+/* Line 1455 of yacc.c  */
 #line 1920 "osm_qos_parser_y.y"
     {
                             /* 'use' of 'qos-match-rule' - one instance */
@@ -3542,6 +3749,8 @@
     break;
 
   case 204:
+
+/* Line 1455 of yacc.c  */
 #line 1943 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3549,6 +3758,8 @@
     break;
 
   case 205:
+
+/* Line 1455 of yacc.c  */
 #line 1948 "osm_qos_parser_y.y"
     {
                             /* 'qos-class' in 'qos-match-rule' - num of instances of list of ranges */
@@ -3585,6 +3796,8 @@
     break;
 
   case 206:
+
+/* Line 1455 of yacc.c  */
 #line 1982 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3592,6 +3805,8 @@
     break;
 
   case 207:
+
+/* Line 1455 of yacc.c  */
 #line 1987 "osm_qos_parser_y.y"
     {
                             /* 'source' in 'qos-match-rule' - text */
@@ -3611,6 +3826,8 @@
     break;
 
   case 208:
+
+/* Line 1455 of yacc.c  */
 #line 2004 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3618,6 +3835,8 @@
     break;
 
   case 209:
+
+/* Line 1455 of yacc.c  */
 #line 2009 "osm_qos_parser_y.y"
     {
                             /* 'destination' in 'qos-match-rule' - text */
@@ -3637,6 +3856,8 @@
     break;
 
   case 210:
+
+/* Line 1455 of yacc.c  */
 #line 2026 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3644,6 +3865,8 @@
     break;
 
   case 211:
+
+/* Line 1455 of yacc.c  */
 #line 2031 "osm_qos_parser_y.y"
     {
                             /* 'qos-level-name' in 'qos-match-rule' - single string */
@@ -3669,6 +3892,8 @@
     break;
 
   case 212:
+
+/* Line 1455 of yacc.c  */
 #line 2054 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3676,6 +3901,8 @@
     break;
 
   case 213:
+
+/* Line 1455 of yacc.c  */
 #line 2059 "osm_qos_parser_y.y"
     {
                             /* 'service-id' in 'qos-match-rule' - num of instances of list of ranges */
@@ -3711,6 +3938,8 @@
     break;
 
   case 214:
+
+/* Line 1455 of yacc.c  */
 #line 2092 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3718,6 +3947,8 @@
     break;
 
   case 215:
+
+/* Line 1455 of yacc.c  */
 #line 2097 "osm_qos_parser_y.y"
     {
                             /* 'pkey' in 'qos-match-rule' - num of instances of list of ranges */
@@ -3753,6 +3984,8 @@
     break;
 
   case 216:
+
+/* Line 1455 of yacc.c  */
 #line 2130 "osm_qos_parser_y.y"
     {
                             RESET_BUFFER;
@@ -3760,6 +3993,8 @@
     break;
 
   case 217:
+
+/* Line 1455 of yacc.c  */
 #line 2141 "osm_qos_parser_y.y"
     {
                         cl_list_insert_tail(&tmp_parser_struct.str_list,
@@ -3769,6 +4004,8 @@
     break;
 
   case 220:
+
+/* Line 1455 of yacc.c  */
 #line 2152 "osm_qos_parser_y.y"
     {
                         strcat(tmp_parser_struct.str,(yyvsp[(1) - (1)]));
@@ -3777,6 +4014,8 @@
     break;
 
   case 226:
+
+/* Line 1455 of yacc.c  */
 #line 2172 "osm_qos_parser_y.y"
     {
                         uint64_t * p_num = (uint64_t*)malloc(sizeof(uint64_t));
@@ -3787,6 +4026,8 @@
     break;
 
   case 227:
+
+/* Line 1455 of yacc.c  */
 #line 2180 "osm_qos_parser_y.y"
     {
                         uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -3797,6 +4038,8 @@
     break;
 
   case 228:
+
+/* Line 1455 of yacc.c  */
 #line 2186 "osm_qos_parser_y.y"
     {
                         uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -3807,6 +4050,8 @@
     break;
 
   case 229:
+
+/* Line 1455 of yacc.c  */
 #line 2194 "osm_qos_parser_y.y"
     {
                         __parser_str2uint64(&tmp_parser_struct.num_pair[0],(yyvsp[(1) - (1)]));
@@ -3815,6 +4060,8 @@
     break;
 
   case 230:
+
+/* Line 1455 of yacc.c  */
 #line 2200 "osm_qos_parser_y.y"
     {
                         __parser_str2uint64(&tmp_parser_struct.num_pair[1],(yyvsp[(1) - (1)]));
@@ -3823,6 +4070,8 @@
     break;
 
   case 232:
+
+/* Line 1455 of yacc.c  */
 #line 2209 "osm_qos_parser_y.y"
     {
                         uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -3833,6 +4082,8 @@
     break;
 
   case 233:
+
+/* Line 1455 of yacc.c  */
 #line 2215 "osm_qos_parser_y.y"
     {
                         uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -3849,6 +4100,8 @@
     break;
 
   case 234:
+
+/* Line 1455 of yacc.c  */
 #line 2227 "osm_qos_parser_y.y"
     {
                         uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -3865,6 +4118,8 @@
     break;
 
   case 235:
+
+/* Line 1455 of yacc.c  */
 #line 2239 "osm_qos_parser_y.y"
     {
                         uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -3875,6 +4130,8 @@
     break;
 
   case 236:
+
+/* Line 1455 of yacc.c  */
 #line 2247 "osm_qos_parser_y.y"
     {
                         __parser_str2uint64(&tmp_parser_struct.num_pair[0],(yyvsp[(1) - (1)]));
@@ -3884,6 +4141,8 @@
     break;
 
   case 237:
+
+/* Line 1455 of yacc.c  */
 #line 2254 "osm_qos_parser_y.y"
     {
                         __parser_str2uint64(&tmp_parser_struct.num_pair[0],(yyvsp[(1) - (1)]));
@@ -3892,6 +4151,8 @@
     break;
 
   case 238:
+
+/* Line 1455 of yacc.c  */
 #line 2260 "osm_qos_parser_y.y"
     {
                         __parser_str2uint64(&tmp_parser_struct.num_pair[1],(yyvsp[(1) - (1)]));
@@ -3900,8 +4161,9 @@
     break;
 
 
-/* Line 1267 of yacc.c.  */
-#line 3905 "osm_qos_parser_y.c"
+
+/* Line 1455 of yacc.c  */
+#line 4167 "osm_qos_parser_y.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3912,7 +4174,6 @@
 
   *++yyvsp = yyval;
 
-
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -3977,7 +4238,7 @@
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -3994,7 +4255,7 @@
 	}
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -4051,9 +4312,6 @@
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   *++yyvsp = yylval;
 
 
@@ -4078,7 +4336,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -4089,7 +4347,7 @@
 #endif
 
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
+  if (yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
@@ -4115,6 +4373,8 @@
 }
 
 
+
+/* Line 1675 of yacc.c  */
 #line 2266 "osm_qos_parser_y.y"
 
 

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_qos_parser_y.h
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_qos_parser_y.h	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_qos_parser_y.h	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
 
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
 /* Skeleton interface for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,10 +28,11 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -198,10 +198,11 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 extern YYSTYPE yylval;
 
+

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_state_mgr.c
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_state_mgr.c	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_state_mgr.c	2009-05-28 21:49:16 UTC (rev 269)
@@ -1090,7 +1090,7 @@
 	 */
 	if (sm->p_subn->opt.use_ucast_cache &&
 	    (sm->p_subn->subnet_initialization_error ||
-	     sm->p_subn->force_reroute))
+	     sm->p_subn->force_reroute || sm->p_subn->coming_out_of_standby))
 		osm_ucast_cache_invalidate(&sm->ucast_mgr);
 
 	/*

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_ucast_mgr.c
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_ucast_mgr.c	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/opensm/osm_ucast_mgr.c	2009-05-28 21:49:16 UTC (rev 269)
@@ -400,7 +400,7 @@
 	for (block_id_ho = 0;
 	     osm_switch_get_lft_block(p_sw, block_id_ho, block);
 	     block_id_ho++) {
-		if (!p_sw->need_update &&
+		if (!p_sw->need_update && !p_mgr->p_subn->need_update &&
 		    !memcmp(block,
 			    p_sw->new_lft + block_id_ho * IB_SMP_DATA_SIZE,
 			    IB_SMP_DATA_SIZE))

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/opensm.spec
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/opensm.spec	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/opensm.spec	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,4 +1,4 @@
-%define RELEASE 1.ofed1.4
+%define RELEASE unknown
 %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 %if %{?_with_console_socket:1}%{!?_with_console_socket:0}
 %define _enable_console_socket --enable-console-socket
@@ -23,12 +23,12 @@
 
 Summary: InfiniBand subnet manager and administration
 Name: opensm
-Version: 3.2.5_20081207
+Version: 3.2.6_20090317
 Release: %rel%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Daemons
 URL: http://openfabrics.org/
-Source: http://www.openfabrics.org/downloads/management/opensm-3.2.5_20081207.tar.gz
+Source: http://www.openfabrics.org/downloads/management/opensm-3.2.6_20090317.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libibumad-devel, libtool
 Requires: %{name}-libs = %{version}-%{release}, logrotate

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/osmeventplugin/Makefile.in
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/osmeventplugin/Makefile.in	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/osmeventplugin/Makefile.in	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -244,8 +244,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -363,7 +363,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/osmtest/Makefile.in
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/osmtest/Makefile.in	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/osmtest/Makefile.in	2009-05-28 21:49:16 UTC (rev 269)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -435,7 +435,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/scripts/opensm.init
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/scripts/opensm.init	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/scripts/opensm.init	2009-05-28 21:49:16 UTC (rev 269)
@@ -39,7 +39,7 @@
 # notice, one of the license notices in the documentation
 # and/or other materials provided with the distribution.
 
-prefix=/usr/local
+prefix=/usr
 exec_prefix=${prefix}
 
 # Source function library.
@@ -54,7 +54,7 @@
     success() { rc_status -v; }
 fi
 
-CONFIG=${prefix}/etc/sysconfig/opensm
+CONFIG=/etc/sysconfig/opensm
 if [[ -s $CONFIG ]]; then
     . $CONFIG
 fi

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/scripts/redhat-opensm.init
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/scripts/redhat-opensm.init	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/scripts/redhat-opensm.init	2009-05-28 21:49:16 UTC (rev 269)
@@ -39,15 +39,15 @@
 #  $Id: openib-1.0-opensm.init,v 1.5 2006/08/02 18:18:23 dledford Exp $
 #
 # processname: ${exec_prefix}/sbin/opensm
-# config: ${prefix}/etc/sysconfig/opensm
+# config: /etc/sysconfig/opensm
 # pidfile: /var/run/opensm.pid
 
-prefix=/usr/local
+prefix=/usr
 exec_prefix=${prefix}
 
 . /etc/rc.d/init.d/functions
 
-CONFIG=${prefix}/etc/sysconfig/opensm
+CONFIG=/etc/sysconfig/opensm
 if [ -f $CONFIG ]; then
     . $CONFIG
 fi

Modified: branches/ofed-1.4.1upgrade/opensm/trunk/scripts/sldd.sh
===================================================================
--- branches/ofed-1.4.1upgrade/opensm/trunk/scripts/sldd.sh	2009-05-28 21:40:22 UTC (rev 268)
+++ branches/ofed-1.4.1upgrade/opensm/trunk/scripts/sldd.sh	2009-05-28 21:49:16 UTC (rev 269)
@@ -39,10 +39,10 @@
 # the semi-static LID assignment table from the master SM to all standby SMs.
 # A standby SM, becoming a master . needs to obey the copied semi static LID assignment table.
 
-prefix=/usr/local
+prefix=/usr
 exec_prefix=${prefix}
 
-CONFIG=${prefix}/etc/sysconfig/opensm
+CONFIG=/etc/sysconfig/opensm
 if [ -f $CONFIG ]; then
 	. $CONFIG
 fi




More information about the Pkg-ofed-commits mailing list