summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2006-04-18 12:30:51 -0700
committerAuke Kok <juke-jan.h.kok@intel.com>2006-04-18 12:30:51 -0700
commitdc86d32ab51c4ad3086472457fb90b61249d91f5 (patch)
tree4f8a266d797110e9f9f76eae04117a756e94f7a2 /drivers/net/e1000
parent8fc65162a8f25929be80c8d6321a3479e92b5aae (diff)
downloadblackbird-op-linux-dc86d32ab51c4ad3086472457fb90b61249d91f5.tar.gz
blackbird-op-linux-dc86d32ab51c4ad3086472457fb90b61249d91f5.zip
e1000: fix mispatch for media type detect.
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>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 82d443ba3612..2b8bced0cf64 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 *netdev, struct ifreq *ifr, int cmd)
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)
OpenPOWER on IntegriCloud