From: Jacob Keller Date: Fri, 19 Jun 2015 17:56:10 +0000 (-0700) Subject: fm10k: don't store sw_vid at reset X-Git-Tag: v4.1.12-92~3^2~205 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6ca1c25653ce3cf6a1341891aeeb3fd48ddb467f;p=users%2Fjedix%2Flinux-maple.git 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 Tested-by: Krishneil Singh Signed-off-by: Jeff Kirsher Orabug: 25394529 (cherry picked from commit b655a5c735867c1a80e7ceaa1f1c45d1dd34909f) Signed-off-by: Jack Vogel --- diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c index 0b4233d60e870..acfb8b1f88a70 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c @@ -231,9 +231,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);