| From foo@baz Wed Sep 30 05:25:07 CEST 2015 |
| From: Eric Dumazet <edumazet@google.com> |
| Date: Tue, 15 Sep 2015 18:29:47 -0700 |
| Subject: net/mlx4_en: really allow to change RSS key |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| [ Upsteam commit 4671fc6d47e0a0108fe24a4d830347d6a6ef4aa7 ] |
| |
| When changing rss key, we do not want to overwrite user provided key |
| by the one provided by netdev_rss_key_fill(), which is the host random |
| key generated at boot time. |
| |
| Fixes: 947cbb0ac242 ("net/mlx4_en: Support for configurable RSS hash function") |
| Signed-off-by: Eric Dumazet <edumazet@google.com> |
| Cc: Eyal Perry <eyalpe@mellanox.com> |
| CC: Amir Vadai <amirv@mellanox.com> |
| Acked-by: Or Gerlitz <ogerlitz@mellanox.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c |
| +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c |
| @@ -1250,8 +1250,6 @@ int mlx4_en_config_rss_steer(struct mlx4 |
| rss_context->hash_fn = MLX4_RSS_HASH_TOP; |
| memcpy(rss_context->rss_key, priv->rss_key, |
| MLX4_EN_RSS_KEY_SIZE); |
| - netdev_rss_key_fill(rss_context->rss_key, |
| - MLX4_EN_RSS_KEY_SIZE); |
| } else { |
| en_err(priv, "Unknown RSS hash function requested\n"); |
| err = -EINVAL; |
