summaryrefslogtreecommitdiffstats
path: root/drivers/net/benet
diff options
context:
space:
mode:
authorSarveshwar Bandi <sarveshwarb@serverengines.com>2010-05-24 18:38:25 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-24 18:38:25 -0700
commit556ae19110f2de5ace4733e0c19e5fa01fad08b3 (patch)
tree03041518015f5920693ba1e344914a47d6474f1f /drivers/net/benet
parentd9b52dc6fd1fbb2bad645cbc86a60f984c1cb179 (diff)
downloadop-kernel-dev-556ae19110f2de5ace4733e0c19e5fa01fad08b3.zip
op-kernel-dev-556ae19110f2de5ace4733e0c19e5fa01fad08b3.tar.gz
be2net: Bug fix in init code in probe
PCI function reset needs to invoked after fw init ioctl is issued. Signed-off-by: Sarveshwar Bandi <sarveshwarb@serverengines.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
-rw-r--r--drivers/net/benet/be_main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 058d7f9..1c79c20 100644
--- a/drivers/net/benet/be_main.c
+++ b/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;
OpenPOWER on IntegriCloud