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

Commit cbdba97a authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'ipoib', 'mlx4' and 'qib' into for-next

parents 7e5a90c2 f97b4b5d d359f354

drivers/infiniband/hw/qib/qib_qp.c

+3 −8
Original line number Diff line number Diff line
@@ -263,20 +263,15 @@ static void remove_qp(struct qib_ibdev *dev, struct qib_qp *qp) 
		struct qib_qp __rcu **qpp;



		qpp = &dev->qp_table[n];

		q = rcu_dereference_protected(*qpp,

			lockdep_is_held(&dev->qpt_lock));

		for (; q; qpp = &q->next) {

		for (; (q = rcu_dereference_protected(*qpp,

				lockdep_is_held(&dev->qpt_lock))) != NULL;

				qpp = &q->next)

			if (q == qp) {

				atomic_dec(&qp->refcount);

				*qpp = qp->next;

				rcu_assign_pointer(qp->next, NULL);

				q = rcu_dereference_protected(*qpp,

					lockdep_is_held(&dev->qpt_lock));

				break;

			}

			q = rcu_dereference_protected(*qpp,

				lockdep_is_held(&dev->qpt_lock));

		}

	}



	spin_unlock_irqrestore(&dev->qpt_lock, flags);

drivers/net/ethernet/mellanox/mlx4/main.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
		}

	}



	if ((dev_cap->flags &

	if ((dev->caps.flags &

	    (MLX4_DEV_CAP_FLAG_64B_CQE | MLX4_DEV_CAP_FLAG_64B_EQE)) &&

	    mlx4_is_master(dev))

		dev->caps.function_caps |= MLX4_FUNC_CAP_64B_EQE_CQE;