svn commit: r275364 - in projects/clang350-import: . bin/sh contrib/binutils/bfd contrib/gcc/config/arm contrib/ofed/librdmacm/examples/build/cmatose contrib/ofed/librdmacm/examples/build/mckey con...

Mon Dec 1 13:14:54 UTC 2014

Author: dim
Date: Mon Dec  1 13:14:39 2014
New Revision: 275364
URL: https://svnweb.freebsd.org/changeset/base/275364

Log:
  Merge ^/head r275262 through r275363.

Deleted:
  projects/clang350-import/etc/rc.d/mrouted
Modified:
  projects/clang350-import/ObsoleteFiles.inc
  projects/clang350-import/bin/sh/eval.c
  projects/clang350-import/bin/sh/output.c
  projects/clang350-import/contrib/binutils/bfd/elf32-arm.c
  projects/clang350-import/contrib/gcc/config/arm/lib1funcs.asm
  projects/clang350-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
  projects/clang350-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile
  projects/clang350-import/contrib/ofed/librdmacm/examples/build/rping/Makefile
  projects/clang350-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
  projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c
  projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibroute.c
  projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c
  projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibtracert.c
  projects/clang350-import/contrib/ofed/management/infiniband-diags/src/saquery.c
  projects/clang350-import/contrib/ofed/management/infiniband-diags/src/smpquery.c
  projects/clang350-import/contrib/ofed/usr.bin/Makefile.inc
  projects/clang350-import/etc/defaults/rc.conf
  projects/clang350-import/etc/rc
  projects/clang350-import/etc/rc.d/Makefile
  projects/clang350-import/etc/rc.d/NETWORKING
  projects/clang350-import/etc/rc.d/ipmon
  projects/clang350-import/etc/rc.d/pflog
  projects/clang350-import/etc/rc.subr
  projects/clang350-import/sbin/ifconfig/Makefile
  projects/clang350-import/share/man/man4/tap.4
  projects/clang350-import/share/man/man4/tun.4
  projects/clang350-import/sys/arm/arm/cpufunc_asm_armv5.S
  projects/clang350-import/sys/arm/arm/cpufunc_asm_xscale_c3.S
  projects/clang350-import/sys/arm/arm/fusu.S
  projects/clang350-import/sys/arm/arm/support.S
  projects/clang350-import/sys/arm/include/asm.h
  projects/clang350-import/sys/boot/i386/boot2/boot2.c
  projects/clang350-import/sys/dev/bxe/bxe.c
  projects/clang350-import/sys/dev/cxgb/cxgb_sge.c
  projects/clang350-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/clang350-import/sys/dev/cxgbe/t4_main.c
  projects/clang350-import/sys/dev/cxgbe/t4_sge.c
  projects/clang350-import/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/clang350-import/sys/dev/cxgbe/tom/t4_ddp.c
  projects/clang350-import/sys/dev/e1000/if_igb.c
  projects/clang350-import/sys/dev/ixgbe/ixgbe.c
  projects/clang350-import/sys/dev/ixgbe/ixv.c
  projects/clang350-import/sys/dev/ixl/ixl_txrx.c
  projects/clang350-import/sys/dev/mxge/if_mxge.c
  projects/clang350-import/sys/dev/netmap/netmap_freebsd.c
  projects/clang350-import/sys/dev/oce/oce_if.c
  projects/clang350-import/sys/dev/qlxgbe/ql_isr.c
  projects/clang350-import/sys/dev/qlxgbe/ql_os.c
  projects/clang350-import/sys/dev/qlxge/qls_isr.c
  projects/clang350-import/sys/dev/qlxge/qls_os.c
  projects/clang350-import/sys/dev/sfxge/sfxge_rx.c
  projects/clang350-import/sys/dev/sfxge/sfxge_tx.c
  projects/clang350-import/sys/dev/virtio/block/virtio_blk.c
  projects/clang350-import/sys/dev/virtio/network/if_vtnet.c
  projects/clang350-import/sys/dev/vmware/vmxnet3/if_vmx.c
  projects/clang350-import/sys/dev/vxge/vxge.c
  projects/clang350-import/sys/kern/subr_taskqueue.c
  projects/clang350-import/sys/kern/uipc_debug.c
  projects/clang350-import/sys/kern/uipc_domain.c
  projects/clang350-import/sys/kern/uipc_mbuf.c
  projects/clang350-import/sys/kern/uipc_sockbuf.c
  projects/clang350-import/sys/kern/uipc_socket.c
  projects/clang350-import/sys/kern/uipc_usrreq.c
  projects/clang350-import/sys/net/flowtable.c
  projects/clang350-import/sys/net/ieee8023ad_lacp.c
  projects/clang350-import/sys/net/if_lagg.c
  projects/clang350-import/sys/net/if_lagg.h
  projects/clang350-import/sys/net/if_vxlan.c
  projects/clang350-import/sys/net/netisr.c
  projects/clang350-import/sys/netinet/in_pcb.h
  projects/clang350-import/sys/netinet/in_rss.c
  projects/clang350-import/sys/netinet/ip_input.c
  projects/clang350-import/sys/netinet/ip_output.c
  projects/clang350-import/sys/netinet/sctp_indata.c
  projects/clang350-import/sys/netinet/sctp_input.c
  projects/clang350-import/sys/netinet/sctp_os_bsd.h
  projects/clang350-import/sys/netinet/sctp_output.c
  projects/clang350-import/sys/netinet/sctp_pcb.c
  projects/clang350-import/sys/netinet/sctp_pcb.h
  projects/clang350-import/sys/netinet/sctp_structs.h
  projects/clang350-import/sys/netinet/sctp_usrreq.c
  projects/clang350-import/sys/netinet/sctp_var.h
  projects/clang350-import/sys/netinet/sctputil.c
  projects/clang350-import/sys/netinet/sctputil.h
  projects/clang350-import/sys/netinet/tcp_input.c
  projects/clang350-import/sys/netinet/tcp_reass.c
  projects/clang350-import/sys/netinet/tcp_syncache.c
  projects/clang350-import/sys/netinet/tcp_usrreq.c
  projects/clang350-import/sys/netinet/udp_usrreq.c
  projects/clang350-import/sys/netinet6/in6_pcb.c
  projects/clang350-import/sys/netinet6/ip6_output.c
  projects/clang350-import/sys/netinet6/udp6_usrreq.c
  projects/clang350-import/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
  projects/clang350-import/sys/ofed/drivers/net/mlx4/en_rx.c
  projects/clang350-import/sys/ofed/drivers/net/mlx4/en_tx.c
  projects/clang350-import/sys/powerpc/aim/machdep.c
  projects/clang350-import/sys/powerpc/aim/trap.c
  projects/clang350-import/sys/powerpc/aim/trap_subr32.S
  projects/clang350-import/sys/powerpc/aim/trap_subr64.S
  projects/clang350-import/sys/powerpc/include/trap.h
  projects/clang350-import/sys/sys/mbuf.h
  projects/clang350-import/sys/sys/protosw.h
  projects/clang350-import/sys/sys/sockbuf.h
  projects/clang350-import/sys/vm/uma_core.c
  projects/clang350-import/tools/tools/shlib-compat/shlib-compat.py
  projects/clang350-import/tools/tools/shlib-compat/test/Makefile.inc
  projects/clang350-import/tools/tools/shlib-compat/test/regress.sh
  projects/clang350-import/tools/tools/sysbuild/sysbuild.sh
  projects/clang350-import/usr.bin/bluetooth/btsockstat/btsockstat.c
  projects/clang350-import/usr.bin/netstat/inet.c
  projects/clang350-import/usr.bin/netstat/netgraph.c
  projects/clang350-import/usr.bin/netstat/unix.c
  projects/clang350-import/usr.bin/systat/netstat.c
