diff options
| author |   Auke Kok <auke-jan.h.kok@intel.com> | 2006-04-18 12:30:51 -0700 |
|---|---|---|
| committer |   Auke Kok <juke-jan.h.kok@intel.com> | 2006-04-18 12:30:51 -0700 |
| commit | dc86d32ab51c4ad3086472457fb90b61249d91f5 (patch) | |
| tree | 4f8a266d797110e9f9f76eae04117a756e94f7a2 /drivers/net/e1000/e1000_main.c | |
| parent | Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6 (diff) | |
| download | linux-dev-dc86d32ab51c4ad3086472457fb90b61249d91f5.tar.xz linux-dev-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/e1000_main.c')
| -rw-r--r-- | 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 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) |