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

Commit aa744cc0 authored by Matan Barak's avatar Matan Barak Committed by Doug Ledford
Browse files

IB/core: Remove smac and vlan id from qp_attr and ah_attr 



Smac and vlan id could be resolved from the GID attribute, and thus
these attributes aren't needed anymore. Removing them.

Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Reviewed-By: default avatarDevesh Sharma <devesh.sharma@avagotech.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 5c266b23

drivers/infiniband/core/sa_query.c

+0 −4
Original line number Diff line number Diff line
@@ -1029,11 +1029,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num, 
	}

	if (force_grh) {

		memcpy(ah_attr->dmac, rec->dmac, ETH_ALEN);

		ah_attr->vlan_id = rec->vlan_id;

	} else {

		ah_attr->vlan_id = 0xffff;

	}



	return 0;

}

EXPORT_SYMBOL(ib_init_ah_from_path);

drivers/infiniband/core/ucma.c

+0 −1
Original line number Diff line number Diff line
@@ -1211,7 +1211,6 @@ static int ucma_set_ib_path(struct ucma_context *ctx, 
		return -EINVAL;



	memset(&sa_path, 0, sizeof(sa_path));

	sa_path.vlan_id = 0xffff;



	ib_sa_unpack_path(path_data->path_rec, &sa_path);

	ret = rdma_set_ib_paths(ctx->cm_id, &sa_path, 1);

drivers/infiniband/core/uverbs_cmd.c

+0 −1
Original line number Diff line number Diff line
@@ -2822,7 +2822,6 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file, 
	attr.grh.sgid_index    = cmd.attr.grh.sgid_index;

	attr.grh.hop_limit     = cmd.attr.grh.hop_limit;

	attr.grh.traffic_class = cmd.attr.grh.traffic_class;

	attr.vlan_id           = 0;

	memset(&attr.dmac, 0, sizeof(attr.dmac));

	memcpy(attr.grh.dgid.raw, cmd.attr.grh.dgid, 16);

include/rdma/ib_verbs.h

+4 −9
Original line number Diff line number Diff line
@@ -699,7 +699,6 @@ struct ib_ah_attr { 
	u8			ah_flags;

	u8			port_num;

	u8			dmac[ETH_ALEN];

	u16			vlan_id;

};



enum ib_wc_status {
@@ -958,10 +957,10 @@ enum ib_qp_attr_mask { 
	IB_QP_PATH_MIG_STATE		= (1<<18),

	IB_QP_CAP			= (1<<19),

	IB_QP_DEST_QPN			= (1<<20),

	IB_QP_SMAC			= (1<<21),

	IB_QP_ALT_SMAC			= (1<<22),

	IB_QP_VID			= (1<<23),

	IB_QP_ALT_VID			= (1<<24),

	IB_QP_RESERVED1			= (1<<21),

	IB_QP_RESERVED2			= (1<<22),

	IB_QP_RESERVED3			= (1<<23),

	IB_QP_RESERVED4			= (1<<24),

};



enum ib_qp_state {
@@ -1011,10 +1010,6 @@ struct ib_qp_attr { 
	u8			rnr_retry;

	u8			alt_port_num;

	u8			alt_timeout;

	u8			smac[ETH_ALEN];

	u8			alt_smac[ETH_ALEN];

	u16			vlan_id;

	u16			alt_vlan_id;

};



enum ib_wr_opcode {