Directory Properties:
  projects/clang350-import/   (props changed)
  projects/clang350-import/contrib/binutils/   (props changed)
  projects/clang350-import/contrib/gcc/   (props changed)
  projects/clang350-import/etc/   (props changed)
  projects/clang350-import/sbin/   (props changed)
  projects/clang350-import/share/   (props changed)
  projects/clang350-import/share/man/man4/   (props changed)
  projects/clang350-import/sys/   (props changed)
  projects/clang350-import/sys/boot/   (props changed)

Modified: projects/clang350-import/ObsoleteFiles.inc
==============================================================================

--- projects/clang350-import/ObsoleteFiles.inc	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/ObsoleteFiles.inc	Mon Dec  1 13:14:39 2014	(r275364)
@@ -38,7 +38,7 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 20141128: new clang import which bumps version from 3.4.1 to 3.5.0.
+# 20141201: new clang import which bumps version from 3.4.1 to 3.5.0.
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4.1/altivec.h
@@ -74,6 +74,8 @@ OLD_FILES+=usr/include/clang/3.4.1/x86in
 OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.4.1
+# 20141129: mrouted rc.d scripts removed from base
+OLD_FILES+=etc/rc.d/mrouted
 # 20141126: convert sbin/mdconfig/tests to ATF format tests
 OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test
 OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test

Modified: projects/clang350-import/bin/sh/eval.c
==============================================================================
--- projects/clang350-import/bin/sh/eval.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/bin/sh/eval.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -774,15 +774,7 @@ xtracecommand(struct arglist *varlist, s
 	for (sp = arglist->list ; sp ; sp = sp->next) {
 		if (sep != 0)
 			out2c(' ');
-		/* Disambiguate command looking like assignment. */
-		if (sp == arglist->list &&
-				strchr(sp->text, '=') != NULL &&
-				strchr(sp->text, '\'') == NULL) {
-			out2c('\'');
-			out2str(sp->text);
-			out2c('\'');
-		} else
-			out2qstr(sp->text);
+		out2qstr(sp->text);
 		sep = ' ';
 	}
 	out2c('\n');

Modified: projects/clang350-import/bin/sh/output.c
==============================================================================
--- projects/clang350-import/bin/sh/output.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/bin/sh/output.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -122,8 +122,7 @@ outqstr(const char *p, struct output *fi
 		outstr("''", file);
 		return;
 	}
-	/* Caller will handle '=' if necessary */
-	if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#")] == '\0' ||
+	if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#=")] == '\0' ||
 			strcmp(p, "[") == 0) {
 		outstr(p, file);
 		return;

Modified: projects/clang350-import/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/clang350-import/contrib/binutils/bfd/elf32-arm.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/binutils/bfd/elf32-arm.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -4960,7 +4960,7 @@ elf32_arm_final_link_relocate (reloc_how
 		       + input_section->output_offset
 		       + rel->r_offset);
 
-        value = abs (relocation);
+        value = llabs (relocation);
 
         if (value >= 0x1000)
           return bfd_reloc_overflow;
@@ -4998,7 +4998,7 @@ elf32_arm_final_link_relocate (reloc_how
 		       + input_section->output_offset
 		       + rel->r_offset);
 
-        value = abs (relocation);
+        value = llabs (relocation);
 
         if (value >= 0x1000)
           return bfd_reloc_overflow;
@@ -5984,7 +5984,7 @@ elf32_arm_final_link_relocate (reloc_how
 
         /* Calculate the value of the relevant G_n, in encoded
            constant-with-rotation format.  */
-        g_n = calculate_group_reloc_mask (abs (signed_value), group,
+        g_n = calculate_group_reloc_mask (llabs (signed_value), group,
                                           &residual);
 
         /* Check for overflow if required.  */
@@ -5998,7 +5998,7 @@ elf32_arm_final_link_relocate (reloc_how
             (*_bfd_error_handler)
               (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
               input_bfd, input_section,
-              (long) rel->r_offset, abs (signed_value), howto->name);
+              (long) rel->r_offset, llabs (signed_value), howto->name);
             return bfd_reloc_overflow;
           }
 
@@ -6077,7 +6077,7 @@ elf32_arm_final_link_relocate (reloc_how
 
         /* Calculate the value of the relevant G_{n-1} to obtain
            the residual at that stage.  */
-        calculate_group_reloc_mask (abs (signed_value), group - 1, &residual);
+        calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual);
 
         /* Check for overflow.  */
         if (residual >= 0x1000)
@@ -6085,7 +6085,7 @@ elf32_arm_final_link_relocate (reloc_how
             (*_bfd_error_handler)
               (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
               input_bfd, input_section,
-              (long) rel->r_offset, abs (signed_value), howto->name);
+              (long) rel->r_offset, llabs (signed_value), howto->name);
             return bfd_reloc_overflow;
           }
 
@@ -6160,7 +6160,7 @@ elf32_arm_final_link_relocate (reloc_how
 
         /* Calculate the value of the relevant G_{n-1} to obtain
            the residual at that stage.  */
-        calculate_group_reloc_mask (abs (signed_value), group - 1, &residual);
+        calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual);
 
         /* Check for overflow.  */
         if (residual >= 0x100)
@@ -6168,7 +6168,7 @@ elf32_arm_final_link_relocate (reloc_how
             (*_bfd_error_handler)
               (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
               input_bfd, input_section,
-              (long) rel->r_offset, abs (signed_value), howto->name);
+              (long) rel->r_offset, llabs (signed_value), howto->name);
             return bfd_reloc_overflow;
           }
 
