[ewg] [PATCH] QP type enum sync with Roland tree

[Aleksey Senin]

Move RAW_ETH to the end of enumeation as is defined in Roland tree
and make it equal to '8'.

Signed-off-by: Aleksey Senin <alekseys at voltaire.com>
---
 .../fixes/core_0560_raw_eth_common.patch           |   56 +++++++++-----------
 1 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/kernel_patches/fixes/core_0560_raw_eth_common.patch b/kernel_patches/fixes/core_0560_raw_eth_common.patch
index 3083f47..4c2b2b7 100644
--- a/kernel_patches/fixes/core_0560_raw_eth_common.patch
+++ b/kernel_patches/fixes/core_0560_raw_eth_common.patch
@@ -1,21 +1,18 @@
-From 4716cc5ef1d4609ad976a502a14887cac0119f33 Mon Sep 17 00:00:00 2001
-From: Aleksey Senin <alekseys at voltaire.com>
-Date: Tue, 15 Jun 2010 16:00:49 +0300
-Subject: [PATCH] Verbs RAW_ETH support
-
-Add new RAW_ETH QP type in order to build RAW Ethernet packets
-over iWARP and RoCEE.
-
-Signed-off-by: Aleksey Senin <alekseys at voltaire.com>
----
- drivers/infiniband/core/verbs.c |   17 +++++++++++++----
- include/rdma/ib_verbs.h         |    1 +
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
-index d24b240..c86a665 100644
---- a/drivers/infiniband/core/verbs.c
-+++ b/drivers/infiniband/core/verbs.c
+Index: linux-2.6-work/drivers/infiniband/core/verbs.c
+===================================================================
+--- linux-2.6-work.orig/drivers/infiniband/core/verbs.c
++++ linux-2.6-work/drivers/infiniband/core/verbs.c
+@@ -371,8 +371,8 @@ EXPORT_SYMBOL(ib_create_qp);
+ 
+ static const struct {
+ 	int			valid;
+-	enum ib_qp_attr_mask	req_param[IB_QPT_RAW_ETY + 1];
+-	enum ib_qp_attr_mask	opt_param[IB_QPT_RAW_ETY + 1];
++	enum ib_qp_attr_mask	req_param[IB_QPT_RAW_ETH + 1];
++	enum ib_qp_attr_mask	opt_param[IB_QPT_RAW_ETH + 1];
+ } qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {
+ 	[IB_QPS_RESET] = {
+ 		[IB_QPS_RESET] = { .valid = 1 },
 @@ -382,6 +382,7 @@ static const struct {
  				[IB_QPT_UD]  = (IB_QP_PKEY_INDEX		|
  						IB_QP_PORT			|
@@ -24,7 +21,7 @@ index d24b240..c86a665 100644
  				[IB_QPT_UC]  = (IB_QP_PKEY_INDEX		|
  						IB_QP_PORT			|
  						IB_QP_ACCESS_FLAGS),
-@@ -1005,11 +1006,15 @@ int ib_attach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid)
+@@ -1004,11 +1005,15 @@ int ib_attach_mcast(struct ib_qp *qp, un
  
  	switch (rdma_node_get_transport(qp->device->node_type)) {
  	case RDMA_TRANSPORT_IB:
@@ -42,7 +39,7 @@ index d24b240..c86a665 100644
  			return -EINVAL;
  		break;
  	}
-@@ -1024,11 +1029,15 @@ int ib_detach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid)
+@@ -1023,11 +1028,15 @@ int ib_detach_mcast(struct ib_qp *qp, un
  
  	switch (rdma_node_get_transport(qp->device->node_type)) {
  	case RDMA_TRANSPORT_IB:
@@ -60,18 +57,17 @@ index d24b240..c86a665 100644
  			return -EINVAL;
  		break;
  	}
-diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
-index 99f6859..3330820 100644
---- a/include/rdma/ib_verbs.h
-+++ b/include/rdma/ib_verbs.h
-@@ -571,6 +571,7 @@ enum ib_qp_type {
+Index: linux-2.6-work/include/rdma/ib_verbs.h
+===================================================================
+--- linux-2.6-work.orig/include/rdma/ib_verbs.h
++++ linux-2.6-work/include/rdma/ib_verbs.h
+@@ -571,7 +571,8 @@ enum ib_qp_type {
  	IB_QPT_UD,
  	IB_QPT_XRC,
  	IB_QPT_RAW_IPV6,
-+	IB_QPT_RAW_ETH,
- 	IB_QPT_RAW_ETY
+-	IB_QPT_RAW_ETY
++	IB_QPT_RAW_ETY,
++	IB_QPT_RAW_ETH
  };
  
--- 
-1.6.4.2
-
+ enum ib_qp_create_flags {
-- 
1.6.4.2