From: Mark Spender <mspen...@solarflare.com>

Make the existing filter-specific define more general.
This is the same as MC_CMD_RSS_CONTEXT_ALLOC_OUT_RSS_CONTEXT_ID_INVALID.

Signed-off-by: Mark Spender <mspen...@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybche...@solarflare.com>
Reviewed-by: Andrew Lee <a...@solarflare.com>
Reviewed-by: Andy Moreton <amore...@solarflare.com>
---
 drivers/net/sfc/base/efx.h        | 4 +++-
 drivers/net/sfc/base/efx_filter.c | 2 +-
 drivers/net/sfc/sfc_flow.c        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 211480e..1e369bf 100644
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -1882,6 +1882,9 @@ enum {
        __in            unsigned int buf_size);
 #endif /* EFSYS_OPT_RX_SCATTER */
 
+/* Handle to represent use of the default RSS context. */
+#define        EFX_RSS_CONTEXT_DEFAULT 0xffffffff
+
 #if EFSYS_OPT_RX_SCALE
 
 typedef enum efx_rx_hash_alg_e {
@@ -2309,7 +2312,6 @@ enum {
 
 
 /* Default values for use in filter specifications */
-#define        EFX_FILTER_SPEC_RSS_CONTEXT_DEFAULT     0xffffffff
 #define        EFX_FILTER_SPEC_RX_DMAQ_ID_DROP         0xfff
 #define        EFX_FILTER_SPEC_VID_UNSPEC              0xffff
 
diff --git a/drivers/net/sfc/base/efx_filter.c 
b/drivers/net/sfc/base/efx_filter.c
index 2e0f9a3..9804468 100644
--- a/drivers/net/sfc/base/efx_filter.c
+++ b/drivers/net/sfc/base/efx_filter.c
@@ -302,7 +302,7 @@
        memset(spec, 0, sizeof (*spec));
        spec->efs_priority = priority;
        spec->efs_flags = EFX_FILTER_FLAG_RX | flags;
-       spec->efs_rss_context = EFX_FILTER_SPEC_RSS_CONTEXT_DEFAULT;
+       spec->efs_rss_context = EFX_RSS_CONTEXT_DEFAULT;
        spec->efs_dmaq_id = (uint16_t)erp->er_index;
 }
 
diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
index 110dfb8..8ca0a63 100644
--- a/drivers/net/sfc/sfc_flow.c
+++ b/drivers/net/sfc/sfc_flow.c
@@ -803,7 +803,7 @@ struct sfc_flow_item {
        }
 
        flow->spec.efs_flags |= EFX_FILTER_FLAG_RX;
-       flow->spec.efs_rss_context = EFX_FILTER_SPEC_RSS_CONTEXT_DEFAULT;
+       flow->spec.efs_rss_context = EFX_RSS_CONTEXT_DEFAULT;
 
        return 0;
 }
-- 
1.8.2.3

Reply via email to