diff options
| author | Roland Dreier <roland@purestorage.com> | 2012-03-13 00:25:28 +0100 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-03-13 00:25:28 +0100 |
| commit | 42872c7a5ed8d3ed49f51cb783978ca50369c564 (patch) | |
| tree | 0deea7b61c163e6997a4634ab4ee310014984688 /drivers/infiniband/hw/mlx4/cq.c | |
| parent | IB: Change CQE "csum_ok" field to a bit flag (diff) | |
| parent | mlx4_core: Scale size of MTT table with system RAM (diff) | |
| download | linux-42872c7a5ed8d3ed49f51cb783978ca50369c564.tar.xz linux-42872c7a5ed8d3ed49f51cb783978ca50369c564.zip | |
Merge branches 'misc' and 'mlx4' into for-next
Conflicts:
drivers/infiniband/hw/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/main.c
include/linux/mlx4/device.h
Diffstat (limited to 'drivers/infiniband/hw/mlx4/cq.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/cq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c index 09eb1d19e72d..77c8cb4c5073 100644 --- a/drivers/infiniband/hw/mlx4/cq.c +++ b/drivers/infiniband/hw/mlx4/cq.c @@ -748,8 +748,7 @@ int mlx4_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) break; } - if (npolled) - mlx4_cq_set_ci(&cq->mcq); + mlx4_cq_set_ci(&cq->mcq); spin_unlock_irqrestore(&cq->lock, flags); |