From: Dhananjay Phadke <dhananjay@netxen.com>
To: davem@davemloft.com
Cc: netdev@vger.kernel.org
Subject: [PATCH NEXT 2/5] netxen: fix firmware reset logic
Date: Sun, 23 Aug 2009 11:35:10 -0700 [thread overview]
Message-ID: <1251052513-27618-2-git-send-email-dhananjay@netxen.com> (raw)
In-Reply-To: <1251052513-27618-1-git-send-email-dhananjay@netxen.com>
If netxen_need_fw_reset() return 0 [ implies firmware is up
and running], still go through dma mask check, etc.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
---
drivers/net/netxen/netxen_nic_main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index de67e42..0086574 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -754,8 +754,10 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw)
netxen_request_firmware(adapter);
err = netxen_need_fw_reset(adapter);
- if (err <= 0)
+ if (err < 0)
return err;
+ if (err == 0)
+ goto wait_init;
if (first_boot != 0x55555555) {
NXWR32(adapter, CRB_CMDPEG_STATE, 0);
--
1.6.0.2
next prev parent reply other threads:[~2009-08-23 18:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-23 18:35 [PATCH NEXT 1/5] netxen: ethtool statistics and control for LRO Dhananjay Phadke
2009-08-23 18:35 ` Dhananjay Phadke [this message]
2009-08-23 18:35 ` [PATCH NEXT 3/5] netxen: refactor tx dma mapping code Dhananjay Phadke
2009-08-23 18:35 ` [PATCH NEXT 4/5] netxen: implement pci driver shutdown Dhananjay Phadke
2009-08-23 18:35 ` [PATCH NEXT 5/5] netxen: remove netxen_nic_phan_reg.h Dhananjay Phadke
2009-08-24 2:00 ` [PATCH NEXT 1/5] netxen: ethtool statistics and control for LRO David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1251052513-27618-2-git-send-email-dhananjay@netxen.com \
--to=dhananjay@netxen.com \
--cc=davem@davemloft.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox