dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Roland Dreier 2013-02-05 09:45:25 -08:00
parent 7e5a90c25f f97b4b5d46 d359f35430
commit cbdba97a0f
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/infiniband/hw/qib/qib_qp.c
View File

@ -263,20 +263,15 @@ static void remove_qp(struct qib_ibdev *dev, struct qib_qp *qp)
struct qib_qp __rcu **qpp; struct qib_qp __rcu **qpp;
qpp = &dev->qp_table[n]; qpp = &dev->qp_table[n];
q = rcu_dereference_protected(*qpp, for (; (q = rcu_dereference_protected(*qpp,
lockdep_is_held(&dev->qpt_lock)); lockdep_is_held(&dev->qpt_lock))) != NULL;
for (; q; qpp = &q->next) { qpp = &q->next)
if (q == qp) { if (q == qp) {
atomic_dec(&qp->refcount); atomic_dec(&qp->refcount);
*qpp = qp->next; *qpp = qp->next;
rcu_assign_pointer(qp->next, NULL); rcu_assign_pointer(qp->next, NULL);
q = rcu_dereference_protected(*qpp,
lockdep_is_held(&dev->qpt_lock));
break; break;
} }
q = rcu_dereference_protected(*qpp,
lockdep_is_held(&dev->qpt_lock));
}
} }
spin_unlock_irqrestore(&dev->qpt_lock, flags); spin_unlock_irqrestore(&dev->qpt_lock, flags);

2
drivers/net/ethernet/mellanox/mlx4/main.c
View File

@ -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_DEV_CAP_FLAG_64B_CQE | MLX4_DEV_CAP_FLAG_64B_EQE)) &&
mlx4_is_master(dev)) mlx4_is_master(dev))
dev->caps.function_caps |= MLX4_FUNC_CAP_64B_EQE_CQE; dev->caps.function_caps |= MLX4_FUNC_CAP_64B_EQE_CQE;