From 4bdb0790647a2d8fbb6a816a320e72ed522ef4bf Mon Sep 17 00:00:00 2001 From: John Fastabend Date: Sun, 16 Sep 2012 08:19:46 +0000 Subject: [PATCH] --- yaml --- r: 340470 b: refs/heads/master c: f44777024c9147932c0ec2af41ed2cd50ac151c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 199eb28c0d64..d7af11ae26dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3db73804cc814579b5ad72a7ee326c2ae2dcd1e0 +refs/heads/master: f44777024c9147932c0ec2af41ed2cd50ac151c3 diff --git a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 33444b5b5105..537ed191074a 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -1912,18 +1912,13 @@ static int ixgbevf_alloc_q_vectors(struct ixgbevf_adapter *adapter) **/ static void ixgbevf_free_q_vectors(struct ixgbevf_adapter *adapter) { - int q_idx, num_q_vectors; - int napi_vectors; - - num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS; - napi_vectors = adapter->num_rx_queues; + int q_idx, num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS; for (q_idx = 0; q_idx < num_q_vectors; q_idx++) { struct ixgbevf_q_vector *q_vector = adapter->q_vector[q_idx]; adapter->q_vector[q_idx] = NULL; - if (q_idx < napi_vectors) - netif_napi_del(&q_vector->napi); + netif_napi_del(&q_vector->napi); kfree(q_vector); } }