diff options
author | David S. Miller <davem@davemloft.net> | 2013-01-31 12:49:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-31 12:49:10 -0500 |
commit | 58d7553d5593292e1bdbfd6423b44caaca0799bd (patch) | |
tree | ace64d0ccf89db5b59b596892ba5337aebcff3ec /drivers/net/ethernet/mellanox/mlx4/main.c | |
parent | 1b13c97fae9c61dc20db8e0d0a72a29df29ac377 (diff) | |
parent | 3484aac16149636f0ba5b5b0789a2918c682db7e (diff) | |
download | linux-58d7553d5593292e1bdbfd6423b44caaca0799bd.tar.gz |
Merge branch 'mlx4'
Merge mlx4 bug fixes from Amir Vadai.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/main.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index f1ee52d10467..e38c6b2e1578 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -1415,22 +1415,6 @@ static int mlx4_init_hca(struct mlx4_dev *dev) if (mlx4_is_master(dev)) mlx4_parav_master_pf_caps(dev); - priv->fs_hash_mode = MLX4_FS_L2_HASH; - - switch (priv->fs_hash_mode) { - case MLX4_FS_L2_HASH: - init_hca.fs_hash_enable_bits = 0; - break; - - case MLX4_FS_L2_L3_L4_HASH: - /* Enable flow steering with - * udp unicast and tcp unicast - */ - init_hca.fs_hash_enable_bits = - MLX4_FS_UDP_UC_EN | MLX4_FS_TCP_UC_EN; - break; - } - profile = default_profile; if (dev->caps.steering_mode == MLX4_STEERING_MODE_DEVICE_MANAGED) |