From 3e1e4266c1f4ccabe1f0b4172db8f7ed3075f677 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Wed, 23 Mar 2011 02:44:30 +0000
Subject: [PATCH] --- yaml --- r: 242646 b: refs/heads/master c:
 cda6587c21a887254c8ed4b58da8fcc4040ab557 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/myri10ge/myri10ge.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 10d3fb906d1e..c366f8fd2bf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61b85bf6060bfd205c218f5aeb71c19a24abb0cd
+refs/heads/master: cda6587c21a887254c8ed4b58da8fcc4040ab557
diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c
index a7f2eed9a08a..1f4e8680a96a 100644
--- a/trunk/drivers/net/myri10ge/myri10ge.c
+++ b/trunk/drivers/net/myri10ge/myri10ge.c
@@ -3645,6 +3645,7 @@ static void myri10ge_free_slices(struct myri10ge_priv *mgp)
 			dma_free_coherent(&pdev->dev, bytes,
 					  ss->fw_stats, ss->fw_stats_bus);
 			ss->fw_stats = NULL;
+			netif_napi_del(&ss->napi);
 		}
 	}
 	kfree(mgp->ss);