lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6

Browse Source
This commit is contained in:
Jeff Garzik
2006-03-11 13:35:49 -05:00
parent 749dfc7055 cb764326df
commit b962697b79
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/e1000/e1000_main.c
View File

@@ -4171,7 +4171,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
spin_unlock_irqrestore(&adapter->stats_lock, flags); spin_unlock_irqrestore(&adapter->stats_lock, flags);
return -EIO; return -EIO;
} }
if (adapter->hw.phy_type == e1000_phy_m88) { if (adapter->hw.phy_type == e1000_media_type_copper) {
switch (data->reg_num) { switch (data->reg_num) {
case PHY_CTRL: case PHY_CTRL:
if (mii_reg & MII_CR_POWER_DOWN) if (mii_reg & MII_CR_POWER_DOWN)
@@ -4187,8 +4187,8 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
else else
spddplx = SPEED_10; spddplx = SPEED_10;
spddplx += (mii_reg & 0x100) spddplx += (mii_reg & 0x100)
? FULL_DUPLEX : ? DUPLEX_FULL :
HALF_DUPLEX; DUPLEX_HALF;
retval = e1000_set_spd_dplx(adapter, retval = e1000_set_spd_dplx(adapter,
spddplx); spddplx);
if (retval) { if (retval) {