Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fd0a1a9da244fe54dd7756e25a074c5cb12fe444

Authored by Eric Dumazet
Committed by Greg Kroah-Hartman
1 parent 022ce825be
Exists in ti-lsk-linux-4.1.y and in 5 other branches processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-linux-02.00.01, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-02.00.01

net/mlx4_en: really allow to change RSS key 

[ 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>

Showing 1 changed file with 0 additions and 2 deletions Side-by-side Diff

drivers/net/ethernet/mellanox/mlx4/en_rx.c
Diff comments   View file @ fd0a1a9
... ... @@ -1256,8 +1256,6 @@
1256 1256 rss_context->hash_fn = MLX4_RSS_HASH_TOP;
1257 1257 memcpy(rss_context->rss_key, priv->rss_key,
1258 1258 MLX4_EN_RSS_KEY_SIZE);
1259   - netdev_rss_key_fill(rss_context->rss_key,
1260   - MLX4_EN_RSS_KEY_SIZE);
1261 1259 } else {
1262 1260 en_err(priv, "Unknown RSS hash function requested\n");
1263 1261 err = -EINVAL;