Skip to content

Commit 4d50fcd

Browse files
dmertmananguy11
authored andcommitted
ice: alter feature support check for SRIOV and LAG
Previously, the ice driver had support for using a handler for bonding netdev events to ensure that conflicting features were not allowed to be activated at the same time. While this was still in place, additional support was added to specifically support SRIOV and LAG together. These both utilized the netdev event handler, but the SRIOV and LAG feature was behind a capabilities feature check to make sure the current NVM has support. The exclusion part of the event handler should be removed since there are users who have custom made solutions that depend on the non-exclusion of features. Wrap the creation/registration and cleanup of the event handler and associated structs in the probe flow with a feature check so that the only systems that support the full implementation of LAG features will initialize support. This will leave other systems unhindered with functionality as it existed before any LAG code was added. Fixes: bb52f42 ("ice: Add driver support for firmware changes for LAG") Reviewed-by: Jesse Brandeburg <[email protected]> Signed-off-by: Dave Ertman <[email protected]> Reviewed-by: Simon Horman <[email protected]> Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent 7d88134 commit 4d50fcd

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/net/ethernet/intel/ice/ice_lag.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,6 +1981,8 @@ int ice_init_lag(struct ice_pf *pf)
19811981
int n, err;
19821982

19831983
ice_lag_init_feature_support_flag(pf);
1984+
if (!ice_is_feature_supported(pf, ICE_F_SRIOV_LAG))
1985+
return 0;
19841986

19851987
pf->lag = kzalloc(sizeof(*lag), GFP_KERNEL);
19861988
if (!pf->lag)

0 commit comments

Comments
 (0)