i40e: re-number feature flags to remove gaps

Remove the gaps created by the recent refactor of various feature flags
that have moved to the state field. Use only a u32 now that we have
fewer than 32 flags in the field.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 67518013ca4da1c3ea0324d0f12c8d38b3d4476a..a44139c1de80c8f5156d364805cacc67aa18118c 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -518,37 +518,32 @@ struct i40e_pf {
 #define I40E_HW_RESTART_AUTONEG                        BIT(18)
 #define I40E_HW_STOPPABLE_FW_LLDP              BIT(19)
 
-       u64 flags;
-#define I40E_FLAG_RX_CSUM_ENABLED              BIT_ULL(0)
-#define I40E_FLAG_MSI_ENABLED                  BIT_ULL(1)
-#define I40E_FLAG_MSIX_ENABLED                 BIT_ULL(2)
-#define I40E_FLAG_RSS_ENABLED                  BIT_ULL(3)
-#define I40E_FLAG_VMDQ_ENABLED                 BIT_ULL(4)
-/* Gap for BIT_ULL(5) */
-#define I40E_FLAG_SRIOV_ENABLED                        BIT_ULL(6)
-#define I40E_FLAG_DCB_CAPABLE                  BIT_ULL(7)
-#define I40E_FLAG_DCB_ENABLED                  BIT_ULL(8)
-#define I40E_FLAG_FD_SB_ENABLED                        BIT_ULL(9)
-#define I40E_FLAG_FD_ATR_ENABLED               BIT_ULL(10)
-/* Gap for BIT_ULL(11) and BIT_ULL(12) */
-#define I40E_FLAG_MFP_ENABLED                  BIT_ULL(13)
-/* Gap for BIT_ULL(14) */
-#define I40E_FLAG_HW_ATR_EVICT_ENABLED         BIT_ULL(15)
-#define I40E_FLAG_VEB_MODE_ENABLED             BIT_ULL(16)
-#define I40E_FLAG_VEB_STATS_ENABLED            BIT_ULL(17)
-#define I40E_FLAG_LINK_POLLING_ENABLED         BIT_ULL(18)
-#define I40E_FLAG_TRUE_PROMISC_SUPPORT         BIT_ULL(19)
-/* Gap for BIT_ULL(20) */
-#define I40E_FLAG_LEGACY_RX                    BIT_ULL(21)
-#define I40E_FLAG_PTP                          BIT_ULL(22)
-#define I40E_FLAG_IWARP_ENABLED                        BIT_ULL(23)
-/* Gap for BIT_ULL(24) through BIT_ULL(26) */
-#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED   BIT_ULL(27)
-#define I40E_FLAG_SOURCE_PRUNING_DISABLED      BIT_ULL(28)
-#define I40E_FLAG_TC_MQPRIO                    BIT_ULL(29)
-#define I40E_FLAG_FD_SB_INACTIVE               BIT_ULL(30)
-#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER                BIT_ULL(31)
-#define I40E_FLAG_DISABLE_FW_LLDP              BIT_ULL(32)
+       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)
 
        struct i40e_client_instance *cinst;
        bool stat_offsets_loaded;