Skip to content

Commit 89f22f1

Browse files
ndnunleyanguy11
authored andcommitted
iavf: free q_vectors before queues in iavf_disable_vf
iavf_free_queues() clears adapter->num_active_queues, which iavf_free_q_vectors() relies on, so swap the order of these two function calls in iavf_disable_vf(). This resolves a panic encountered when the interface is disabled and then later brought up again after PF communication is restored. Fixes: 65c7006 ("i40evf: assign num_active_queues inside i40evf_alloc_queues") Signed-off-by: Nicholas Nunley <[email protected]> Tested-by: Tony Brelinski <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 8a4a126 commit 89f22f1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/ethernet/intel/iavf/iavf_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2123,8 +2123,8 @@ static void iavf_disable_vf(struct iavf_adapter *adapter)
21232123

21242124
iavf_free_misc_irq(adapter);
21252125
iavf_reset_interrupt_capability(adapter);
2126-
iavf_free_queues(adapter);
21272126
iavf_free_q_vectors(adapter);
2127+
iavf_free_queues(adapter);
21282128
memset(adapter->vf_res, 0, IAVF_VIRTCHNL_VF_RESOURCE_SIZE);
21292129
iavf_shutdown_adminq(&adapter->hw);
21302130
adapter->netdev->flags &= ~IFF_UP;

0 commit comments

Comments
 (0)