1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index c7d831d6e212..4f22668b6aea 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -208,6 +208,17 @@ void ixgbe_disable_sriov(struct ixgbe_adapter *adapter)
         u32 vmdctl;
         int i;
 
+        /* set num VFs to 0 to prevent access to vfinfo */
+        adapter->num_vfs = 0;
+
+        /* free VF control structures */
+        kfree(adapter->vfinfo);
+        adapter->vfinfo = NULL;
+
+        /* free macvlan list */
+        kfree(adapter->mv_list);
+        adapter->mv_list = NULL;
+
 #ifdef CONFIG_PCI_IOV
         /* disable iov and allow time for transactions to clear */
         pci_disable_sriov(adapter->pdev);
@@ -238,11 +249,7 @@ void ixgbe_disable_sriov(struct ixgbe_adapter *adapter)
                 if (adapter->vfinfo[i].vfdev)
                         pci_dev_put(adapter->vfinfo[i].vfdev);
         }
-        kfree(adapter->vfinfo);
-        kfree(adapter->mv_list);
-        adapter->vfinfo = NULL;
 
-        adapter->num_vfs = 0;
         adapter->flags &= ~IXGBE_FLAG_SRIOV_ENABLED;
 }