[net-next 02/15] ice: Restore VLAN switch rule if port VLAN existed before

[Jeff Kirsher]

From: Michal Swiatkowski <michal.swiatkow...@intel.com>

The VLAN rule is lost when VM starts or the AVF driver (iavf.ko) is
reloaded. So it is necessary to add this rule again.

Signed-off-by: Michal Swiatkowski <michal.swiatkow...@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkatarama...@intel.com>
Tested-by: Andrew Bowers <andrewx.bow...@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirs...@intel.com>
---
 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c 
b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
index c725fb8e81bf..011c52a9442c 100644
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -457,8 +457,10 @@ static int ice_alloc_vsi_res(struct ice_vf *vf)
        vsi->hw_base_vector += 1;
 
        /* Check if port VLAN exist before, and restore it accordingly */
-       if (vf->port_vlan_id)
+       if (vf->port_vlan_id) {
                ice_vsi_manage_pvid(vsi, vf->port_vlan_id, true);
+               ice_vsi_add_vlan(vsi, vf->port_vlan_id & ICE_VLAN_M);
+       }
 
        eth_broadcast_addr(broadcast);
 
-- 
2.20.1