From e090b2c850076e69ffe4ef296ab7067c33bb7845 Mon Sep 17 00:00:00 2001
From: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Date: Sun, 17 May 2009 20:48:59 -0700
Subject: [PATCH] --- yaml --- r: 145130 b: refs/heads/master c:
 72876a603422d3767273ffb3918033fa1bfda0f3 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/mlx4/en_cq.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4479123df64c..45f3ec44890c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2513dfb83fc775364fe85803d3a84d7ebe5763a5
+refs/heads/master: 72876a603422d3767273ffb3918033fa1bfda0f3
diff --git a/trunk/drivers/net/mlx4/en_cq.c b/trunk/drivers/net/mlx4/en_cq.c
index 91f50de84be9..a276125b709b 100644
--- a/trunk/drivers/net/mlx4/en_cq.c
+++ b/trunk/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);
 }