diff options
| author | Chun-Hao Lin <hau@realtek.com> | 2016-07-29 16:37:55 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-31 20:34:05 -0700 |
| commit | e06362369ae1e5b0ba70b66f8703ff08bcb63b23 (patch) | |
| tree | 651fcc709247bce7d570bdc9534ee561a6aeb120 /drivers/net | |
| parent | 5fa80a326d9dbd79d83148768c618e2da69e98e0 (diff) | |
| download | linux-e06362369ae1e5b0ba70b66f8703ff08bcb63b23.tar.gz linux-e06362369ae1e5b0ba70b66f8703ff08bcb63b23.tar.bz2 linux-e06362369ae1e5b0ba70b66f8703ff08bcb63b23.zip | |
r8169: add checking driver's runtime pm status in rtl8169_get_ethtool_stats()
Not to call rtl8169_update_counters() to dump tally counter when driver
is in runtime suspend state.
Calling rtl8169_update_counters() in runtime suspend state will produce
warning message "rtl_counters_cond == 1 (loop: 1000, delay: 10)".
Signed-off-by: Chunhao Lin <hau@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 00c387bf41b7..d0b5cae2825f 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -2308,11 +2308,17 @@ static void rtl8169_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *stats, u64 *data) { struct rtl8169_private *tp = netdev_priv(dev); + struct device *d = &tp->pci_dev->dev; struct rtl8169_counters *counters = tp->counters; ASSERT_RTNL(); - rtl8169_update_counters(dev); + pm_runtime_get_noresume(d); + + if (pm_runtime_active(d)) + rtl8169_update_counters(dev); + + pm_runtime_put_noidle(d); data[0] = le64_to_cpu(counters->tx_packets); data[1] = le64_to_cpu(counters->rx_packets); |