diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:18:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:18:21 -0700 |
| commit | 5a0cd4eb661fea095ff9962060c21c161a9ed43f (patch) | |
| tree | 7e1e7a044fc9d04d2da246a58a52bd07c4e5fef0 /include | |
| parent | b4df9d88a62c6db4cee0d96507a27527bf205dde (diff) | |
| parent | 7e2c23285454ecc8c8159b86d6343efe222ca3ae (diff) | |
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:
IPoIB: Fix deadlock on RTNL between bcast join comp and ipoib_stop()
RDMA/nes: Fix client side QP destroy
IB/mlx4: Fix up fast register page list format
mlx4_core: Set RAE and init mtt_sz field in FRMR MPT entries
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mlx4/device.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 655ea0d1ee1..b2f94446831 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -141,6 +141,10 @@ enum { MLX4_STAT_RATE_OFFSET = 5 }; +enum { + MLX4_MTT_FLAG_PRESENT = 1 +}; + static inline u64 mlx4_fw_ver(u64 major, u64 minor, u64 subminor) { return (major << 32) | (minor << 16) | subminor; |