@@ -6243,7 +6243,7 @@ elf32_arm_final_link_relocate (reloc_how
 
         /* Calculate the value of the relevant G_{n-1} to obtain
            the residual at that stage.  */
-        calculate_group_reloc_mask (abs (signed_value), group - 1, &residual);
+        calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual);
 
         /* Check for overflow.  (The absolute value to go in the place must be
            divisible by four and, after having been divided by four, must
@@ -6253,7 +6253,7 @@ elf32_arm_final_link_relocate (reloc_how
             (*_bfd_error_handler)
               (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
               input_bfd, input_section,
-              (long) rel->r_offset, abs (signed_value), howto->name);
+              (long) rel->r_offset, llabs (signed_value), howto->name);
             return bfd_reloc_overflow;
           }
 

Modified: projects/clang350-import/contrib/gcc/config/arm/lib1funcs.asm
==============================================================================
--- projects/clang350-import/contrib/gcc/config/arm/lib1funcs.asm	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/gcc/config/arm/lib1funcs.asm	Mon Dec  1 13:14:39 2014	(r275364)
@@ -980,8 +980,6 @@ LSYM(Lover12):
 
 	RET
 
-	FUNC_END aeabi_ldiv0
-	FUNC_END aeabi_idiv0
 	FUNC_END div0
 	
 #endif /* L_divmodsi_tools */

Modified: projects/clang350-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
==============================================================================
--- projects/clang350-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile	Mon Dec  1 13:14:39 2014	(r275364)
@@ -6,5 +6,6 @@ PROG=	cmatose
 MAN=
 SRCS=	cmatose.c
 LDADD+= -libverbs -lrdmacm -lpthread
+LDADD+= -lmlx4
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile
==============================================================================
--- projects/clang350-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile	Mon Dec  1 13:14:39 2014	(r275364)
@@ -6,5 +6,6 @@ PROG=	mckey
 MAN=
 SRCS=	mckey.c
 LDADD+= -libverbs -lrdmacm -lpthread
+LDADD+= -lmlx4
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/contrib/ofed/librdmacm/examples/build/rping/Makefile
==============================================================================
--- projects/clang350-import/contrib/ofed/librdmacm/examples/build/rping/Makefile	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/librdmacm/examples/build/rping/Makefile	Mon Dec  1 13:14:39 2014	(r275364)
@@ -6,5 +6,6 @@ PROG=	rping
 MAN=
 SRCS=	rping.c
 LDADD+= -libverbs -lrdmacm -lpthread
+LDADD+= -lmlx4
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
==============================================================================
--- projects/clang350-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile	Mon Dec  1 13:14:39 2014	(r275364)
@@ -6,5 +6,6 @@ PROG=	udaddy
 MAN=
 SRCS=	udaddy.c
 LDADD+= -libverbs -lrdmacm -lpthread
+LDADD+= -lmlx4
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c
==============================================================================
--- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -50,7 +50,7 @@
 #include <infiniband/common.h>
 #include <infiniband/umad.h>
 #include <infiniband/mad.h>
-#include <infiniband/complib/cl_nodenamemap.h>
+#include <complib/cl_nodenamemap.h>
 
 #include "ibnetdiscover.h"
 #include "grouping.h"

Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibroute.c
==============================================================================
--- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibroute.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibroute.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -49,7 +49,7 @@
 #include <infiniband/common.h>
 #include <infiniband/umad.h>
 #include <infiniband/mad.h>
-#include <infiniband/complib/cl_nodenamemap.h>
+#include <complib/cl_nodenamemap.h>
 
 #include "ibdiag_common.h"
 

Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c
==============================================================================
--- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -43,7 +43,7 @@
 #include <getopt.h>
 
 #include <infiniband/mad.h>
-#include <infiniband/iba/ib_types.h>
+#include <iba/ib_types.h>
 
 #include "ibdiag_common.h"
 

Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibtracert.c
==============================================================================
--- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibtracert.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibtracert.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -49,7 +49,7 @@
 #include <infiniband/common.h>
 #include <infiniband/umad.h>
 #include <infiniband/mad.h>
-#include <infiniband/complib/cl_nodenamemap.h>
+#include <complib/cl_nodenamemap.h>
 
 #include "ibdiag_common.h"
 

Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/saquery.c
==============================================================================
--- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/saquery.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/saquery.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -50,12 +50,12 @@
 #include <getopt.h>
 
 #include <infiniband/mad.h>
-#include <infiniband/opensm/osm_log.h>
-#include <infiniband/vendor/osm_vendor_api.h>
-#include <infiniband/vendor/osm_vendor_sa_api.h>
-#include <infiniband/opensm/osm_mad_pool.h>
-#include <infiniband/complib/cl_debug.h>
-#include <infiniband/complib/cl_nodenamemap.h>
+#include <opensm/osm_log.h>
+#include <vendor/osm_vendor_api.h>
+#include <vendor/osm_vendor_sa_api.h>
+#include <opensm/osm_mad_pool.h>
+#include <complib/cl_debug.h>
+#include <complib/cl_nodenamemap.h>
 
 #include <netinet/in.h>
 

Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/smpquery.c
==============================================================================
--- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/smpquery.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/smpquery.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -50,7 +50,7 @@
 #include <infiniband/common.h>
 #include <infiniband/umad.h>
 #include <infiniband/mad.h>
-#include <infiniband/complib/cl_nodenamemap.h>
+#include <complib/cl_nodenamemap.h>
 
 #include "ibdiag_common.h"
 

Modified: projects/clang350-import/contrib/ofed/usr.bin/Makefile.inc
==============================================================================
--- projects/clang350-import/contrib/ofed/usr.bin/Makefile.inc	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/contrib/ofed/usr.bin/Makefile.inc	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1,4 +1,9 @@
 DIAGPATH=	${.CURDIR}/../../management/infiniband-diags
 BINDIR?=	/usr/bin
 CFLAGS+=	-I${.CURDIR}/../../include/infiniband
+CFLAGS+=	-I${.CURDIR}/../../include
 CFLAGS+=	-I${.CURDIR}/../../management/opensm/include/
+CFLAGS+=	-I${.CURDIR}/../../management/opensm
+CFLAGS+=	-I${.CURDIR}/../../management/libibcommon/include
+CFLAGS+=	-I${.CURDIR}/../../management/libibumad/include
+CFLAGS+=	-I${.CURDIR}/../../management/libibmad/include

Modified: projects/clang350-import/etc/defaults/rc.conf
==============================================================================
--- projects/clang350-import/etc/defaults/rc.conf	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/etc/defaults/rc.conf	Mon Dec  1 13:14:39 2014	(r275364)
@@ -390,12 +390,6 @@ gateway_enable="NO"		# Set to YES if thi
 routed_enable="NO"		# Set to YES to enable a routing daemon.
 routed_program="/sbin/routed"	# Name of routing daemon to use if enabled.
 routed_flags="-q"		# Flags for routing daemon.
-mrouted_enable="NO"		# Do IPv4 multicast routing.
-mrouted_program="/usr/local/sbin/mrouted"	# Name of IPv4 multicast
-						# routing daemon.  You need to
-						# install it from package or
-						# port.
-mrouted_flags=""		# Flags for multicast routing daemon.
 arpproxy_all="NO"		# replaces obsolete kernel option ARP_PROXYALL.
 forward_sourceroute="NO"	# do source routing (only if gateway_enable is set to "YES")
 accept_sourceroute="NO"		# accept source routed packets to us

