ice: Forbid trusted VFs in switchdev mode

Merge issues caused the check for switchdev mode has been inserted
in wrong place. It should be in ice_set_vf_trust not in ice_set_vf_mac.

Trusted VFs are forbidden in switchdev mode because they should
be configured only from the host side.

Fixes: 1c54c839935b ("ice: enable/disable switchdev when managing VFs")
Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
index 86f265268ac843ef20ef1463c3360ff7ce4c412a..862d191284ba7b536d6c39d8ae6fa74eac555181 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -4839,11 +4839,6 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
        struct ice_vf *vf;
        int ret;
 
-       if (ice_is_eswitch_mode_switchdev(pf)) {
-               dev_info(ice_pf_to_dev(pf), "Trusted VF is forbidden in switchdev mode\n");
-               return -EOPNOTSUPP;
-       }
-
        if (ice_validate_vf_id(pf, vf_id))
                return -EINVAL;
 
@@ -4903,6 +4898,11 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)
        struct ice_vf *vf;
        int ret;
 
+       if (ice_is_eswitch_mode_switchdev(pf)) {
+               dev_info(ice_pf_to_dev(pf), "Trusted VF is forbidden in switchdev mode\n");
+               return -EOPNOTSUPP;
+       }
+
        if (ice_validate_vf_id(pf, vf_id))
                return -EINVAL;