From: "Kok, Auke" <auke-jan.h.kok@intel.com>
To: "Garzik, Jeff" <jgarzik@pobox.com>,
netdev@vger.kernel.org, "Miller, David" <davem@davemloft.net>
Cc: "Ronciak, John" <john.ronciak@intel.com>,
"Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
"Kirsher, Jeff" <Jeffrey.t.kirsher@intel.com>,
"Kok, Auke" <auke@foo-projects.org>,
akpm@osdl.org
Subject: [PATCH 1/2] e1000: fix mispatch for media type detect.
Date: Tue, 18 Apr 2006 12:40:36 -0700 [thread overview]
Message-ID: <20060418194035.16262.63448.stgit@gitlost.site> (raw)
In-Reply-To: <20060418193950.16262.10757.stgit@gitlost.site>
Recent patch was mismerged in the miitool path. e1000_media_type_copper
was being compared with the phy type instead of the media type.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---
drivers/net/e1000/e1000_main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 82d443b..2b8bced 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4174,7 +4174,7 @@ e1000_mii_ioctl(struct net_device *netde
spin_unlock_irqrestore(&adapter->stats_lock, flags);
return -EIO;
}
- if (adapter->hw.phy_type == e1000_media_type_copper) {
+ if (adapter->hw.media_type == e1000_media_type_copper) {
switch (data->reg_num) {
case PHY_CTRL:
if (mii_reg & MII_CR_POWER_DOWN)
--
Auke Kok <auke-jan.h.kok@intel.com>
Intel Pro Ethernet Driver Group
LAN Access Division / Digital Enterprise Group
next prev parent reply other threads:[~2006-04-18 19:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-18 19:39 [PATCH 0/2] e1000: fix two mispatches Kok, Auke
2006-04-18 19:40 ` Kok, Auke [this message]
2006-04-18 19:40 ` [PATCH 2/2] e1000: fix mismerge skb_put Kok, Auke
2006-04-20 21:31 ` [PATCH 0/2] e1000: fix two mispatches Jeff Garzik
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=20060418194035.16262.63448.stgit@gitlost.site \
--to=auke-jan.h.kok@intel.com \
--cc=Jeffrey.t.kirsher@intel.com \
--cc=akpm@osdl.org \
--cc=auke@foo-projects.org \
--cc=davem@davemloft.net \
--cc=jesse.brandeburg@intel.com \
--cc=jgarzik@pobox.com \
--cc=john.ronciak@intel.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).