Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 b962697b 编写于 作者: J Jeff Garzik
浏览文件
操作

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

上级 749dfc70 cb764326
隐藏空白更改
内联 并排
Showing with 3 addition and 3 deletion
drivers/net/e1000/e1000_main.c
浏览文件 @ b962697b
...@@ -4171,7 +4171,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) ...@@ -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) ...@@ -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) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或