---

yaml
---
r: 106463
b: refs/heads/master
c: 25c94d0
h: refs/heads/master
i:
  106461: 8abc3b9
  106459: 6d42c63
  106455: b0ca7ab
  106447: 6add11e
  106431: 5f5367d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9905922446f6dc02fd4650c8f59114d6bdb5b777
+refs/heads/master: 25c94d010a8ae8605dc4d5453e0c82fa97da5d12

trunk/drivers/infiniband/ulp/ipoib/Kconfig

@@ -11,17 +11,16 @@ config INFINIBAND_IPOIB
 
 config INFINIBAND_IPOIB_CM
 	bool "IP-over-InfiniBand Connected Mode support"
-	depends on INFINIBAND_IPOIB
+	depends on INFINIBAND_IPOIB && EXPERIMENTAL
 	default n
 	---help---
-	  This option enables support for IPoIB connected mode.  After
-	  enabling this option, you need to switch to connected mode
-	  through /sys/class/net/ibXXX/mode to actually create
-	  connections, and then increase the interface MTU with
-	  e.g. ifconfig ib0 mtu 65520.
+	  This option enables experimental support for IPoIB connected mode.
+	  After enabling this option, you need to switch to connected mode through
+	  /sys/class/net/ibXXX/mode to actually create connections, and then increase
+	  the interface MTU with e.g. ifconfig ib0 mtu 65520.
 
-	  WARNING: Enabling connected mode will trigger some packet
-	  drops for multicast and UD mode traffic from this interface,
+	  WARNING: Enabling connected mode will trigger some
+	  packet drops for multicast and UD mode traffic from this interface,
 	  unless you limit mtu for these destinations to 2044.
 
 config INFINIBAND_IPOIB_DEBUG
@@ -34,10 +33,9 @@ config INFINIBAND_IPOIB_DEBUG
 	  debug_level and mcast_debug_level module parameters (which
 	  can also be set after the driver is loaded through sysfs).
 
-	  This option also creates a directory tree under ipoib/ in
-	  debugfs, which contains files that expose debugging
-	  information about IB multicast groups used by the IPoIB
-	  driver.
+	  This option also creates an "ipoib_debugfs," which can be
+	  mounted to expose debugging information about IB multicast
+	  groups used by the IPoIB driver.
 
 config INFINIBAND_IPOIB_DEBUG_DATA
 	bool "IP-over-InfiniBand data path debugging"

trunk/include/linux/mlx4/qp.h

@@ -164,11 +164,13 @@ enum {
 	MLX4_WQE_CTRL_SOLICITED		= 1 << 1,
 	MLX4_WQE_CTRL_IP_CSUM		= 1 << 4,
 	MLX4_WQE_CTRL_TCP_UDP_CSUM	= 1 << 5,
+	MLX4_WQE_CTRL_INS_VLAN		= 1 << 6,
 };
 
 struct mlx4_wqe_ctrl_seg {
 	__be32			owner_opcode;
-	u8			reserved2[3];
+	__be16			vlan_tag;
+	u8			ins_vlan;
 	u8			fence_size;
 	/*
 	 * High 24 bits are SRC remote buffer; low 8 bits are flags: