From c6b837417771bfffa7a463654e286a1d869806f4 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Sun, 14 May 2006 12:42:14 +0200 Subject: [PATCH] --- yaml --- r: 35307 b: refs/heads/master c: 623a1593c84afb86b2f496a56fb4ec37f82b5c78 h: refs/heads/master i: 35305: 5b587abf7c8a2cbe7a4c55d37b670845f2a50682 35303: 3e119539e35998259bcd4a801cf8ad942904661e v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b58e755ff054..8ac385d42623 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dccf61112e6755f4e6f154c1794bab3c509bc71 +refs/heads/master: 623a1593c84afb86b2f496a56fb4ec37f82b5c78 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index ea4f9f7bd071..3424b3c1083c 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -771,6 +771,8 @@ static int rtl8169_set_speed_xmii(struct net_device *dev, auto_nego &= ~(PHY_Cap_10_Half | PHY_Cap_100_Half); } + auto_nego |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM; + tp->phy_auto_nego_reg = auto_nego; tp->phy_1000_ctrl_reg = giga_ctrl; @@ -962,6 +964,11 @@ static void rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd) else if (status & _10bps) cmd->speed = SPEED_10; + if (status & TxFlowCtrl) + cmd->advertising |= ADVERTISED_Asym_Pause; + if (status & RxFlowCtrl) + cmd->advertising |= ADVERTISED_Pause; + cmd->duplex = ((status & _1000bpsF) || (status & FullDup)) ? DUPLEX_FULL : DUPLEX_HALF; }