From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: "Fujinaka, Todd" <todd.fujinaka@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 3/6] igb: Don't let ethtool try to write to iNVM in i210/i211
Date: Fri, 1 Nov 2013 06:56:47 -0700 [thread overview]
Message-ID: <1383314210-24289-4-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1383314210-24289-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: "Fujinaka, Todd" <todd.fujinaka@intel.com>
Don't let ethtool try to write to iNVM in i210/i211.
This fixes an issue seen by Marek Vasut.
Reported-by: Marek Vasut <marex@denx.de>
Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 0ae3177..b918ba3 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -771,8 +771,10 @@ static int igb_set_eeprom(struct net_device *netdev,
if (eeprom->len == 0)
return -EOPNOTSUPP;
- if (hw->mac.type == e1000_i211)
+ if ((hw->mac.type >= e1000_i210) &&
+ !igb_get_flash_presence_i210(hw)) {
return -EOPNOTSUPP;
+ }
if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
return -EFAULT;
--
1.8.3.1
next prev parent reply other threads:[~2013-11-01 13:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-01 13:56 [net-next 0/6][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-11-01 13:56 ` [net-next 1/6] e1000: fix wrong queue idx calculation Jeff Kirsher
2013-11-01 13:56 ` [net-next 2/6] ixgbevf: remove redundant workaround Jeff Kirsher
2013-11-01 13:56 ` Jeff Kirsher [this message]
2013-11-01 14:05 ` [net-next 3/6] igb: Don't let ethtool try to write to iNVM in i210/i211 Sergei Shtylyov
2013-11-01 13:56 ` [net-next 4/6] ixgbe: Reduce memory consumption with larger page sizes Jeff Kirsher
2013-11-01 13:56 ` [net-next 5/6] ixgbe: cleanup IXGBE_DESC_UNUSED Jeff Kirsher
2013-11-01 13:56 ` [net-next 6/6] ixgbe: fix inconsistent clearing of the multicast table Jeff Kirsher
2013-11-02 5:17 ` [net-next 0/6][pull request] Intel Wired LAN Driver Updates 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=1383314210-24289-4-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=sassmann@redhat.com \
--cc=todd.fujinaka@intel.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).