Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe0592b4 authored by Nick Nunley's avatar Nick Nunley Committed by David S. Miller
Browse files

igb: use igb_free_q_vectors to cleanup failure in igb_alloc_q_vectors 



This change makes it so that igb_free_q_vectors is reused in
igb_alloc_q_vectors to handle the cleanup instead of unwinding
through the allocations.

Signed-off-by: default avatarNicholas Nunley <nicholasx.d.nunley@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3eeb62d

drivers/net/igb/igb_main.c

+3 −7
Original line number Diff line number Diff line
@@ -649,6 +649,8 @@ static void igb_free_q_vectors(struct igb_adapter *adapter) 
	for (v_idx = 0; v_idx < adapter->num_q_vectors; v_idx++) {

		struct igb_q_vector *q_vector = adapter->q_vector[v_idx];

		adapter->q_vector[v_idx] = NULL;

		if (!q_vector)

			continue;

		netif_napi_del(&q_vector->napi);

		kfree(q_vector);

	}
@@ -768,13 +770,7 @@ static int igb_alloc_q_vectors(struct igb_adapter *adapter) 
	return 0;



err_out:

	while (v_idx) {

		v_idx--;

		q_vector = adapter->q_vector[v_idx];

		netif_napi_del(&q_vector->napi);

		kfree(q_vector);

		adapter->q_vector[v_idx] = NULL;

	}

	igb_free_q_vectors(adapter);

	return -ENOMEM;

}