From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Nicolas Schichan <nschichan@freebox.fr>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 01/10] e1000: always call e1000_check_for_link() on e1000_ce4100 MACs.
Date: Thu, 21 Jul 2011 19:01:09 -0700 [thread overview]
Message-ID: <1311300078-12876-2-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1311300078-12876-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Nicolas Schichan <nschichan@freebox.fr>
Interrupts about link lost or rx sequence errors are not reported by
the ce4100 hardware, leading to transitions from link UP to link DOWN
never being reported.
Signed-off-by: Nicolas Schichan <nschichan@freebox.fr>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/e1000/e1000_main.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index acaebec..f97afda 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2402,13 +2402,16 @@ bool e1000_has_link(struct e1000_adapter *adapter)
struct e1000_hw *hw = &adapter->hw;
bool link_active = false;
- /* get_link_status is set on LSC (link status) interrupt or
- * rx sequence error interrupt. get_link_status will stay
- * false until the e1000_check_for_link establishes link
- * for copper adapters ONLY
+ /* get_link_status is set on LSC (link status) interrupt or rx
+ * sequence error interrupt (except on intel ce4100).
+ * get_link_status will stay false until the
+ * e1000_check_for_link establishes link for copper adapters
+ * ONLY
*/
switch (hw->media_type) {
case e1000_media_type_copper:
+ if (hw->mac_type == e1000_ce4100)
+ hw->get_link_status = 1;
if (hw->get_link_status) {
e1000_check_for_link(hw);
link_active = !hw->get_link_status;
--
1.7.6
next prev parent reply other threads:[~2011-07-22 2:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 2:01 [net-next 00/10][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2011-07-22 2:01 ` Jeff Kirsher [this message]
2011-07-22 2:01 ` [net-next 02/10] igb: Fix for DH89xxCC near end loopback test Jeff Kirsher
2011-07-22 2:01 ` [net-next 03/10] ixgbe: Update ATR to use recorded TX queues instead of CPU for routing Jeff Kirsher
2011-07-22 2:01 ` [net-next 04/10] ixgbe: inline the ixgbe_maybe_stop_tx function Jeff Kirsher
2011-07-22 2:01 ` [net-next 05/10] ixgbe: add structure for containing RX/TX rings to q_vector Jeff Kirsher
2011-07-22 2:01 ` [net-next 06/10] ixgbe: Move interrupt related values out of ring and into q_vector Jeff Kirsher
2011-07-22 2:01 ` [net-next 07/10] ixgbe: Pass staterr instead of re-reading status and error bits from descriptor Jeff Kirsher
2011-07-22 2:01 ` [net-next 08/10] ixgbe: remove ifdef check for non-existent define Jeff Kirsher
2011-07-22 2:01 ` [net-next 09/10] ixgbe: only enable WoL for magic packet by default Jeff Kirsher
2011-07-22 2:01 ` [net-next 10/10] ixgbe: convert to ndo_fix_features Jeff Kirsher
2011-07-22 3:39 ` [net-next 00/10][pull request] Intel Wired LAN Driver Update David Miller
2011-07-22 4:31 ` Jeff Kirsher
-- strict thread matches above, loose matches on Subject: below --
2011-07-22 6:09 [net-next 00/10 v2][pull " Jeff Kirsher
2011-07-22 6:09 ` [net-next 01/10] e1000: always call e1000_check_for_link() on e1000_ce4100 MACs Jeff Kirsher
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=1311300078-12876-2-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nschichan@freebox.fr \
--cc=sassmann@redhat.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).