net/sfc: avoid Rx queue setup failure if thresholds are set

[dpdk.git] / drivers / net / sfc / sfc.h

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index d287413..7f11bf2 100644 (file)
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -34,6 +34,8 @@
 
 #include <stdbool.h>
 
+#include <rte_pci.h>
+#include <rte_bus_pci.h>
 #include <rte_ethdev.h>
 #include <rte_kvargs.h>
 #include <rte_spinlock.h>
@@ -47,8 +49,6 @@ extern "C" {
 #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
@@ -164,6 +164,7 @@ struct sfc_port {
 
        rte_spinlock_t                  mac_stats_lock;
        uint64_t                        *mac_stats_buf;
+       unsigned int                    mac_stats_nb_supported;
        efsys_mem_t                     mac_stats_dma_mem;
        boolean_t                       mac_stats_reset_pending;
        uint16_t                        mac_stats_update_period_ms;
@@ -223,11 +224,11 @@ struct sfc_adapter {
        unsigned int                    rss_channels;
 
 #if EFSYS_OPT_RX_SCALE
-       efx_rx_scale_support_t          rss_support;
+       efx_rx_scale_context_type_t     rss_support;
        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
 
        /*