i40e: Remove unused flags

The flag I40E_FLAG_RX_CSUM_ENABLED and I40E_HW_FLAG_DROP_MODE are
set and never read. Remove them.

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://lore.kernel.org/r/20231113231047.548659-5-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index e070a1b908f7144055c3a996bd8d2b7148f24619..7d83dcbd929436e0888235337d4e36fdae76240d 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -502,33 +502,32 @@ struct i40e_pf {
 #define I40E_HW_RESTART_AUTONEG                        BIT(18)
 
        u32 flags;
-#define I40E_FLAG_RX_CSUM_ENABLED              BIT(0)
-#define I40E_FLAG_MSI_ENABLED                  BIT(1)
-#define I40E_FLAG_MSIX_ENABLED                 BIT(2)
-#define I40E_FLAG_RSS_ENABLED                  BIT(3)
-#define I40E_FLAG_VMDQ_ENABLED                 BIT(4)
-#define I40E_FLAG_SRIOV_ENABLED                        BIT(5)
-#define I40E_FLAG_DCB_CAPABLE                  BIT(6)
-#define I40E_FLAG_DCB_ENABLED                  BIT(7)
-#define I40E_FLAG_FD_SB_ENABLED                        BIT(8)
-#define I40E_FLAG_FD_ATR_ENABLED               BIT(9)
-#define I40E_FLAG_MFP_ENABLED                  BIT(10)
-#define I40E_FLAG_HW_ATR_EVICT_ENABLED         BIT(11)
-#define I40E_FLAG_VEB_MODE_ENABLED             BIT(12)
-#define I40E_FLAG_VEB_STATS_ENABLED            BIT(13)
-#define I40E_FLAG_LINK_POLLING_ENABLED         BIT(14)
-#define I40E_FLAG_TRUE_PROMISC_SUPPORT         BIT(15)
-#define I40E_FLAG_LEGACY_RX                    BIT(16)
-#define I40E_FLAG_PTP                          BIT(17)
-#define I40E_FLAG_IWARP_ENABLED                        BIT(18)
-#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED   BIT(19)
-#define I40E_FLAG_SOURCE_PRUNING_DISABLED       BIT(20)
-#define I40E_FLAG_TC_MQPRIO                    BIT(21)
-#define I40E_FLAG_FD_SB_INACTIVE               BIT(22)
-#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER                BIT(23)
-#define I40E_FLAG_DISABLE_FW_LLDP              BIT(24)
-#define I40E_FLAG_RS_FEC                       BIT(25)
-#define I40E_FLAG_BASE_R_FEC                   BIT(26)
+#define I40E_FLAG_MSI_ENABLED                  BIT(0)
+#define I40E_FLAG_MSIX_ENABLED                 BIT(1)
+#define I40E_FLAG_RSS_ENABLED                  BIT(2)
+#define I40E_FLAG_VMDQ_ENABLED                 BIT(3)
+#define I40E_FLAG_SRIOV_ENABLED                        BIT(4)
+#define I40E_FLAG_DCB_CAPABLE                  BIT(5)
+#define I40E_FLAG_DCB_ENABLED                  BIT(6)
+#define I40E_FLAG_FD_SB_ENABLED                        BIT(7)
+#define I40E_FLAG_FD_ATR_ENABLED               BIT(8)
+#define I40E_FLAG_MFP_ENABLED                  BIT(9)
+#define I40E_FLAG_HW_ATR_EVICT_ENABLED         BIT(10)
+#define I40E_FLAG_VEB_MODE_ENABLED             BIT(11)
+#define I40E_FLAG_VEB_STATS_ENABLED            BIT(12)
+#define I40E_FLAG_LINK_POLLING_ENABLED         BIT(13)
+#define I40E_FLAG_TRUE_PROMISC_SUPPORT         BIT(14)
+#define I40E_FLAG_LEGACY_RX                    BIT(15)
+#define I40E_FLAG_PTP                          BIT(16)
+#define I40E_FLAG_IWARP_ENABLED                        BIT(17)
+#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED   BIT(18)
+#define I40E_FLAG_SOURCE_PRUNING_DISABLED       BIT(19)
+#define I40E_FLAG_TC_MQPRIO                    BIT(20)
+#define I40E_FLAG_FD_SB_INACTIVE               BIT(21)
+#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER                BIT(22)
+#define I40E_FLAG_DISABLE_FW_LLDP              BIT(23)
+#define I40E_FLAG_RS_FEC                       BIT(24)
+#define I40E_FLAG_BASE_R_FEC                   BIT(25)
 /* TOTAL_PORT_SHUTDOWN
  * Allows to physically disable the link on the NIC's port.
  * If enabled, (after link down request from the OS)
@@ -550,8 +549,8 @@ struct i40e_pf {
  *   the link is being brought down by clearing bit (I40E_AQ_PHY_ENABLE_LINK)
  *   in abilities field of i40e_aq_set_phy_config structure
  */
-#define I40E_FLAG_TOTAL_PORT_SHUTDOWN_ENABLED  BIT(27)
-#define I40E_FLAG_VF_VLAN_PRUNING              BIT(28)
+#define I40E_FLAG_TOTAL_PORT_SHUTDOWN_ENABLED  BIT(26)
+#define I40E_FLAG_VF_VLAN_PRUNING              BIT(27)
 
        struct i40e_client_instance *cinst;
        bool stat_offsets_loaded;

diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
index 9ce6e633cc2f0169e6b63d2009b610092e90a507..9a5a47b29bb753709a166764e4bc20f9d836ca97 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
@@ -555,10 +555,8 @@ static void i40e_set_hw_flags(struct i40e_hw *hw)
 
        if (aq->api_maj_ver > 1 ||
            (aq->api_maj_ver == 1 &&
-            aq->api_min_ver >= 8)) {
+            aq->api_min_ver >= 8))
                hw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;
-               hw->flags |= I40E_HW_FLAG_DROP_MODE;
-       }
 
        if (aq->api_maj_ver > 1 ||
            (aq->api_maj_ver == 1 &&

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index af8491f3211d59523a8b33d59df701900e1a28ba..2158a93261cf64fea37c4a02e2ddd1e800ffb38e 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -12717,9 +12717,7 @@ static int i40e_sw_init(struct i40e_pf *pf)
        u16 pow;
 
        /* Set default capability flags */
-       pf->flags = I40E_FLAG_RX_CSUM_ENABLED |
-                   I40E_FLAG_MSI_ENABLED     |
-                   I40E_FLAG_MSIX_ENABLED;
+       pf->flags = I40E_FLAG_MSI_ENABLED | I40E_FLAG_MSIX_ENABLED;
 
        /* Set default ITR */
        pf->rx_itr_default = I40E_ITR_RX_DEF;

diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index aff6dc6afbe21b3837855ea50445f4111ab05962..060aac35d9454d52ec0b91c50b603829c16d3a01 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -553,8 +553,7 @@ struct i40e_hw {
 #define I40E_HW_FLAG_FW_LLDP_STOPPABLE      BIT_ULL(4)
 #define I40E_HW_FLAG_FW_LLDP_PERSISTENT     BIT_ULL(5)
 #define I40E_HW_FLAG_AQ_PHY_ACCESS_EXTENDED BIT_ULL(6)
-#define I40E_HW_FLAG_DROP_MODE              BIT_ULL(7)
-#define I40E_HW_FLAG_X722_FEC_REQUEST_CAPABLE BIT_ULL(8)
+#define I40E_HW_FLAG_X722_FEC_REQUEST_CAPABLE BIT_ULL(7)
        u64 flags;
 
        /* Used in set switch config AQ command */