diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/r8169.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index ea4f9f7bd071..3424b3c1083c 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -771,6 +771,8 @@ static int rtl8169_set_speed_xmii(struct net_device *dev, | |||
771 | auto_nego &= ~(PHY_Cap_10_Half | PHY_Cap_100_Half); | 771 | auto_nego &= ~(PHY_Cap_10_Half | PHY_Cap_100_Half); |
772 | } | 772 | } |
773 | 773 | ||
774 | auto_nego |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM; | ||
775 | |||
774 | tp->phy_auto_nego_reg = auto_nego; | 776 | tp->phy_auto_nego_reg = auto_nego; |
775 | tp->phy_1000_ctrl_reg = giga_ctrl; | 777 | tp->phy_1000_ctrl_reg = giga_ctrl; |
776 | 778 | ||
@@ -962,6 +964,11 @@ static void rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd) | |||
962 | else if (status & _10bps) | 964 | else if (status & _10bps) |
963 | cmd->speed = SPEED_10; | 965 | cmd->speed = SPEED_10; |
964 | 966 | ||
967 | if (status & TxFlowCtrl) | ||
968 | cmd->advertising |= ADVERTISED_Asym_Pause; | ||
969 | if (status & RxFlowCtrl) | ||
970 | cmd->advertising |= ADVERTISED_Pause; | ||
971 | |||
965 | cmd->duplex = ((status & _1000bpsF) || (status & FullDup)) ? | 972 | cmd->duplex = ((status & _1000bpsF) || (status & FullDup)) ? |
966 | DUPLEX_FULL : DUPLEX_HALF; | 973 | DUPLEX_FULL : DUPLEX_HALF; |
967 | } | 974 | } |