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

Commit b806ef3b authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'for-4.2-misc' into k.o/for-4.2

parents 73cdaaee 11562568

drivers/infiniband/core/cma.c

+2 −0
Original line number Diff line number Diff line
@@ -1619,6 +1619,7 @@ static int cma_iw_listen(struct rdma_id_private *id_priv, int backlog) 
	if (IS_ERR(id))

		return PTR_ERR(id);



	id->tos = id_priv->tos;

	id_priv->cm_id.iw = id;



	memcpy(&id_priv->cm_id.iw->local_addr, cma_src_addr(id_priv),
@@ -2851,6 +2852,7 @@ static int cma_connect_iw(struct rdma_id_private *id_priv, 
	if (IS_ERR(cm_id))

		return PTR_ERR(cm_id);



	cm_id->tos = id_priv->tos;

	id_priv->cm_id.iw = cm_id;



	memcpy(&cm_id->local_addr, cma_src_addr(id_priv),

drivers/infiniband/hw/mlx4/main.c

+3 −2
Original line number Diff line number Diff line
@@ -1185,7 +1185,6 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, 
					    &mflow->reg_id[i].id);

		if (err)

			goto err_create_flow;

		i++;

		if (is_bonded) {

			/* Application always sees one port so the mirror rule

			 * must be on port #2
@@ -1200,6 +1199,7 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, 
			j++;

		}



		i++;

	}



	if (i < ARRAY_SIZE(type) && flow_attr->type == IB_FLOW_ATTR_NORMAL) {
@@ -1207,7 +1207,7 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, 
					       &mflow->reg_id[i].id);

		if (err)

			goto err_create_flow;

		i++;



		if (is_bonded) {

			flow_attr->port = 2;

			err = mlx4_ib_tunnel_steer_add(qp, flow_attr,
@@ -1218,6 +1218,7 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, 
			j++;

		}

		/* function to create mirror rule */

		i++;

	}



	return &mflow->ibflow;

drivers/infiniband/hw/nes/nes_cm.c

+7 −0
Original line number Diff line number Diff line
@@ -1616,6 +1616,8 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core, 
		  &cm_node->loc_addr, cm_node->loc_port,

		  &cm_node->rem_addr, cm_node->rem_port);

	cm_node->listener = listener;

	if (listener)

		cm_node->tos = listener->tos;

	cm_node->netdev = nesvnic->netdev;

	cm_node->cm_id = cm_info->cm_id;

	memcpy(cm_node->loc_mac, nesvnic->netdev->dev_addr, ETH_ALEN);
@@ -2938,6 +2940,9 @@ static int nes_cm_init_tsa_conn(struct nes_qp *nesqp, struct nes_cm_node *cm_nod 


	nesqp->nesqp_context->misc2 |= cpu_to_le32(64 << NES_QPCONTEXT_MISC2_TTL_SHIFT);



	nesqp->nesqp_context->misc2 |= cpu_to_le32(

		cm_node->tos << NES_QPCONTEXT_MISC2_TOS_SHIFT);



	nesqp->nesqp_context->mss |= cpu_to_le32(((u32)cm_node->tcp_cntxt.mss) << 16);



	nesqp->nesqp_context->tcp_state_flow_label |= cpu_to_le32(
@@ -3612,6 +3617,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		cm_node->ord_size = 1;



	cm_node->apbvt_set = apbvt_set;

	cm_node->tos = cm_id->tos;

	nesqp->cm_node = cm_node;

	cm_node->nesqp = nesqp;

	nes_add_ref(&nesqp->ibqp);
@@ -3666,6 +3672,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog) 
	}



	cm_id->provider_data = cm_node;

	cm_node->tos = cm_id->tos;



	if (!cm_node->reused_node) {

		if (nes_create_mapinfo(&cm_info))

drivers/infiniband/hw/nes/nes_cm.h

+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ struct nes_cm_listener { 
	int                        backlog;

	enum nes_cm_listener_state listener_state;

	u32                        reused_node;

	u8			   tos;

};



/* per connection node and node state information */
@@ -352,6 +353,7 @@ struct nes_cm_node { 
	struct list_head	reset_entry;

	struct nes_qp		*nesqp;

	atomic_t 		passive_state;

	u8			tos;

};



/* structure for client or CM to fill when making CM api calls. */

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

+6 −1
Original line number Diff line number Diff line
@@ -375,7 +375,12 @@ static struct ocrdma_pd *_ocrdma_alloc_pd(struct ocrdma_dev *dev, 


	if (dev->pd_mgr->pd_prealloc_valid) {

		status = ocrdma_get_pd_num(dev, pd);

		return (status == 0) ? pd : ERR_PTR(status);

		if (status == 0) {

			return pd;

		} else {

			kfree(pd);

			return ERR_PTR(status);

		}

	}



retry: