aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 0c631a77ccf6..34d77ed6acaa 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)
4171 spin_unlock_irqrestore(&adapter->stats_lock, flags); 4171 spin_unlock_irqrestore(&adapter->stats_lock, flags);
4172 return -EIO; 4172 return -EIO;
4173 } 4173 }
4174 if (adapter->hw.phy_type == e1000_phy_m88) { 4174 if (adapter->hw.phy_type == e1000_media_type_copper) {
4175 switch (data->reg_num) { 4175 switch (data->reg_num) {
4176 case PHY_CTRL: 4176 case PHY_CTRL:
4177 if (mii_reg & MII_CR_POWER_DOWN) 4177 if (mii_reg & MII_CR_POWER_DOWN)
@@ -4187,8 +4187,8 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
4187 else 4187 else
4188 spddplx = SPEED_10; 4188 spddplx = SPEED_10;
4189 spddplx += (mii_reg & 0x100) 4189 spddplx += (mii_reg & 0x100)
4190 ? FULL_DUPLEX : 4190 ? DUPLEX_FULL :
4191 HALF_DUPLEX; 4191 DUPLEX_HALF;
4192 retval = e1000_set_spd_dplx(adapter, 4192 retval = e1000_set_spd_dplx(adapter,
4193 spddplx); 4193 spddplx);
4194 if (retval) { 4194 if (retval) {