IB: Rename RAW_ETY to RAW_ETHERTYPE

Change abbreviated IB_QPT_RAW_ETY to IB_QPT_RAW_ETHERTYPE to make
the special QP type easier to understand.

cf http://www.mail-archive.com/linux-rdma@vger.kernel.org/msg04530.html

Signed-off-by: Aleksey Senin <alekseys@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index a7da9be43e61..e0fa22238715 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -310,8 +310,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_ETHERTYPE + 1];
+        enum ib_qp_attr_mask    opt_param[IB_QPT_RAW_ETHERTYPE + 1];
 } qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {
         [IB_QPS_RESET] = {
                 [IB_QPS_RESET] = { .valid = 1 },
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 47d388ec1cde..32fb34201aba 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -251,7 +251,7 @@ static inline int ibqptype2servicetype(enum ib_qp_type ibqptype)
                 return ST_UD;
         case IB_QPT_RAW_IPV6:
                 return -EINVAL;
-        case IB_QPT_RAW_ETY:
+        case IB_QPT_RAW_ETHERTYPE:
                 return -EINVAL;
         default:
                 ehca_gen_err("Invalid ibqptype=%x", ibqptype);
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index 3603ae89b606..f4ceecd9684b 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -1817,7 +1817,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn,
         case IB_QPT_RAW_IPV6:
                 op_mod = 2;
                 break;
-        case IB_QPT_RAW_ETY:
+        case IB_QPT_RAW_ETHERTYPE:
                 op_mod = 3;
                 break;
         default: