From: Shahed Shaikh <shahed.shaikh@qlogic.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <Dept_NX_Linux_NIC_Driver@qlogic.com>,
Rajesh Borundia <rajesh.borundia@qlogic.com>
Subject: [PATCH net 7/8] qlcnic: Fix link speed and duplex display for 83xx adapter
Date: Fri, 2 Aug 2013 23:16:00 -0400 [thread overview]
Message-ID: <1375499761-21141-8-git-send-email-shahed.shaikh@qlogic.com> (raw)
In-Reply-To: <1375499761-21141-1-git-send-email-shahed.shaikh@qlogic.com>
From: Rajesh Borundia <rajesh.borundia@qlogic.com>
o Set link speed and duplex to unknown when link is not up.
Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
---
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 25 ++++++++++++-------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index bc483e1..94ff7a4 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -2075,18 +2075,25 @@ void qlcnic_83xx_config_intr_coal(struct qlcnic_adapter *adapter)
static void qlcnic_83xx_handle_link_aen(struct qlcnic_adapter *adapter,
u32 data[])
{
+ struct qlcnic_hardware_context *ahw = adapter->ahw;
u8 link_status, duplex;
/* link speed */
link_status = LSB(data[3]) & 1;
- adapter->ahw->link_speed = MSW(data[2]);
- adapter->ahw->link_autoneg = MSB(MSW(data[3]));
- adapter->ahw->module_type = MSB(LSW(data[3]));
- duplex = LSB(MSW(data[3]));
- if (duplex)
- adapter->ahw->link_duplex = DUPLEX_FULL;
- else
- adapter->ahw->link_duplex = DUPLEX_HALF;
- adapter->ahw->has_link_events = 1;
+ if (link_status) {
+ ahw->link_speed = MSW(data[2]);
+ duplex = LSB(MSW(data[3]));
+ if (duplex)
+ ahw->link_duplex = DUPLEX_FULL;
+ else
+ ahw->link_duplex = DUPLEX_HALF;
+ } else {
+ ahw->link_speed = SPEED_UNKNOWN;
+ ahw->link_duplex = DUPLEX_UNKNOWN;
+ }
+
+ ahw->link_autoneg = MSB(MSW(data[3]));
+ ahw->module_type = MSB(LSW(data[3]));
+ ahw->has_link_events = 1;
qlcnic_advert_link_change(adapter, link_status);
}
--
1.5.6
next prev parent reply other threads:[~2013-08-03 4:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-03 3:15 [PATCH net 0/8] qlcnic: Bug fixes Shahed Shaikh
2013-08-03 3:15 ` [PATCH net 1/8] qlcnic: Fix MAC address filter issue on 82xx adapter Shahed Shaikh
2013-08-03 3:15 ` [PATCH net 2/8] qlcnic: Fix ingress MAC learning Shahed Shaikh
2013-08-03 3:15 ` [PATCH net 3/8] qlcnic: Free up memory in error path Shahed Shaikh
2013-08-03 3:15 ` [PATCH net 4/8] qlcnic: Removed adapter series name from warning messages Shahed Shaikh
2013-08-03 3:15 ` [PATCH net 5/8] qlcnic: Fix external loopback test Shahed Shaikh
2013-08-03 3:15 ` [PATCH net 6/8] qlcnic: Fix link speed display for 82xx adapter Shahed Shaikh
2013-08-03 3:16 ` Shahed Shaikh [this message]
2013-08-03 3:16 ` [PATCH net 8/8] qlcnic: Fix for flash update failure on 83xx adapter Shahed Shaikh
2013-08-03 19:03 ` [PATCH net 0/8] qlcnic: Bug 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=1375499761-21141-8-git-send-email-shahed.shaikh@qlogic.com \
--to=shahed.shaikh@qlogic.com \
--cc=Dept_NX_Linux_NIC_Driver@qlogic.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=rajesh.borundia@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).