From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Bruce Allan <bruce.w.allan@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 03/12] e1000e: re-enable alternate MAC address for all devices which support it
Date: Wed, 25 Jan 2012 23:21:46 -0800 [thread overview]
Message-ID: <1327562515-29664-4-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1327562515-29664-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e1000e/lib.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/lib.c
index 0893ab1..78e3f4c 100644
--- a/drivers/net/ethernet/intel/e1000e/lib.c
+++ b/drivers/net/ethernet/intel/e1000e/lib.c
@@ -187,11 +187,8 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
if (ret_val)
goto out;
- /* Check for LOM (vs. NIC) or one of two valid mezzanine cards */
- if (!((nvm_data & NVM_COMPAT_LOM) ||
- (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_DUAL) ||
- (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD) ||
- (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES)))
+ /* not supported on older hardware or 82573 */
+ if ((hw->mac.type < e1000_82571) || (hw->mac.type == e1000_82573))
goto out;
ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,
--
1.7.7.6
next prev parent reply other threads:[~2012-01-26 7:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-26 7:21 [net-next 00/12][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-01-26 7:21 ` [net-next 01/12] e1000e: cleanup Rx checksum offload code Jeff Kirsher
2012-01-26 7:21 ` [net-next v2 02/12] e1000e: add Receive Packet Steering (RPS) support Jeff Kirsher
2012-01-26 7:21 ` Jeff Kirsher [this message]
2012-01-26 7:21 ` [net-next 04/12] e1000e: convert head, tail and itr_register offsets to __iomem pointers Jeff Kirsher
2012-01-26 7:21 ` [net-next 05/12] e1000e: pass pointer to ring struct instead of adapter struct Jeff Kirsher
2012-01-26 7:21 ` [net-next 06/12] e1000e: re-factor ethtool get/set ring parameter Jeff Kirsher
2012-01-26 7:21 ` [net-next 07/12] e1000e: default IntMode based on kernel config & available hardware support Jeff Kirsher
2012-01-26 7:21 ` [net-next 08/12] e1000e: always set transmit descriptor control registers the same Jeff Kirsher
2012-01-26 7:21 ` [net-next 09/12] e1000e: 82579: workaround for link drop issue Jeff Kirsher
2012-01-26 7:21 ` [net-next 10/12] e1000e: use default settings for Tx Inter Packet Gap timer Jeff Kirsher
2012-01-26 7:21 ` [net-next 11/12] e1000e: use hardware default values for Transmit Control register Jeff Kirsher
2012-01-26 7:21 ` [net-next 12/12] e1000e: 82574/82583 Tx hang workaround Jeff Kirsher
2012-01-26 18:49 ` [net-next 00/12][pull request] Intel Wired LAN Driver Updates David Miller
2012-01-26 21:27 ` 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=1327562515-29664-4-git-send-email-jeffrey.t.kirsher@intel.com \
--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 \
--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).