enic: add support for set/get rss hash key

This patch adds support for setting/getting rss hash key using ethtool.

v2:
respin patch to support RSS hash function changes.

Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 86ee350e57f0..868d0f605d60 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -1888,11 +1888,10 @@ static int enic_dev_hang_reset(struct enic *enic)
         return err;
 }
 
-static int enic_set_rsskey(struct enic *enic)
+int __enic_set_rsskey(struct enic *enic)
 {
         union vnic_rss_key *rss_key_buf_va;
         dma_addr_t rss_key_buf_pa;
-        u8 rss_key[ENIC_RSS_LEN];
         int i, kidx, bidx, err;
 
         rss_key_buf_va = pci_zalloc_consistent(enic->pdev,
@@ -1901,11 +1900,10 @@ static int enic_set_rsskey(struct enic *enic)
         if (!rss_key_buf_va)
                 return -ENOMEM;
 
-        netdev_rss_key_fill(rss_key, ENIC_RSS_LEN);
         for (i = 0; i < ENIC_RSS_LEN; i++) {
                 kidx = i / ENIC_RSS_BYTES_PER_KEY;
                 bidx = i % ENIC_RSS_BYTES_PER_KEY;
-                rss_key_buf_va->key[kidx].b[bidx] = rss_key[i];
+                rss_key_buf_va->key[kidx].b[bidx] = enic->rss_key[i];
         }
         spin_lock_bh(&enic->devcmd_lock);
         err = enic_set_rss_key(enic,
@@ -1919,6 +1917,13 @@ static int enic_set_rsskey(struct enic *enic)
         return err;
 }
 
+static int enic_set_rsskey(struct enic *enic)
+{
+        netdev_rss_key_fill(enic->rss_key, ENIC_RSS_LEN);
+
+        return __enic_set_rsskey(enic);
+}
+
 static int enic_set_rsscpu(struct enic *enic, u8 rss_hash_bits)
 {
         dma_addr_t rss_cpu_buf_pa;