From 6c58f690683b221b8a6ea5de9c75b76b3f15ae6d Mon Sep 17 00:00:00 2001 From: Sarveshwar Bandi Date: Mon, 24 May 2010 18:38:25 -0700 Subject: [PATCH] --- yaml --- r: 198595 b: refs/heads/master c: 556ae19110f2de5ace4733e0c19e5fa01fad08b3 h: refs/heads/master i: 198593: 21964b590d87eddccda1747a4934ae8b6ea53656 198591: 3f41886bd1015d6c063044eb408fe979ff05e1b1 v: v3 --- [refs] | 2 +- trunk/drivers/net/benet/be_main.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1a64085ca06a..eb0eaf09905b 100644 --- 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 index 058d7f95f5ae..1c79c2009e40 100644 --- a/trunk/drivers/net/benet/be_main.c +++ b/trunk/drivers/net/benet/be_main.c @@ -2487,10 +2487,6 @@ 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 */ @@ -2498,6 +2494,12 @@ static int __devinit be_probe(struct pci_dev *pdev, 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;