bnxt_en: Use RSS flags defined in the bnxt_hsi.h file.

Orabug: 24567991

And remove redundant definitions of the same flags.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 8d6be8b627389c6dc7e0ea2455a7542c8a2a16a7)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 3ebf2a154de01af8d3cd49a51035f3af296911ac..2cd6ebbdb09cbeddf891b05c01e45fa88aaf9588 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3437,10 +3437,10 @@ static int bnxt_hwrm_vnic_set_rss(struct bnxt *bp, u16 vnic_id, bool set_rss)
 
        bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_VNIC_RSS_CFG, -1, -1);
        if (set_rss) {
-               vnic->hash_type = BNXT_RSS_HASH_TYPE_FLAG_IPV4 |
-                                BNXT_RSS_HASH_TYPE_FLAG_TCP_IPV4 |
-                                BNXT_RSS_HASH_TYPE_FLAG_IPV6 |
-                                BNXT_RSS_HASH_TYPE_FLAG_TCP_IPV6;
+               vnic->hash_type = VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4 |
+                                 VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 |
+                                 VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 |
+                                 VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6;
 
                req.hash_type = cpu_to_le32(vnic->hash_type);
 

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 23e04a6142fbec06fa027bde6f94f7f5d9e49e83..db4814e927f7fb93c725ab0a0a2df0184e4a3c17 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -389,11 +389,6 @@ struct rx_tpa_end_cmp_ext {
 
 #define INVALID_HW_RING_ID     ((u16)-1)
 
-#define BNXT_RSS_HASH_TYPE_FLAG_IPV4           0x01
-#define BNXT_RSS_HASH_TYPE_FLAG_TCP_IPV4       0x02
-#define BNXT_RSS_HASH_TYPE_FLAG_IPV6           0x04
-#define BNXT_RSS_HASH_TYPE_FLAG_TCP_IPV6       0x08
-
 /* The hardware supports certain page sizes.  Use the supported page sizes
  * to allocate the rings.
  */