From: Heiner Kallweit <hkallweit1@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Realtek linux nic maintainers <nic_swsd@realtek.com>,
Chun-Hao Lin <hau@realtek.com>
Cc: David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH RFC 06/18] r8168: remove function rtl8169_rx_missed() being specific to MAC version 01 - 06
Date: Thu, 21 Dec 2017 21:50:19 +0100 [thread overview]
Message-ID: <84e04d3c-4e44-b2c5-35f1-bbf4ef81908a@gmail.com> (raw)
In-Reply-To: <83321b2e-8402-26c5-9703-3fe795cc893d@gmail.com>
Function rtl8169_rx_missed() does nothing on MAC versions > 06,
therefore remove it.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8168.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8168.c b/drivers/net/ethernet/realtek/r8168.c
index 0ce789814..0ba0ac5ec 100644
--- a/drivers/net/ethernet/realtek/r8168.c
+++ b/drivers/net/ethernet/realtek/r8168.c
@@ -7401,21 +7401,9 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
return work_done;
}
-static void rtl8169_rx_missed(struct net_device *dev, void __iomem *ioaddr)
-{
- struct rtl8169_private *tp = netdev_priv(dev);
-
- if (tp->mac_version > RTL_GIGA_MAC_VER_06)
- return;
-
- dev->stats.rx_missed_errors += (RTL_R32(RxMissed) & 0xffffff);
- RTL_W32(RxMissed, 0);
-}
-
static void rtl8169_down(struct net_device *dev)
{
struct rtl8169_private *tp = netdev_priv(dev);
- void __iomem *ioaddr = tp->mmio_addr;
del_timer_sync(&tp->timer);
@@ -7423,12 +7411,6 @@ static void rtl8169_down(struct net_device *dev)
netif_stop_queue(dev);
rtl8169_hw_reset(tp);
- /*
- * At this point device interrupts can not be enabled in any function,
- * as netif_running is not true (rtl8169_interrupt, rtl8169_reset_task)
- * and napi is disabled (rtl8169_poll).
- */
- rtl8169_rx_missed(dev, ioaddr);
/* Give a racing hard_start_xmit a few cycles to complete. */
synchronize_sched();
@@ -7568,16 +7550,12 @@ static void
rtl8169_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
{
struct rtl8169_private *tp = netdev_priv(dev);
- void __iomem *ioaddr = tp->mmio_addr;
struct pci_dev *pdev = tp->pci_dev;
struct rtl8169_counters *counters = tp->counters;
unsigned int start;
pm_runtime_get_noresume(&pdev->dev);
- if (netif_running(dev) && pm_runtime_active(&pdev->dev))
- rtl8169_rx_missed(dev, ioaddr);
-
do {
start = u64_stats_fetch_begin_irq(&tp->rx_stats.syncp);
stats->rx_packets = tp->rx_stats.packets;
@@ -7697,7 +7675,6 @@ static int rtl8169_runtime_suspend(struct device *device)
rtl8169_net_suspend(dev);
/* Update counters before going runtime suspend */
- rtl8169_rx_missed(dev, tp->mmio_addr);
rtl8169_update_counters(dev);
return 0;
--
2.15.1
next prev parent reply other threads:[~2017-12-21 20:51 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-21 20:38 [PATCH RFC 00/18] r8169: separate r8168 driver and add experimental phylib support Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 01/18] r8169: split driver to one for the non-PCIE cards (r8169) and one for the PCIE cards (r8168) Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 02/18] r8168: remove code specific to MAC version 01 - 06 Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 03/18] r8168: remove magic register handling used on MAC version 05 and 06 only Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 04/18] r8168: remove TBI mode support needed for MAC version 01 only Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 05/18] r8168: remove unneeded callbacks from struct rtl8169_private Heiner Kallweit
2017-12-21 20:50 ` Heiner Kallweit [this message]
2017-12-21 20:50 ` [PATCH RFC 07/18] r8168: replace 8169 with 8168 in all relevant symbols Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 08/18] r8168: add basic phylib support Heiner Kallweit
2017-12-22 9:44 ` Andrew Lunn
2017-12-21 20:50 ` [PATCH RFC 09/18] r8168: use genphy_soft_reset instead of open coding the soft reset Heiner Kallweit
2017-12-22 9:57 ` Andrew Lunn
2017-12-22 22:19 ` Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 10/18] r8168: switch to phy_ethtool_get/set_link_ksettings Heiner Kallweit
2017-12-22 9:57 ` Andrew Lunn
2017-12-21 20:50 ` [PATCH RFC 11/18] r8168: switch to phy_ethtool_nway_reset Heiner Kallweit
2017-12-22 9:58 ` Andrew Lunn
2017-12-21 20:50 ` [PATCH RFC 12/18] r8168: switch to phy_mii_ioctl Heiner Kallweit
2017-12-22 10:00 ` Andrew Lunn
2017-12-22 23:01 ` Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 13/18] r8168: replace speed_down with genphy_restart_aneg Heiner Kallweit
2017-12-22 10:14 ` Andrew Lunn
2017-12-22 23:36 ` Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 14/18] r8168: remove rtl8168_set_speed Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 15/18] r8168: remove rtl_phy_work and rtl8168_phy_timer Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 16/18] r8168: use phy_read/write in rtl_readphy/writephy helpers Heiner Kallweit
2017-12-21 20:50 ` [PATCH RFC 17/18] r8168: remove use of struct mii_if_info Heiner Kallweit
2017-12-22 10:21 ` Andrew Lunn
2017-12-21 20:50 ` [PATCH RFC 18/18] r8168: use link speed information as maintained by phylib Heiner Kallweit
2017-12-22 10:22 ` Andrew Lunn
2017-12-21 21:16 ` [PATCH RFC 00/18] r8169: separate r8168 driver and add experimental phylib support David Miller
2017-12-21 21:27 ` Heiner Kallweit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=84e04d3c-4e44-b2c5-35f1-bbf4ef81908a@gmail.com \
--to=hkallweit1@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=hau@realtek.com \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).