[dpdk-dev] [PATCH 10/11] net/sfc: use RSS key size define from base driver

[Andrew Rybchenko]

Signed-off-by: Andrew Rybchenko <arybche...@solarflare.com>
---
 drivers/net/sfc/sfc.c        | 2 +-
 drivers/net/sfc/sfc.h        | 4 +---
 drivers/net/sfc/sfc_ethdev.c | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index 08f20dd..cc81fd9 100644
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -501,7 +501,7 @@
  * and also known to give a uniform distribution
  * (a good distribution of traffic between different CPUs)
  */
-static const uint8_t default_rss_key[SFC_RSS_KEY_SIZE] = {
+static const uint8_t default_rss_key[EFX_RSS_KEY_SIZE] = {
        0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a,
        0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a,
        0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a,
diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index e41e79e..c170384 100644
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -48,8 +48,6 @@
 #endif
 
 #if EFSYS_OPT_RX_SCALE
-/** RSS key length (bytes) */
-#define SFC_RSS_KEY_SIZE       40
 /** RSS hash offloads mask */
 #define SFC_RSS_OFFLOADS       (ETH_RSS_IP | ETH_RSS_TCP)
 #endif
@@ -229,7 +227,7 @@ struct sfc_adapter {
        efx_rx_hash_support_t           hash_support;
        efx_rx_hash_type_t              rss_hash_types;
        unsigned int                    rss_tbl[EFX_RSS_TBL_SIZE];
-       uint8_t                         rss_key[SFC_RSS_KEY_SIZE];
+       uint8_t                         rss_key[EFX_RSS_KEY_SIZE];
 #endif
 
        /*
diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 18dca0a..44eb6bd 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -148,7 +148,7 @@
 #if EFSYS_OPT_RX_SCALE
        if (sa->rss_support != EFX_RX_SCALE_UNAVAILABLE) {
                dev_info->reta_size = EFX_RSS_TBL_SIZE;
-               dev_info->hash_key_size = SFC_RSS_KEY_SIZE;
+               dev_info->hash_key_size = EFX_RSS_KEY_SIZE;
                dev_info->flow_type_rss_offloads = SFC_RSS_OFFLOADS;
        }
 #endif
@@ -1205,9 +1205,9 @@
         * locally in 'sfc_adapter' and kept up-to-date
         */
        rss_conf->rss_hf = sfc_efx_to_rte_hash_type(sa->rss_hash_types);
-       rss_conf->rss_key_len = SFC_RSS_KEY_SIZE;
+       rss_conf->rss_key_len = EFX_RSS_KEY_SIZE;
        if (rss_conf->rss_key != NULL)
-               rte_memcpy(rss_conf->rss_key, sa->rss_key, SFC_RSS_KEY_SIZE);
+               rte_memcpy(rss_conf->rss_key, sa->rss_key, EFX_RSS_KEY_SIZE);
 
        sfc_adapter_unlock(sa);
 
-- 
1.8.2.3