diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c
b/drivers/net/ethernet/intel/igc/igc_tsn.c
index
1e44374ca1ffbb86e9893266c590f318984ef574..6e4582de9602db2c6667f1736cc2acaa4d4b5201
100644
--- a/drivers/net/ethernet/intel/igc/igc_tsn.c
+++ b/drivers/net/ethernet/intel/igc/igc_tsn.c
@@ -47,7 +47,7 @@ static unsigned int igc_tsn_new_flags(struct igc_adapter
*adapter)
new_flags |= IGC_FLAG_TSN_QAV_ENABLED;
if (adapter->strict_priority_enable)
- new_flags |= IGC_FLAG_TSN_LEGACY_ENABLED;
+ new_flags |= IGC_FLAG_TSN_QBV_ENABLED;
return new_flags;
}
IGC_FLAG_TSN_QBV_ENABLED is set multiple times in different lines:
if (adapter->taprio_offload_enable)
new_flags |= IGC_FLAG_TSN_QBV_ENABLED;
if (is_any_launchtime(adapter))
new_flags |= IGC_FLAG_TSN_QBV_ENABLED;
if (is_cbs_enabled(adapter))
new_flags |= IGC_FLAG_TSN_QAV_ENABLED;
if (adapter->strict_priority_enable)
new_flags |= IGC_FLAG_TSN_QBV_ENABLED;
return new_flags;
}
We can combine the conditions to simplify:
if (adapter->taprio_offload_enable ||
is_any_launchtime(adapter) ||
adapter->strict_priority_enable)
new_flags |= IGC_FLAG_TSN_QBV_ENABLED;
Sure.
Should I send a v2 or do you want to carry this patch in your next fpe
series?
I think you can go ahead with v2. It shouldn’t conflict much with the next
fpe series, and if my future series gets stalled, at least yours won’t be
affected.
