Skip to content

Commit e8fcf58

Browse files
Ivan Vecerakuba-moo
authored andcommitted
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 <[email protected]> Reviewed-by: Jacob Keller <[email protected]> Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 2c0fa38 commit e8fcf58

File tree

4 files changed

+31
-37
lines changed

4 files changed

+31
-37
lines changed

drivers/net/ethernet/intel/i40e/i40e.h

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -502,33 +502,32 @@ struct i40e_pf {
502502
#define I40E_HW_RESTART_AUTONEG BIT(18)
503503

504504
u32 flags;
505-
#define I40E_FLAG_RX_CSUM_ENABLED BIT(0)
506-
#define I40E_FLAG_MSI_ENABLED BIT(1)
507-
#define I40E_FLAG_MSIX_ENABLED BIT(2)
508-
#define I40E_FLAG_RSS_ENABLED BIT(3)
509-
#define I40E_FLAG_VMDQ_ENABLED BIT(4)
510-
#define I40E_FLAG_SRIOV_ENABLED BIT(5)
511-
#define I40E_FLAG_DCB_CAPABLE BIT(6)
512-
#define I40E_FLAG_DCB_ENABLED BIT(7)
513-
#define I40E_FLAG_FD_SB_ENABLED BIT(8)
514-
#define I40E_FLAG_FD_ATR_ENABLED BIT(9)
515-
#define I40E_FLAG_MFP_ENABLED BIT(10)
516-
#define I40E_FLAG_HW_ATR_EVICT_ENABLED BIT(11)
517-
#define I40E_FLAG_VEB_MODE_ENABLED BIT(12)
518-
#define I40E_FLAG_VEB_STATS_ENABLED BIT(13)
519-
#define I40E_FLAG_LINK_POLLING_ENABLED BIT(14)
520-
#define I40E_FLAG_TRUE_PROMISC_SUPPORT BIT(15)
521-
#define I40E_FLAG_LEGACY_RX BIT(16)
522-
#define I40E_FLAG_PTP BIT(17)
523-
#define I40E_FLAG_IWARP_ENABLED BIT(18)
524-
#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED BIT(19)
525-
#define I40E_FLAG_SOURCE_PRUNING_DISABLED BIT(20)
526-
#define I40E_FLAG_TC_MQPRIO BIT(21)
527-
#define I40E_FLAG_FD_SB_INACTIVE BIT(22)
528-
#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER BIT(23)
529-
#define I40E_FLAG_DISABLE_FW_LLDP BIT(24)
530-
#define I40E_FLAG_RS_FEC BIT(25)
531-
#define I40E_FLAG_BASE_R_FEC BIT(26)
505+
#define I40E_FLAG_MSI_ENABLED BIT(0)
506+
#define I40E_FLAG_MSIX_ENABLED BIT(1)
507+
#define I40E_FLAG_RSS_ENABLED BIT(2)
508+
#define I40E_FLAG_VMDQ_ENABLED BIT(3)
509+
#define I40E_FLAG_SRIOV_ENABLED BIT(4)
510+
#define I40E_FLAG_DCB_CAPABLE BIT(5)
511+
#define I40E_FLAG_DCB_ENABLED BIT(6)
512+
#define I40E_FLAG_FD_SB_ENABLED BIT(7)
513+
#define I40E_FLAG_FD_ATR_ENABLED BIT(8)
514+
#define I40E_FLAG_MFP_ENABLED BIT(9)
515+
#define I40E_FLAG_HW_ATR_EVICT_ENABLED BIT(10)
516+
#define I40E_FLAG_VEB_MODE_ENABLED BIT(11)
517+
#define I40E_FLAG_VEB_STATS_ENABLED BIT(12)
518+
#define I40E_FLAG_LINK_POLLING_ENABLED BIT(13)
519+
#define I40E_FLAG_TRUE_PROMISC_SUPPORT BIT(14)
520+
#define I40E_FLAG_LEGACY_RX BIT(15)
521+
#define I40E_FLAG_PTP BIT(16)
522+
#define I40E_FLAG_IWARP_ENABLED BIT(17)
523+
#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED BIT(18)
524+
#define I40E_FLAG_SOURCE_PRUNING_DISABLED BIT(19)
525+
#define I40E_FLAG_TC_MQPRIO BIT(20)
526+
#define I40E_FLAG_FD_SB_INACTIVE BIT(21)
527+
#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER BIT(22)
528+
#define I40E_FLAG_DISABLE_FW_LLDP BIT(23)
529+
#define I40E_FLAG_RS_FEC BIT(24)
530+
#define I40E_FLAG_BASE_R_FEC BIT(25)
532531
/* TOTAL_PORT_SHUTDOWN
533532
* Allows to physically disable the link on the NIC's port.
534533
* If enabled, (after link down request from the OS)
@@ -550,8 +549,8 @@ struct i40e_pf {
550549
* the link is being brought down by clearing bit (I40E_AQ_PHY_ENABLE_LINK)
551550
* in abilities field of i40e_aq_set_phy_config structure
552551
*/
553-
#define I40E_FLAG_TOTAL_PORT_SHUTDOWN_ENABLED BIT(27)
554-
#define I40E_FLAG_VF_VLAN_PRUNING BIT(28)
552+
#define I40E_FLAG_TOTAL_PORT_SHUTDOWN_ENABLED BIT(26)
553+
#define I40E_FLAG_VF_VLAN_PRUNING BIT(27)
555554

556555
struct i40e_client_instance *cinst;
557556
bool stat_offsets_loaded;

drivers/net/ethernet/intel/i40e/i40e_adminq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,10 +555,8 @@ static void i40e_set_hw_flags(struct i40e_hw *hw)
555555

556556
if (aq->api_maj_ver > 1 ||
557557
(aq->api_maj_ver == 1 &&
558-
aq->api_min_ver >= 8)) {
558+
aq->api_min_ver >= 8))
559559
hw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;
560-
hw->flags |= I40E_HW_FLAG_DROP_MODE;
561-
}
562560