Modified: projects/clang350-import/etc/rc
==============================================================================
--- projects/clang350-import/etc/rc	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/etc/rc	Mon Dec  1 13:14:39 2014	(r275364)
@@ -69,19 +69,16 @@ fi
 # and to make the configuration file variables available to rc itself.
 #
 . /etc/rc.subr
-load_rc_config 'XXX'
+load_rc_config
 
 # If we receive a SIGALRM, re-source /etc/rc.conf; this allows rc.d
 # scripts to perform "boot-time configuration" including enabling and
 # disabling rc.d scripts which appear later in the boot order.
-trap "_rc_conf_loaded=false; load_rc_config 'XXX'" ALRM
+trap "_rc_conf_loaded=false; load_rc_config" ALRM
 
 skip="-s nostart"
 if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then
 	skip="$skip -s nojail"
-	if [ "$early_late_divider" = "FILESYSTEMS" ]; then
-		early_late_divider=NETWORKING
-	fi
 	if [ `/sbin/sysctl -n security.jail.vnet` -ne 1 ]; then
 		skip="$skip -s nojailvnet"
 	fi

Modified: projects/clang350-import/etc/rc.d/Makefile
==============================================================================
--- projects/clang350-import/etc/rc.d/Makefile	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/etc/rc.d/Makefile	Mon Dec  1 13:14:39 2014	(r275364)
@@ -90,7 +90,6 @@ FILES=	DAEMON \
 	mountd \
 	moused \
 	mroute6d \
-	mrouted \
 	msgs \
 	natd \
 	netif \

Modified: projects/clang350-import/etc/rc.d/NETWORKING
==============================================================================
--- projects/clang350-import/etc/rc.d/NETWORKING	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/etc/rc.d/NETWORKING	Mon Dec  1 13:14:39 2014	(r275364)
@@ -5,7 +5,7 @@
 
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: netif netoptions routing ppp ipfw stf
-# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge
+# REQUIRE: defaultroute routed route6d mroute6d resolv bridge
 # REQUIRE: static_arp static_ndp local_unbound
 
 #	This is a dummy dependency, for services which require networking

Modified: projects/clang350-import/etc/rc.d/ipmon
==============================================================================
--- projects/clang350-import/etc/rc.d/ipmon	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/etc/rc.d/ipmon	Mon Dec  1 13:14:39 2014	(r275364)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ipmon
-# REQUIRE: FILESYSTEMS hostname sysctl FILESYSTEMS ipfilter
+# REQUIRE: FILESYSTEMS hostname sysctl ipfilter
 # BEFORE:  SERVERS
 # KEYWORD: nojail
 

Modified: projects/clang350-import/etc/rc.d/pflog
==============================================================================
--- projects/clang350-import/etc/rc.d/pflog	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/etc/rc.d/pflog	Mon Dec  1 13:14:39 2014	(r275364)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: pflog
-# REQUIRE: FILESYSTEMS netif FILESYSTEMS
+# REQUIRE: FILESYSTEMS netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: projects/clang350-import/etc/rc.subr
==============================================================================
--- projects/clang350-import/etc/rc.subr	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/etc/rc.subr	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1315,9 +1315,6 @@ load_rc_config()
 {
 	local _name _rcvar_val _var _defval _v _msg _new _d
 	_name=$1
-	if [ -z "$_name" ]; then
-		err 3 'USAGE: load_rc_config name'
-	fi
 
 	if ${_rc_conf_loaded:-false}; then
 		:
@@ -1333,20 +1330,24 @@ load_rc_config()
 		_rc_conf_loaded=true
 	fi
 
-	for _d in /etc ${local_startup%*/rc.d}; do
-		if [ -f ${_d}/rc.conf.d/"$_name" ]; then
-			debug "Sourcing ${_d}/rc.conf.d/$_name"
-			. ${_d}/rc.conf.d/"$_name"
-		elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then
-			local _rc
-			for _rc in ${_d}/rc.conf.d/"$_name"/* ; do
-				if [ -f "$_rc" ] ; then
-					debug "Sourcing $_rc"
-					. "$_rc"
-				fi
-			done
-		fi
-	done
+	# If a service name was specified, attempt to load
+	# service-specific configuration
+	if [ -n "$_name" ] ; then
+		for _d in /etc ${local_startup%*/rc.d}; do
+			if [ -f ${_d}/rc.conf.d/"$_name" ]; then
+				debug "Sourcing ${_d}/rc.conf.d/$_name"
+				. ${_d}/rc.conf.d/"$_name"
+			elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then
+				local _rc
+				for _rc in ${_d}/rc.conf.d/"$_name"/* ; do
+					if [ -f "$_rc" ] ; then
+						debug "Sourcing $_rc"
+						. "$_rc"
+					fi
+				done
+			fi
+		done
+	fi
 
 	# Set defaults if defined.
 	for _var in $rcvar $rcvars; do

Modified: projects/clang350-import/sbin/ifconfig/Makefile
==============================================================================
--- projects/clang350-import/sbin/ifconfig/Makefile	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sbin/ifconfig/Makefile	Mon Dec  1 13:14:39 2014	(r275364)
@@ -30,7 +30,7 @@ SRCS+=	ifmac.c			# MAC support
 SRCS+=	ifmedia.c		# SIOC[GS]IFMEDIA support
 SRCS+=	iffib.c			# non-default FIB support
 SRCS+=	ifvlan.c		# SIOC[GS]ETVLAN support
-SRCS+=	ifvxlan.c		# VXLAN support
+#SRCS+=	ifvxlan.c		# VXLAN support
 SRCS+=	ifgre.c			# GRE keys etc
 SRCS+=	ifgif.c			# GIF reversed header workaround
 

Modified: projects/clang350-import/share/man/man4/tap.4
==============================================================================
--- projects/clang350-import/share/man/man4/tap.4	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/share/man/man4/tap.4	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Based on PR#2411
 .\"
-.Dd November 4, 2014
+.Dd November 30, 2014
 .Dt TAP 4
 .Os
 .Sh NAME
@@ -34,6 +34,17 @@ or a terminal for
 and a character-special device
 .Dq control
 interface.
+A client program transfers Ethernet frames to or from the 
+.Nm
+.Dq control
+interface.
+The
+.Xr tun 4
+interface provides similar functionality at the network layer:
+a client will transfer IP (by default) packets to or from a
+.Xr tun 4
+.Dq control
+interface.
 .Pp
 The network interfaces are named
 .Dq Li tap0 ,
@@ -314,4 +325,5 @@ VMware
 .El
 .Sh SEE ALSO
 .Xr inet 4 ,
-.Xr intro 4
+.Xr intro 4 ,
+.Xr tun 4

Modified: projects/clang350-import/share/man/man4/tun.4
==============================================================================
--- projects/clang350-import/share/man/man4/tun.4	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/share/man/man4/tun.4	Mon Dec  1 13:14:39 2014	(r275364)
@@ -2,7 +2,7 @@
 .\" $FreeBSD$
 .\" Based on PR#2411
 .\"
-.Dd February 4, 2007
+.Dd November 30, 2014
 .Dt TUN 4
 .Os
 .Sh NAME
@@ -35,6 +35,17 @@ or a terminal for
 and a character-special device
 .Dq control
 interface.
+A client program transfers IP (by default) packets to or from the 
+.Nm
+.Dq control
+interface.
+The
+.Xr tap 4
+interface provides similar functionality at the Ethernet layer:
+a client will transfer Ethernet frames to or from a
+.Xr tap 4
+.Dq control
+interface.
 .Pp
 The network interfaces are named
 .Dq Li tun0 ,
@@ -307,6 +318,7 @@ them pile up.
 .Xr inet 4 ,
 .Xr intro 4 ,
 .Xr pty 4 ,
+.Xr tap 4 ,
 .Xr ifconfig 8
 .Sh AUTHORS
 This manual page was originally obtained from

Modified: projects/clang350-import/sys/arm/arm/cpufunc_asm_armv5.S
==============================================================================
--- projects/clang350-import/sys/arm/arm/cpufunc_asm_armv5.S	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/arm/arm/cpufunc_asm_armv5.S	Mon Dec  1 13:14:39 2014	(r275364)
@@ -194,7 +194,6 @@ ENTRY(armv5_idcache_wbinv_range)
 END(armv5_idcache_wbinv_range)
 
 ENTRY_NP(armv5_idcache_wbinv_all)
-armv5_idcache_wbinv_all:
 .Larmv5_idcache_wbinv_all:
 	/*
 	 * We assume that the code here can never be out of sync with the

Modified: projects/clang350-import/sys/arm/arm/cpufunc_asm_xscale_c3.S
==============================================================================
--- projects/clang350-import/sys/arm/arm/cpufunc_asm_xscale_c3.S	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/arm/arm/cpufunc_asm_xscale_c3.S	Mon Dec  1 13:14:39 2014	(r275364)
@@ -144,7 +144,6 @@ __FBSDID("$FreeBSD$");
 
 
 ENTRY_NP(xscalec3_cache_syncI)
-xscalec3_cache_purgeID:
 EENTRY_NP(xscalec3_cache_purgeID)
 	mcr	p15, 0, r0, c7, c5, 0	/* flush I cache (D cleaned below) */
 EENTRY_NP(xscalec3_cache_cleanID)

