Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2ebf07a authored by Aleksey Senin's avatar Aleksey Senin Committed by Roland Dreier
Browse files

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: default avatarAleksey Senin <alekseys@voltaire.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 48d8fceb

drivers/infiniband/core/verbs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -310,8 +310,8 @@ EXPORT_SYMBOL(ib_create_qp); 




static const struct {

static const struct {

	int			valid;

	int			valid;

	enum ib_qp_attr_mask	req_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_ETY + 1];

	enum ib_qp_attr_mask	opt_param[IB_QPT_RAW_ETHERTYPE + 1];

} qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {

} qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {

	[IB_QPS_RESET] = {

	[IB_QPS_RESET] = {

		[IB_QPS_RESET] = { .valid = 1 },

		[IB_QPS_RESET] = { .valid = 1 },

drivers/infiniband/hw/ehca/ehca_qp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -251,7 +251,7 @@ static inline int ibqptype2servicetype(enum ib_qp_type ibqptype) 
		return ST_UD;

		return ST_UD;

	case IB_QPT_RAW_IPV6:

	case IB_QPT_RAW_IPV6:

		return -EINVAL;

		return -EINVAL;

	case IB_QPT_RAW_ETY:

	case IB_QPT_RAW_ETHERTYPE:

		return -EINVAL;

		return -EINVAL;

	default:

	default:

		ehca_gen_err("Invalid ibqptype=%x", ibqptype);

		ehca_gen_err("Invalid ibqptype=%x", ibqptype);

drivers/infiniband/hw/mthca/mthca_cmd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1817,7 +1817,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn, 
	case IB_QPT_RAW_IPV6:

	case IB_QPT_RAW_IPV6:

		op_mod = 2;

		op_mod = 2;

		break;

		break;

	case IB_QPT_RAW_ETY:

	case IB_QPT_RAW_ETHERTYPE:

		op_mod = 3;

		op_mod = 3;

		break;

		break;

	default:

	default:

include/rdma/ib_verbs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -555,7 +555,7 @@ enum ib_qp_type { 
	IB_QPT_UC,

	IB_QPT_UC,

	IB_QPT_UD,

	IB_QPT_UD,

	IB_QPT_RAW_IPV6,

	IB_QPT_RAW_IPV6,

	IB_QPT_RAW_ETY

	IB_QPT_RAW_ETHERTYPE

};

};





enum ib_qp_create_flags {

enum ib_qp_create_flags {