From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, gospo@redhat.com, stable@kernel.org,
Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-2.6 PATCH 3/4] ixgbe: Fix link capabilities during adapter resets
Date: Tue, 30 Jun 2009 14:44:36 -0700 [thread overview]
Message-ID: <20090630214436.17464.65010.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090630214349.17464.25370.stgit@localhost.localdomain>
From: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Adapter link advertisement capabilities were not persistent during
adapter resets. While configuring multispeed fiber link check for
phy autoneg_advertised settings before overwriting with default
link capabilities
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ixgbe/ixgbe_main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 30d8c0e..fce2ef4 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -4506,7 +4506,8 @@ static void ixgbe_multispeed_fiber_task(struct work_struct *work)
u32 autoneg;
adapter->flags |= IXGBE_FLAG_IN_SFP_LINK_TASK;
- if (hw->mac.ops.get_link_capabilities)
+ autoneg = hw->phy.autoneg_advertised;
+ if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
hw->mac.ops.get_link_capabilities(hw, &autoneg,
&hw->mac.autoneg);
if (hw->mac.ops.setup_link_speed)
next prev parent reply other threads:[~2009-06-30 21:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-30 21:43 [net-2.6 PATCH 1/4] ixgbe: Fix SFP log messages Jeff Kirsher
2009-06-30 21:44 ` [net-2.6 PATCH 2/4] ixgbe: Fix device capabilities of 82599 single speed fiber NICs Jeff Kirsher
2009-07-01 2:50 ` David Miller
2009-06-30 21:44 ` Jeff Kirsher [this message]
2009-07-01 2:50 ` [net-2.6 PATCH 3/4] ixgbe: Fix link capabilities during adapter resets David Miller
2009-06-30 21:44 ` [net-2.6 PATCH 4/4] ixgbe: fix unmap length bug Jeff Kirsher
2009-07-01 2:50 ` David Miller
2009-07-01 2:50 ` [net-2.6 PATCH 1/4] ixgbe: Fix SFP log messages 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=20090630214436.17464.65010.stgit@localhost.localdomain \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=mallikarjuna.chilakala@intel.com \
--cc=netdev@vger.kernel.org \
--cc=stable@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;
as well as URLs for NNTP newsgroup(s).