diff options
author | Sarveshwar Bandi <sarveshwarb@serverengines.com> | 2010-05-24 21:38:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-24 21:38:25 -0400 |
commit | 556ae19110f2de5ace4733e0c19e5fa01fad08b3 (patch) | |
tree | 03041518015f5920693ba1e344914a47d6474f1f | |
parent | d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179 (diff) |
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>
-rw-r--r-- | drivers/net/benet/be_main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 058d7f95f5ae..1c79c2009e40 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, | |||
2487 | status = be_cmd_POST(adapter); | 2487 | status = be_cmd_POST(adapter); |
2488 | if (status) | 2488 | if (status) |
2489 | goto ctrl_clean; | 2489 | goto ctrl_clean; |
2490 | |||
2491 | status = be_cmd_reset_function(adapter); | ||
2492 | if (status) | ||
2493 | goto ctrl_clean; | ||
2494 | } | 2490 | } |
2495 | 2491 | ||
2496 | /* tell fw we're ready to fire cmds */ | 2492 | /* tell fw we're ready to fire cmds */ |
@@ -2498,6 +2494,12 @@ static int __devinit be_probe(struct pci_dev *pdev, | |||
2498 | if (status) | 2494 | if (status) |
2499 | goto ctrl_clean; | 2495 | goto ctrl_clean; |
2500 | 2496 | ||
2497 | if (be_physfn(adapter)) { | ||
2498 | status = be_cmd_reset_function(adapter); | ||
2499 | if (status) | ||
2500 | goto ctrl_clean; | ||
2501 | } | ||
2502 | |||
2501 | status = be_stats_init(adapter); | 2503 | status = be_stats_init(adapter); |
2502 | if (status) | 2504 | if (status) |
2503 | goto ctrl_clean; | 2505 | goto ctrl_clean; |