From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, gospo@redhat.com,
Bruce Allan <bruce.w.allan@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next PATCH 2/7] e1000e: do not attempt to disable smart powerdown if not supported
Date: Tue, 02 Jun 2009 14:28:20 -0700 [thread overview]
Message-ID: <20090602212820.24614.4348.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090602212800.24614.45798.stgit@localhost.localdomain>
From: Bruce Allan <bruce.w.allan@intel.com>
During reset, the driver was attempting to disable the Smart Powerdown
feature even if the part does not support Smart Powerdown. Check for
support before attempting to disable the feature.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/e1000e/netdev.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index f012cc6..7e412d1 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2799,7 +2799,8 @@ void e1000e_reset(struct e1000_adapter *adapter)
e1000e_reset_adaptive(hw);
e1000_get_phy_info(hw);
- if (!(adapter->flags & FLAG_SMART_POWER_DOWN)) {
+ if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN) &&
+ !(adapter->flags & FLAG_SMART_POWER_DOWN)) {
u16 phy_data = 0;
/*
* speed up time to link by disabling smart power down, ignore
next prev parent reply other threads:[~2009-06-02 21:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-02 21:28 [net-next PATCH 1/7] e1000e: enable CRC stripping by default Jeff Kirsher
2009-06-02 21:28 ` Jeff Kirsher [this message]
2009-06-02 21:28 ` [net-next PATCH 3/7] e1000e: correct flow control thresholds Jeff Kirsher
2009-06-02 21:28 ` [net-next PATCH 4/7] e1000e: specify max supported frame size in adapter struct Jeff Kirsher
2009-06-02 21:29 ` [net-next PATCH 5/7] e1000e: add support for 82577/82578 GbE LOM parts Jeff Kirsher
2009-06-02 21:29 ` [net-next PATCH 6/7] e1000e: workaround a Tx hang on 82577/82578 Jeff Kirsher
2009-06-02 21:29 ` [net-next PATCH 7/7] e1000e: bump the version number Jeff Kirsher
2009-06-03 10:34 ` [net-next PATCH 1/7] e1000e: enable CRC stripping by default 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=20090602212820.24614.4348.stgit@localhost.localdomain \
--to=jeffrey.t.kirsher@intel.com \
--cc=bruce.w.allan@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.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;
as well as URLs for NNTP newsgroup(s).