[net-next v2 03/11] i40e: remove error msg when vf with port vlan tries to remove vlan 0

[Jeff Kirsher]

From: Aleksandr Loktionov <aleksandr.loktio...@intel.com>

VF's attempt to delete vlan 0 when a port vlan is configured is harmless
in this case pf driver just does nothing.  If vf will try to remove
other vlans when a port vlan is configured it will still produce error
as before.

Signed-off-by: Aleksandr Loktionov <aleksandr.loktio...@intel.com>
Tested-by: Andrew Bowers <andrewx.bow...@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirs...@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c 
b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 71cd159e7902..24628de8e624 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -2766,7 +2766,8 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 
*msg)
 
        vsi = pf->vsi[vf->lan_vsi_idx];
        if (vsi->info.pvid) {
-               aq_ret = I40E_ERR_PARAM;
+               if (vfl->num_elements > 1 || vfl->vlan_id[0])
+                       aq_ret = I40E_ERR_PARAM;
                goto error_param;
        }
 
-- 
2.20.1