i40e: remove error msg when vf with port vlan tries to remove vlan 0

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.loktionov@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 71cd159e79020cec738dca2d9278c25ac139484a..24628de8e624d519c43b7e456b494af0e5ee13a8 100644 (file)
--- 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;
        }