---

yaml --- r: 198595 b: refs/heads/master c: 556ae19 h: refs/heads/master i: 198593: 21964b5 198591: 3f41886 v: v3
git-mirror · May 25, 2010 · 6c58f69 · 6c58f69
1 parent 1fc2402
commit 6c58f69
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179
+refs/heads/master: 556ae19110f2de5ace4733e0c19e5fa01fad08b3
diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c
@@ -2487,17 +2487,19 @@ static int __devinit be_probe(struct pci_dev *pdev,
 		status = be_cmd_POST(adapter);
 		if (status)
 			goto ctrl_clean;
-
-		status = be_cmd_reset_function(adapter);
-		if (status)
-			goto ctrl_clean;
 	}
 
 	/* tell fw we're ready to fire cmds */
 	status = be_cmd_fw_init(adapter);
 	if (status)
 		goto ctrl_clean;
 
+	if (be_physfn(adapter)) {
+		status = be_cmd_reset_function(adapter);
+		if (status)
+			goto ctrl_clean;
+	}
+
 	status = be_stats_init(adapter);
 	if (status)
 		goto ctrl_clean;