From: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Date: Mon, 18 May 2009 03:48:59 +0000 (-0700)
Subject: mlx4_en: Fix not deleted napi structures
X-Git-Tag: v2.6.30-rc7~20^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72876a603422d3767273ffb3918033fa1bfda0f3;p=profile%2Fivi%2Fkernel-x86-ivi.git

mlx4_en: Fix not deleted napi structures

Napi structures are being created each time we open a port, but when
the port is closed the napi structure is only disabled but not removed.
This bug caused hang while removing the driver.

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/mlx4/en_cq.c b/drivers/net/mlx4/en_cq.c
index 91f50de..a276125 100644
--- a/drivers/net/mlx4/en_cq.c
+++ b/drivers/net/mlx4/en_cq.c
@@ -125,8 +125,10 @@ void mlx4_en_deactivate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
 
 	if (cq->is_tx)
 		del_timer(&cq->timer);
-	else
+	else {
 		napi_disable(&cq->napi);
+		netif_napi_del(&cq->napi);
+	}
 
 	mlx4_cq_free(mdev->dev, &cq->mcq);
 }