aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mlx4
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/mlx4')
-rw-r--r--drivers/net/mlx4/main.c4
-rw-r--r--drivers/net/mlx4/mlx4.h7
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 4b1269435586..9e590e11c1cf 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -524,8 +524,8 @@ static int __devinit mlx4_init_hca(struct mlx4_dev *dev)
524 } 524 }
525 525
526 priv->eq_table.inta_pin = adapter.inta_pin; 526 priv->eq_table.inta_pin = adapter.inta_pin;
527 priv->rev_id = adapter.revision_id; 527 dev->rev_id = adapter.revision_id;
528 memcpy(priv->board_id, adapter.board_id, sizeof priv->board_id); 528 memcpy(dev->board_id, adapter.board_id, sizeof dev->board_id);
529 529
530 return 0; 530 return 0;
531 531
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index be304a7c2c91..b9f839761919 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -56,10 +56,6 @@ enum {
56}; 56};
57 57
58enum { 58enum {
59 MLX4_BOARD_ID_LEN = 64
60};
61
62enum {
63 MLX4_MGM_ENTRY_SIZE = 0x40, 59 MLX4_MGM_ENTRY_SIZE = 0x40,
64 MLX4_QP_PER_MGM = 4 * (MLX4_MGM_ENTRY_SIZE / 16 - 2), 60 MLX4_QP_PER_MGM = 4 * (MLX4_MGM_ENTRY_SIZE / 16 - 2),
65 MLX4_MTT_ENTRY_PER_SEG = 8 61 MLX4_MTT_ENTRY_PER_SEG = 8
@@ -277,9 +273,6 @@ struct mlx4_priv {
277 273
278 struct mlx4_uar driver_uar; 274 struct mlx4_uar driver_uar;
279 void __iomem *kar; 275 void __iomem *kar;
280
281 u32 rev_id;
282 char board_id[MLX4_BOARD_ID_LEN];
283}; 276};
284 277
285static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev) 278static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)