fm10k: don't store sw_vid at reset

If we store the sw_vid at reset of PF, then we accidentally prevent the
VF from receiving the message to update its default VID. This only
occurs if the VF is created before the PF has come up, which is the
standard way of creating VFs when using the module parameter.

This fixes an issue where we request the incorrect MAC/VLAN
combinations, and prevents us from accidentally reporting some frames as
VLAN tagged.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
index 94571e6e790c55f9d204535fd4cc364857551e75..0e25a80417b923c1dbee67e2ff91cce3d86bd103 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
@@ -228,9 +228,6 @@ int fm10k_iov_resume(struct pci_dev *pdev)
                hw->iov.ops.set_lport(hw, vf_info, i,
                                      FM10K_VF_FLAG_MULTI_CAPABLE);
 
-               /* assign our default vid to the VF following reset */
-               vf_info->sw_vid = hw->mac.default_vid;
-
                /* mailbox is disconnected so we don't send a message */
                hw->iov.ops.assign_default_mac_vlan(hw, vf_info);