diff options
author | 2008-02-05 09:52:46 -0800 | |
---|---|---|
committer | 2008-02-05 09:52:46 -0800 | |
commit | 488823f114a3cef58e7eb932cac977440a2a59cb (patch) | |
tree | f6cb0840c927ba0234949b8f8728600a474cb1b2 /drivers/net/mlx4/fw.h | |
parent | uml: make mconsole_stack namespace-aware (diff) | |
parent | RDMA/nes: Add a driver for NetEffect RNICs (diff) | |
download | linux-dev-488823f114a3cef58e7eb932cac977440a2a59cb.tar.xz linux-dev-488823f114a3cef58e7eb932cac977440a2a59cb.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:
RDMA/nes: Add a driver for NetEffect RNICs
IB/mthca: Return proper error codes from mthca_fmr_alloc()
IB: Avoid marking __devinitdata as const
IB/mlx4: Actually print out the driver version
IB/ib_mthca: Pre-link receive WQEs in Tavor mode
IB/mthca: Remove checks for srq->first_free < 0
IB/fmr_pool: Allocate page list for pool FMRs only when caching enabled
IB/srp: Retry stale connections
mlx4_core: Don't read reserved fields in mlx4_QUERY_ADAPTER()
IB/mthca: Don't read reserved fields in mthca_QUERY_ADAPTER()
IPoIB: Remove a misleading debug print
IPoIB: Handle bonding failover race for connected neighbours too
IB/mthca: Fix and simplify page size calculation in mthca_reg_phys_mr()
IB/ehca: Add PMA support
IB/ehca: Update sma_attr also in case of disruptive config change
IB/ehca: Prevent sending UD packets to QP0
IB/cm: Add interim support for routed paths
mlx4_core: Fix more section mismatches
Diffstat (limited to 'drivers/net/mlx4/fw.h')
-rw-r--r-- | drivers/net/mlx4/fw.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/mlx4/fw.h b/drivers/net/mlx4/fw.h index 7e1dd9e25cfb..e16dec890413 100644 --- a/drivers/net/mlx4/fw.h +++ b/drivers/net/mlx4/fw.h @@ -99,9 +99,6 @@ struct mlx4_dev_cap { }; struct mlx4_adapter { - u32 vendor_id; - u32 device_id; - u32 revision_id; char board_id[MLX4_BOARD_ID_LEN]; u8 inta_pin; }; |