diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:50:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:50:12 -0400 |
commit | ece236ce2fad9c27a6fd2530f899289025194bce (patch) | |
tree | 474b793205872206a2a3f7d409ff9b1f81f3a9a8 /drivers/net/mlx4/mlx4.h | |
parent | 441c196e84b11aad3123baa9320eee7abc6b5c98 (diff) | |
parent | 4460207561290c3be7e6c7538f22690028170c1d (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: (26 commits)
IB/qib: Defer HCA error events to tasklet
mlx4_core: Bump the driver version to 1.0
RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit()
IB/mlx4: Support PMA counters for IBoE
IB/mlx4: Use flow counters on IBoE ports
IB/pma: Add include file for IBA performance counters definitions
mlx4_core: Add network flow counters
mlx4_core: Fix location of counter index in QP context struct
mlx4_core: Read extended capabilities into the flags field
mlx4_core: Extend capability flags to 64 bits
IB/mlx4: Generate GID change events in IBoE code
IB/core: Add GID change event
RDMA/cma: Don't allow IPoIB port space for IBoE
RDMA: Allow for NULL .modify_device() and .modify_port() methods
IB/qib: Update active link width
IB/qib: Fix potential deadlock with link down interrupt
IB/qib: Add sysfs interface to read free contexts
IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP
IB/qib: Remove double define
IB/qib: Remove unnecessary read of PCI_CAP_ID_EXP
...
Diffstat (limited to 'drivers/net/mlx4/mlx4.h')
-rw-r--r-- | drivers/net/mlx4/mlx4.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index dd7d745fbab..a2fcd8402d3 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h | |||
@@ -48,8 +48,8 @@ | |||
48 | #include <linux/mlx4/doorbell.h> | 48 | #include <linux/mlx4/doorbell.h> |
49 | 49 | ||
50 | #define DRV_NAME "mlx4_core" | 50 | #define DRV_NAME "mlx4_core" |
51 | #define DRV_VERSION "0.01" | 51 | #define DRV_VERSION "1.0" |
52 | #define DRV_RELDATE "May 1, 2007" | 52 | #define DRV_RELDATE "July 14, 2011" |
53 | 53 | ||
54 | enum { | 54 | enum { |
55 | MLX4_HCR_BASE = 0x80680, | 55 | MLX4_HCR_BASE = 0x80680, |
@@ -342,6 +342,7 @@ struct mlx4_priv { | |||
342 | struct mlx4_srq_table srq_table; | 342 | struct mlx4_srq_table srq_table; |
343 | struct mlx4_qp_table qp_table; | 343 | struct mlx4_qp_table qp_table; |
344 | struct mlx4_mcg_table mcg_table; | 344 | struct mlx4_mcg_table mcg_table; |
345 | struct mlx4_bitmap counters_bitmap; | ||
345 | 346 | ||
346 | struct mlx4_catas_err catas_err; | 347 | struct mlx4_catas_err catas_err; |
347 | 348 | ||