From: Rajesh Borundia <rajesh.borundia@qlogic.com>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Ameen Rahman <ameen.rahman@qlogic.com>,
Sony Chacko <sony.chacko@qlogic.com>,
Sritej Velaga <sritej.velaga@qlogic.com>
Subject: [PATCH NEXT 3/6] netxen_nic: Fix phy link status
Date: Fri, 3 Feb 2012 13:35:12 -0800 [thread overview]
Message-ID: <1328304915-12858-4-git-send-email-rajesh.borundia@qlogic.com> (raw)
In-Reply-To: <1328304915-12858-1-git-send-email-rajesh.borundia@qlogic.com>
From: Sritej Velaga <sritej.velaga@qlogic.com>
Pass the adapter phy link status to the caller.
Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com>
---
.../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index 8f89c05..f3c0057 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
@@ -559,7 +559,11 @@ nx_fw_cmd_query_phy(struct netxen_adapter *adapter, u32 reg, u32 *val)
if (rcode != NX_RCODE_SUCCESS)
return -EIO;
- return cmd.rsp.arg1;
+ if (val == NULL)
+ return -EIO;
+
+ *val = cmd.rsp.arg1;
+ return 0;
}
int
--
1.7.3.3
next prev parent reply other threads:[~2012-02-03 21:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 21:35 [PATCH 0/6] netxen: Fixes Rajesh Borundia
2012-02-03 21:35 ` [PATCH NEXT 1/6] netxen_nic: fix cdrp race condition Rajesh Borundia
2012-02-03 21:35 ` [PATCH NEXT 2/6] netxen_nic: fw dump support Rajesh Borundia
2012-02-03 21:35 ` Rajesh Borundia [this message]
2012-02-03 21:35 ` [PATCH NEXT 4/6] netxen_nic: Error logging on firmware hang Rajesh Borundia
2012-02-03 21:35 ` [PATCH NEXT 5/6] netxen: Fix a panic during driver unload in device_remove_file Rajesh Borundia
2012-02-03 21:35 ` [PATCH NEXT 6/6] netxen: report valid speed and duplex status when link is down Rajesh Borundia
2012-02-04 21:04 ` [PATCH 0/6] netxen: Fixes 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=1328304915-12858-4-git-send-email-rajesh.borundia@qlogic.com \
--to=rajesh.borundia@qlogic.com \
--cc=ameen.rahman@qlogic.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sony.chacko@qlogic.com \
--cc=sritej.velaga@qlogic.com \
/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;
as well as URLs for NNTP newsgroup(s).