---

yaml --- r: 242646 b: refs/heads/master c: cda6587 h: refs/heads/master v: v3
git-mirror · Mar 23, 2011 · 3e1e426 · 3e1e426
1 parent 76b2e26
commit 3e1e426
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);