diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-12 00:46:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-12 00:46:08 +0200 |
| commit | 99f9f3d49cbc7d944476f6fde53a77ec789ab2aa (patch) | |
| tree | 9b6fdfb39ca8a500e458dbd87dc6e1985d394564 /drivers/net/mlx4/cq.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | IB/mlx4: Make sure RQ allocation is always valid (diff) | |
| download | linux-99f9f3d49cbc7d944476f6fde53a77ec789ab2aa.tar.xz linux-99f9f3d49cbc7d944476f6fde53a77ec789ab2aa.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/mlx4: Make sure RQ allocation is always valid
RDMA/cma: Fix initialization of next_port
IB/mlx4: Fix zeroing of rnr_retry value in ib_modify_qp()
mlx4_core: Don't set MTT address in dMPT entries with PA set
mlx4_core: Check firmware command interface revision
IB/mthca, mlx4_core: Fix typo in comment
mlx4_core: Free catastrophic error MSI-X interrupt with correct dev_id
mlx4_core: Initialize ctx_list and ctx_lock earlier
mlx4_core: Fix CQ context layout
Diffstat (limited to 'drivers/net/mlx4/cq.c')
| -rw-r--r-- | drivers/net/mlx4/cq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/cq.c b/drivers/net/mlx4/cq.c index 437d78ad0912..39253d0c1590 100644 --- a/drivers/net/mlx4/cq.c +++ b/drivers/net/mlx4/cq.c @@ -61,7 +61,7 @@ struct mlx4_cq_context { __be32 solicit_producer_index; __be32 consumer_index; __be32 producer_index; - u8 reserved6[2]; + u32 reserved6[2]; __be64 db_rec_addr; }; |