[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-16f11500842ce022fe654e38bd447e15790911dd@git.kernel.org>
Date: Tue, 4 Dec 2018 14:38:57 -0800
From: "tip-bot for Paul E. McKenney" <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, davem@...emloft.net, paulmck@...ux.ibm.com,
tglx@...utronix.de, nic_swsd@...ltek.com, mingo@...nel.org,
netdev@...r.kernel.org
Subject: [tip:core/rcu] ethernet/realtek: Replace synchronize_sched() with
synchronize_rcu()
Commit-ID: 16f11500842ce022fe654e38bd447e15790911dd
Gitweb: https://git.kernel.org/tip/16f11500842ce022fe654e38bd447e15790911dd
Author: Paul E. McKenney <paulmck@...ux.ibm.com>
AuthorDate: Mon, 5 Nov 2018 17:07:39 -0800
Committer: Paul E. McKenney <paulmck@...ux.ibm.com>
CommitDate: Tue, 27 Nov 2018 09:21:37 -0800
ethernet/realtek: Replace synchronize_sched() with synchronize_rcu()
Now that synchronize_rcu() waits for preempt-disable regions of code
as well as RCU read-side critical sections, synchronize_sched() can be
replaced by synchronize_rcu(). This commit therefore makes this change.
Signed-off-by: Paul E. McKenney <paulmck@...ux.ibm.com>
Cc: Realtek linux nic maintainers <nic_swsd@...ltek.com>
Cc: "David S. Miller" <davem@...emloft.net>
Cc: <netdev@...r.kernel.org>
---
drivers/net/ethernet/realtek/8139too.c | 2 +-
drivers/net/ethernet/realtek/r8169.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index ffd68a7bc9e1..69d752f0b621 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -1661,7 +1661,7 @@ static void rtl8139_tx_timeout_task (struct work_struct *work)
napi_disable(&tp->napi);
netif_stop_queue(dev);
- synchronize_sched();
+ synchronize_rcu();
netdev_dbg(dev, "Transmit timeout, status %02x %04x %04x media %02x\n",
RTL_R8(ChipCmd), RTL_R16(IntrStatus),
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 1fd01688d37b..4f1d89f0dc24 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5866,7 +5866,7 @@ static void rtl_reset_work(struct rtl8169_private *tp)
napi_disable(&tp->napi);
netif_stop_queue(dev);
- synchronize_sched();
+ synchronize_rcu();
rtl8169_hw_reset(tp);
@@ -6609,7 +6609,7 @@ static void rtl8169_down(struct net_device *dev)
rtl8169_rx_missed(dev);
/* Give a racing hard_start_xmit a few cycles to complete. */
- synchronize_sched();
+ synchronize_rcu();
rtl8169_tx_clear(tp);
Powered by blists - more mailing lists