Merge tag 'v3.10.108' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / net / ethernet / mellanox / mlx4 / main.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 3fb2643d05b4592b4c39f6efd7e545732495f771..8c58001aff1db386c8bebd2c5f4bcbf6041c90fa 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -511,8 +511,6 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                return -ENOSYS;
        }
 
-       mlx4_log_num_mgm_entry_size = hca_param.log_mc_entry_sz;
-
        dev->caps.hca_core_clock = hca_param.hca_core_clock;
 
        memset(&dev_cap, 0, sizeof(dev_cap));