---

yaml --- r: 361476 b: refs/heads/master c: 722c6f5 h: refs/heads/master v: v3
git-mirror · Mar 17, 2013 · 56bddbe · 56bddbe
1 parent 5d204ce
commit 56bddbe
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: c62dce61261c9bb90f74a493f55b35ae2480c8ae
+refs/heads/master: 722c6f585088a2c392b4c5d01b87a584bb8fb73f
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2760,6 +2760,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 	bp->port.pmf = 0;
 load_error1:
 	bnx2x_napi_disable(bp);
+	bnx2x_del_all_napi(bp);
 
 	/* clear pf_load status, as it was already set */
 	if (IS_PF(bp))