563561
if (aq->api_maj_ver > 1 ||
564562
(aq->api_maj_ver == 1 &&

drivers/net/ethernet/intel/i40e/i40e_main.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12717,9 +12717,7 @@ static int i40e_sw_init(struct i40e_pf *pf)
1271712717
u16 pow;
1271812718

1271912719
/* Set default capability flags */
12720-
pf->flags = I40E_FLAG_RX_CSUM_ENABLED |
12721-
I40E_FLAG_MSI_ENABLED |
12722-
I40E_FLAG_MSIX_ENABLED;
12720+
pf->flags = I40E_FLAG_MSI_ENABLED | I40E_FLAG_MSIX_ENABLED;
1272312721

1272412722
/* Set default ITR */
1272512723
pf->rx_itr_default = I40E_ITR_RX_DEF;

drivers/net/ethernet/intel/i40e/i40e_type.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,7 @@ struct i40e_hw {
553553
#define I40E_HW_FLAG_FW_LLDP_STOPPABLE BIT_ULL(4)
554554
#define I40E_HW_FLAG_FW_LLDP_PERSISTENT BIT_ULL(5)
555555
#define I40E_HW_FLAG_AQ_PHY_ACCESS_EXTENDED BIT_ULL(6)
556-
#define I40E_HW_FLAG_DROP_MODE BIT_ULL(7)
557-
#define I40E_HW_FLAG_X722_FEC_REQUEST_CAPABLE BIT_ULL(8)
556+
#define I40E_HW_FLAG_X722_FEC_REQUEST_CAPABLE BIT_ULL(7)
558557
u64 flags;
559558

560559
/* Used in set switch config AQ command */

0 commit comments

Comments
 (0)