summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-11 13:35:49 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-11 13:35:49 -0500
commitb962697b79a147aeaca6864f2d6c424bd462b446 (patch)
treee89136f041a068c793e2d8d23721255a61901f10 /drivers/net/e1000
parent749dfc70554f2c9e6624ac843d66571265ed9338 (diff)
parentcb764326dff0ee51aca0d450e1a292de65661055 (diff)
downloadop-kernel-dev-b962697b79a147aeaca6864f2d6c424bd462b446.zip
op-kernel-dev-b962697b79a147aeaca6864f2d6c424bd462b446.tar.gz
Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 0c631a7..34d77ed 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4171,7 +4171,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_phy_m88) {
+ if (adapter->hw.phy_type == e1000_media_type_copper) {
switch (data->reg_num) {
case PHY_CTRL:
if (mii_reg & MII_CR_POWER_DOWN)
@@ -4187,8 +4187,8 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
else
spddplx = SPEED_10;
spddplx += (mii_reg & 0x100)
- ? FULL_DUPLEX :
- HALF_DUPLEX;
+ ? DUPLEX_FULL :
+ DUPLEX_HALF;
retval = e1000_set_spd_dplx(adapter,
spddplx);
if (retval) {
OpenPOWER on IntegriCloud