Modified: projects/clang350-import/sys/arm/arm/fusu.S
==============================================================================
--- projects/clang350-import/sys/arm/arm/fusu.S	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/arm/arm/fusu.S	Mon Dec  1 13:14:39 2014	(r275364)
@@ -129,7 +129,7 @@ EENTRY_NP(fuword32)
 	str	r1, [r2, #PCB_ONFAULT]
 	mov	r0, r3
 	RET
-END(fuword32)
+EEND(fuword32)
 END(fuword)
 
 /*
@@ -295,7 +295,7 @@ EENTRY_NP(suword32)
 	mov	r0, #0x00000000
 	str	r0, [r2, #PCB_ONFAULT]
 	RET
-END(suword32)
+EEND(suword32)
 END(suword)
 
 /*

Modified: projects/clang350-import/sys/arm/arm/support.S
==============================================================================
--- projects/clang350-import/sys/arm/arm/support.S	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/arm/arm/support.S	Mon Dec  1 13:14:39 2014	(r275364)
@@ -130,7 +130,7 @@ ENTRY(bzero)
 .Lnormal0:
 	mov	r3, #0x00
 	b	do_memset
-EEND(bzero)
+END(bzero)
 /* LINTSTUB: Func: void *memset(void *, int, size_t) */
 ENTRY(memset)
 	and	r3, r1, #0xff		/* We deal with bytes */

Modified: projects/clang350-import/sys/arm/include/asm.h
==============================================================================
--- projects/clang350-import/sys/arm/include/asm.h	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/arm/include/asm.h	Mon Dec  1 13:14:39 2014	(r275364)
@@ -58,6 +58,18 @@
 #endif
 
 /*
+ * EENTRY()/EEND() mark "extra" entry/exit points from a function.
+ * The unwind info cannot handle the concept of a nested function, or a function
+ * with multiple .fnstart directives, but some of our assembler code is written
+ * with multiple labels to allow entry at several points.  The EENTRY() macro
+ * defines such an extra entry point without a new .fnstart, so that it's
+ * basically just a label that you can jump to.  The EEND() macro does nothing
+ * at all, except document the exit point associated with the same-named entry.
+ */
+#define	_EENTRY(x) 	.globl x; .type x,_ASM_TYPE_FUNCTION; x:
+#define	_EEND(x)	/* nothing */
+
+/*
  * gas/arm uses @ as a single comment character and thus cannot be used here
  * Instead it recognised the # instead of an @ symbols in .type directives
  * We define a couple of macros so that assembly code will not be dependent
@@ -66,22 +78,10 @@
 #define _ASM_TYPE_FUNCTION	#function
 #define _ASM_TYPE_OBJECT	#object
 #define GLOBAL(X) .globl x
-#define _ENTRY(x) \
-	.text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; x: _FNSTART
+#define	_ENTRY(x) \
+	.text; _ALIGN_TEXT; _EENTRY(x) _FNSTART
 #define	_END(x)	.size x, . - x; _FNEND
 
-/*
- * EENTRY()/EEND() mark "extra" entry/exit points from a function.
- * The unwind info cannot handle the concept of a nested function, or a function
- * with multiple .fnstart directives, but some of our assembler code is written
- * with multiple labels to allow entry at several points.  The EENTRY() macro
- * defines such an extra entry point without a new .fnstart, so that it's
- * basically just a label that you can jump to.  The EEND() macro does nothing
- * at all, except document the exit point associated with the same-named entry.
- */
-#define _EENTRY(x) 	.globl x; .type x,_ASM_TYPE_FUNCTION; x:
-#define _EEND(x)	/* nothing */
-
 #ifdef GPROF
 #  define _PROF_PROLOGUE	\
 	mov ip, lr; bl __mcount

Modified: projects/clang350-import/sys/boot/i386/boot2/boot2.c
==============================================================================
--- projects/clang350-import/sys/boot/i386/boot2/boot2.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/boot/i386/boot2/boot2.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -418,7 +418,7 @@ parse()
 #if SERIAL
 		} else if (c == 'S') {
 		    j = 0;
-		    while ((i = *arg++ - '0') <= 9)
+		    while ((unsigned int)(i = *arg++ - '0') <= 9)
 			j = j * 10 + i;
 		    if (j > 0 && i == -'0') {
 			comspeed = j;

Modified: projects/clang350-import/sys/dev/bxe/bxe.c
==============================================================================
--- projects/clang350-import/sys/dev/bxe/bxe.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/bxe/bxe.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -3219,7 +3219,7 @@ bxe_tpa_stop(struct bxe_softc          *
 #if __FreeBSD_version >= 800000
         /* specify what RSS queue was used for this flow */
         m->m_pkthdr.flowid = fp->index;
-        m->m_flags |= M_FLOWID;
+        M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
 #endif
 
         if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
@@ -3454,7 +3454,7 @@ bxe_rxeof(struct bxe_softc    *sc,
 #if __FreeBSD_version >= 800000
         /* specify what RSS queue was used for this flow */
         m->m_pkthdr.flowid = fp->index;
-        m->m_flags |= M_FLOWID;
+        M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
 #endif
 
 next_rx:
@@ -6037,10 +6037,9 @@ bxe_tx_mq_start(struct ifnet *ifp,
 
     fp_index = 0; /* default is the first queue */
 
-    /* change the queue if using flow ID */
-    if ((m->m_flags & M_FLOWID) != 0) {
+    /* check if flowid is set */
+    if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)
         fp_index = (m->m_pkthdr.flowid % sc->num_queues);
-    }
 
     fp = &sc->fp[fp_index];
 

Modified: projects/clang350-import/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- projects/clang350-import/sys/dev/cxgb/cxgb_sge.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/cxgb/cxgb_sge.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1733,8 +1733,9 @@ cxgb_transmit(struct ifnet *ifp, struct 
 		m_freem(m);
 		return (0);
 	}
-	
-	if (m->m_flags & M_FLOWID)
+
+	/* check if flowid is set */
+	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)	
 		qidx = (m->m_pkthdr.flowid % pi->nqsets) + pi->first_qset;
 
 	qs = &pi->adapter->sge.qs[qidx];
@@ -2899,9 +2900,10 @@ process_responses(adapter_t *adap, struc
 			
 			eop = get_packet(adap, drop_thresh, qs, mh, r);
 			if (eop) {
-				if (r->rss_hdr.hash_type && !adap->timestamp)
-					mh->mh_head->m_flags |= M_FLOWID;
-				mh->mh_head->m_pkthdr.flowid = rss_hash;
+				if (r->rss_hdr.hash_type && !adap->timestamp) {
+					M_HASHTYPE_SET(mh->mh_head, M_HASHTYPE_OPAQUE);
+					mh->mh_head->m_pkthdr.flowid = rss_hash;
+				}
 			}
 			
 			ethpad = 2;

Modified: projects/clang350-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
==============================================================================
--- projects/clang350-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1199,7 +1199,7 @@ do_rx_data(struct sge_qset *qs, struct r
 	}
 
 	toep->tp_enqueued += m->m_pkthdr.len;
-	sbappendstream_locked(so_rcv, m);
+	sbappendstream_locked(so_rcv, m, 0);
 	sorwakeup_locked(so);
 	SOCKBUF_UNLOCK_ASSERT(so_rcv);
 

Modified: projects/clang350-import/sys/dev/cxgbe/t4_main.c
==============================================================================
--- projects/clang350-import/sys/dev/cxgbe/t4_main.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/cxgbe/t4_main.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1440,7 +1440,8 @@ cxgbe_transmit(struct ifnet *ifp, struct
 		return (ENETDOWN);
 	}
 
-	if (m->m_flags & M_FLOWID)
+	/* check if flowid is set */
+	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)
 		txq += ((m->m_pkthdr.flowid % (pi->ntxq - pi->rsrv_noflowq))
 		    + pi->rsrv_noflowq);
 	br = txq->br;

Modified: projects/clang350-import/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- projects/clang350-import/sys/dev/cxgbe/t4_sge.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/cxgbe/t4_sge.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1734,7 +1734,7 @@ t4_eth_rx(struct sge_iq *iq, const struc
 	m0->m_data += fl_pktshift;
 
 	m0->m_pkthdr.rcvif = ifp;
-	m0->m_flags |= M_FLOWID;
+	M_HASHTYPE_SET(m0, M_HASHTYPE_OPAQUE);
 	m0->m_pkthdr.flowid = be32toh(rss->hash_val);
 
 	if (cpl->csum_calc && !cpl->err_vec) {

Modified: projects/clang350-import/sys/dev/cxgbe/tom/t4_cpl_io.c
==============================================================================
--- projects/clang350-import/sys/dev/cxgbe/tom/t4_cpl_io.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/cxgbe/tom/t4_cpl_io.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1086,7 +1086,7 @@ do_peer_close(struct sge_iq *iq, const s
 #ifdef USE_DDP_RX_FLOW_CONTROL
 		toep->rx_credits -= m->m_len;	/* adjust for F_RX_FC_DDP */
 #endif
-		sbappendstream_locked(sb, m);
+		sbappendstream_locked(sb, m, 0);
 		toep->sb_cc = sbused(sb);
 	}
 	socantrcvmore_locked(so);	/* unlocks the sockbuf */
@@ -1586,7 +1586,7 @@ do_rx_data(struct sge_iq *iq, const stru
 	    ("%s: sb %p has more data (%d) than last time (%d).",
 	    __func__, sb, sbused(sb), toep->sb_cc));
 	toep->rx_credits += toep->sb_cc - sbused(sb);
-	sbappendstream_locked(sb, m);
+	sbappendstream_locked(sb, m, 0);
 	toep->sb_cc = sbused(sb);
 	sorwakeup_locked(so);
 	SOCKBUF_UNLOCK_ASSERT(sb);

Modified: projects/clang350-import/sys/dev/cxgbe/tom/t4_ddp.c
==============================================================================
--- projects/clang350-import/sys/dev/cxgbe/tom/t4_ddp.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/cxgbe/tom/t4_ddp.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -231,7 +231,7 @@ insert_ddp_data(struct toepcb *toep, uin
 #ifdef USE_DDP_RX_FLOW_CONTROL
 	toep->rx_credits -= n;	/* adjust for F_RX_FC_DDP */
 #endif
-	sbappendstream_locked(sb, m);
+	sbappendstream_locked(sb, m, 0);
 	toep->sb_cc = sbused(sb);
 }
 
@@ -466,7 +466,7 @@ handle_ddp_data(struct toepcb *toep, __b
 #ifdef USE_DDP_RX_FLOW_CONTROL
 	toep->rx_credits -= len;	/* adjust for F_RX_FC_DDP */
 #endif
-	sbappendstream_locked(sb, m);
+	sbappendstream_locked(sb, m, 0);
 	toep->sb_cc = sbused(sb);
 wakeup:
 	KASSERT(toep->ddp_flags & db_flag,
@@ -971,8 +971,9 @@ handle_ddp(struct socket *so, struct uio
 	 */
 	rc = sbwait(sb);
 	while (toep->ddp_flags & buf_flag) {
+		/* XXXGL: shouldn't here be sbwait() call? */
 		sb->sb_flags |= SB_WAIT;
-		msleep(&sb->sb_cc, &sb->sb_mtx, PSOCK , "sbwait", 0);
+		msleep(&sb->sb_acc, &sb->sb_mtx, PSOCK , "sbwait", 0);
 	}
 	unwire_ddp_buffer(db);
 	return (rc);

Modified: projects/clang350-import/sys/dev/e1000/if_igb.c
==============================================================================
--- projects/clang350-import/sys/dev/e1000/if_igb.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/e1000/if_igb.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -990,7 +990,7 @@ igb_mq_start(struct ifnet *ifp, struct m
 	 * If everything is setup correctly, it should be the
 	 * same bucket that the current CPU we're on is.
 	 */
-	if ((m->m_flags & M_FLOWID) != 0) {
+	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) {
 #ifdef	RSS
 		if (rss_hash2bucket(m->m_pkthdr.flowid,
 		    M_HASHTYPE_GET(m), &bucket_id) == 0) {
@@ -5166,7 +5166,6 @@ igb_rxeof(struct igb_queue *que, int cou
 			/* XXX set flowtype once this works right */
 			rxr->fmp->m_pkthdr.flowid = 
 			    le32toh(cur->wb.lower.hi_dword.rss);
-			rxr->fmp->m_flags |= M_FLOWID;
 			switch (pkt_info & E1000_RXDADV_RSSTYPE_MASK) {
 			case E1000_RXDADV_RSSTYPE_IPV4_TCP:
 				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_TCP_IPV4);
@@ -5196,11 +5195,11 @@ igb_rxeof(struct igb_queue *que, int cou
 			
 			default:
 				/* XXX fallthrough */
-				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_NONE);
+				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_OPAQUE);
 			}
 #elif !defined(IGB_LEGACY_TX)
 			rxr->fmp->m_pkthdr.flowid = que->msix;
-			rxr->fmp->m_flags |= M_FLOWID;
+			M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_OPAQUE);
 #endif
 			sendmp = rxr->fmp;
 			/* Make sure to set M_PKTHDR. */

Modified: projects/clang350-import/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- projects/clang350-import/sys/dev/ixgbe/ixgbe.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/ixgbe/ixgbe.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -833,7 +833,7 @@ ixgbe_mq_start(struct ifnet *ifp, struct
 	 * If everything is setup correctly, it should be the
 	 * same bucket that the current CPU we're on is.
 	 */
-	if ((m->m_flags & M_FLOWID) != 0) {
+	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) {
 #ifdef	RSS
 		if (rss_hash2bucket(m->m_pkthdr.flowid,
 		    M_HASHTYPE_GET(m), &bucket_id) == 0) {
@@ -4764,7 +4764,6 @@ ixgbe_rxeof(struct ix_queue *que)
 #ifdef RSS
 			sendmp->m_pkthdr.flowid =
 			    le32toh(cur->wb.lower.hi_dword.rss);
-			sendmp->m_flags |= M_FLOWID;
 			switch (pkt_info & IXGBE_RXDADV_RSSTYPE_MASK) {
 			case IXGBE_RXDADV_RSSTYPE_IPV4_TCP:
 				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_TCP_IPV4);
@@ -4795,11 +4794,12 @@ ixgbe_rxeof(struct ix_queue *que)
 				break;
 			default:
 				/* XXX fallthrough */
-				M_HASHTYPE_SET(sendmp, M_HASHTYPE_NONE);
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE);
+				break;
 			}
 #else /* RSS */
 			sendmp->m_pkthdr.flowid = que->msix;
-			sendmp->m_flags |= M_FLOWID;
+			M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE);
 #endif /* RSS */
 #endif /* FreeBSD_version */
 		}

Modified: projects/clang350-import/sys/dev/ixgbe/ixv.c
==============================================================================
--- projects/clang350-import/sys/dev/ixgbe/ixv.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/ixgbe/ixv.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -580,7 +580,7 @@ ixv_mq_start(struct ifnet *ifp, struct m
 	int 		i = 0, err = 0;
 
 	/* Which queue to use */
-	if ((m->m_flags & M_FLOWID) != 0)
+	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)
 		i = m->m_pkthdr.flowid % adapter->num_queues;
 
 	txr = &adapter->tx_rings[i];
@@ -3464,7 +3464,7 @@ ixv_rxeof(struct ix_queue *que, int coun
 				ixv_rx_checksum(staterr, sendmp, ptype);
 #if __FreeBSD_version >= 800000
 			sendmp->m_pkthdr.flowid = que->msix;
-			sendmp->m_flags |= M_FLOWID;
+			M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE);
 #endif
 		}
 next_desc:

Modified: projects/clang350-import/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- projects/clang350-import/sys/dev/ixl/ixl_txrx.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/ixl/ixl_txrx.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -66,8 +66,8 @@ ixl_mq_start(struct ifnet *ifp, struct m
 	struct tx_ring		*txr;
 	int 			err, i;
 
-	/* Which queue to use */
-	if ((m->m_flags & M_FLOWID) != 0)
+	/* check if flowid is set */
+	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)
 		i = m->m_pkthdr.flowid % vsi->num_queues;
 	else
 		i = curcpu % vsi->num_queues;
@@ -1543,7 +1543,7 @@ ixl_rxeof(struct ixl_queue *que, int cou
 			if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
 				ixl_rx_checksum(sendmp, status, error, ptype);
 			sendmp->m_pkthdr.flowid = que->msix;
-			sendmp->m_flags |= M_FLOWID;
+			M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE);
 		}
 next_desc:
 		bus_dmamap_sync(rxr->dma.tag, rxr->dma.map,

Modified: projects/clang350-import/sys/dev/mxge/if_mxge.c
==============================================================================
--- projects/clang350-import/sys/dev/mxge/if_mxge.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/mxge/if_mxge.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -2719,7 +2719,7 @@ mxge_rx_done_big(struct mxge_slice_state
 	/* flowid only valid if RSS hashing is enabled */
 	if (sc->num_slices > 1) {
 		m->m_pkthdr.flowid = (ss - sc->ss);
-		m->m_flags |= M_FLOWID;
+		M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
 	}
 	/* pass the frame up the stack */
 	(*ifp->if_input)(ifp, m);
@@ -2787,7 +2787,7 @@ mxge_rx_done_small(struct mxge_slice_sta
 	/* flowid only valid if RSS hashing is enabled */
 	if (sc->num_slices > 1) {
 		m->m_pkthdr.flowid = (ss - sc->ss);
-		m->m_flags |= M_FLOWID;
+		M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
 	}
 	/* pass the frame up the stack */
 	(*ifp->if_input)(ifp, m);

Modified: projects/clang350-import/sys/dev/netmap/netmap_freebsd.c
==============================================================================
--- projects/clang350-import/sys/dev/netmap/netmap_freebsd.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/netmap/netmap_freebsd.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -204,7 +204,7 @@ netmap_catch_tx(struct netmap_generic_ad
  * of the transmission does not consume resources.
  *
  * On FreeBSD, and on multiqueue cards, we can force the queue using
- *      if ((m->m_flags & M_FLOWID) != 0)
+ *      if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)
  *              i = m->m_pkthdr.flowid % adapter->num_queues;
  *      else
  *              i = curcpu % adapter->num_queues;
@@ -240,7 +240,7 @@ generic_xmit_frame(struct ifnet *ifp, st
 	m->m_len = m->m_pkthdr.len = len;
 	// inc refcount. All ours, we could skip the atomic
 	atomic_fetchadd_int(PNT_MBUF_REFCNT(m), 1);
-	m->m_flags |= M_FLOWID;
+	M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
 	m->m_pkthdr.flowid = ring_nr;
 	m->m_pkthdr.rcvif = ifp; /* used for tx notification */
 	ret = NA(ifp)->if_transmit(ifp, m);

Modified: projects/clang350-import/sys/dev/oce/oce_if.c
==============================================================================
--- projects/clang350-import/sys/dev/oce/oce_if.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/oce/oce_if.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -563,7 +563,7 @@ oce_multiq_start(struct ifnet *ifp, stru
 	int queue_index = 0;
 	int status = 0;
 
-	if ((m->m_flags & M_FLOWID) != 0)
+	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)
 		queue_index = m->m_pkthdr.flowid % sc->nwqs;
 
 	wq = sc->wq[queue_index];
@@ -1374,7 +1374,7 @@ oce_rx(struct oce_rq *rq, uint32_t rqe_i
 			m->m_pkthdr.flowid = (rq->queue_index - 1);
 		else
 			m->m_pkthdr.flowid = rq->queue_index;
-		m->m_flags |= M_FLOWID;
+		M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
 #endif
 		/* This deternies if vlan tag is Valid */
 		if (oce_cqe_vtp_valid(sc, cqe)) { 

Modified: projects/clang350-import/sys/dev/qlxgbe/ql_isr.c
==============================================================================
--- projects/clang350-import/sys/dev/qlxgbe/ql_isr.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/qlxgbe/ql_isr.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -159,7 +159,7 @@ qla_rx_intr(qla_host_t *ha, qla_sgl_rcv_
 	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	mpf->m_pkthdr.flowid = sgc->rss_hash;
-	mpf->m_flags |= M_FLOWID;
+	M_HASHTYPE_SET(mpf, M_HASHTYPE_OPAQUE);
 
 	(*ifp->if_input)(ifp, mpf);
 
@@ -324,7 +324,7 @@ qla_lro_intr(qla_host_t *ha, qla_sgl_lro
 	mpf->m_pkthdr.csum_data = 0xFFFF;
 
 	mpf->m_pkthdr.flowid = sgc->rss_hash;
-	mpf->m_flags |= M_FLOWID;
+	M_HASHTYPE_SET(mpf, M_HASHTYPE_OPAQUE);
 
 	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 

Modified: projects/clang350-import/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- projects/clang350-import/sys/dev/qlxgbe/ql_os.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/qlxgbe/ql_os.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1140,7 +1140,8 @@ qla_send(qla_host_t *ha, struct mbuf **m
 
 	QL_DPRINT8(ha, (ha->pci_dev, "%s: enter\n", __func__));
 
-	if (m_head->m_flags & M_FLOWID)
+	/* check if flowid is set */
+	if (M_HASHTYPE_GET(m_head) != M_HASHTYPE_NONE)
 		txr_idx = m_head->m_pkthdr.flowid & (ha->hw.num_tx_rings - 1);
 
 	tx_idx = ha->hw.tx_cntxt[txr_idx].txr_next;

Modified: projects/clang350-import/sys/dev/qlxge/qls_isr.c
==============================================================================
--- projects/clang350-import/sys/dev/qlxge/qls_isr.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/qlxge/qls_isr.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -190,7 +190,7 @@ qls_rx_comp(qla_host_t *ha, uint32_t rxr
 			if ((cq_e->flags1 & Q81_RX_FLAGS1_RSS_MATCH_MASK)) {
 				rxr->rss_int++;
 				mp->m_pkthdr.flowid = cq_e->rss;
-				mp->m_flags |= M_FLOWID;
+				M_HASHTYPE_SET(mp, M_HASHTYPE_OPAQUE);
 			}
 			if (cq_e->flags0 & (Q81_RX_FLAGS0_TE |
 				Q81_RX_FLAGS0_NU | Q81_RX_FLAGS0_IE)) {

Modified: projects/clang350-import/sys/dev/qlxge/qls_os.c
==============================================================================
--- projects/clang350-import/sys/dev/qlxge/qls_os.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/qlxge/qls_os.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -1136,7 +1136,8 @@ qls_send(qla_host_t *ha, struct mbuf **m
 
 	QL_DPRINT8((ha->pci_dev, "%s: enter\n", __func__));
 
-	if (m_head->m_flags & M_FLOWID)
+	/* check if flowid is set */
+	if (M_HASHTYPE_GET(m_head) != M_HASHTYPE_NONE)
 		txr_idx = m_head->m_pkthdr.flowid & (ha->num_tx_rings - 1);
 
 	tx_idx = ha->tx_ring[txr_idx].txr_next;

Modified: projects/clang350-import/sys/dev/sfxge/sfxge_rx.c
==============================================================================
--- projects/clang350-import/sys/dev/sfxge/sfxge_rx.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/sfxge/sfxge_rx.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -302,7 +302,7 @@ sfxge_rx_deliver(struct sfxge_softc *sc,
 	if (rx_desc->flags & EFX_PKT_TCP) {
 		m->m_pkthdr.flowid = EFX_RX_HASH_VALUE(EFX_RX_HASHALG_TOEPLITZ,
 						       mtod(m, uint8_t *));
-		m->m_flags |= M_FLOWID;
+		M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
 	}
 #endif
 	m->m_data += sc->rx_prefix_size;
@@ -353,7 +353,7 @@ sfxge_lro_deliver(struct sfxge_lro_state
 
 #ifdef SFXGE_HAVE_MQ
 	m->m_pkthdr.flowid = c->conn_hash;
-	m->m_flags |= M_FLOWID;
+	M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
 #endif
 	m->m_pkthdr.csum_flags = csum_flags;
 	__sfxge_rx_deliver(sc, m);

Modified: projects/clang350-import/sys/dev/sfxge/sfxge_tx.c
==============================================================================
--- projects/clang350-import/sys/dev/sfxge/sfxge_tx.c	Mon Dec  1 13:07:49 2014	(r275363)
+++ projects/clang350-import/sys/dev/sfxge/sfxge_tx.c	Mon Dec  1 13:14:39 2014	(r275364)
@@ -631,7 +631,8 @@ sfxge_if_transmit(struct ifnet *ifp, str
 	if (m->m_pkthdr.csum_flags & (CSUM_DELAY_DATA | CSUM_TSO)) {
 		int index = 0;
 
-		if (m->m_flags & M_FLOWID) {

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
