mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
|
From 127532cd0f060ebc3c4cbca81b6438728ad5896e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
||
|
|
Date: Mon, 27 Nov 2023 18:20:11 +0100
|
||
|
|
Subject: [PATCH] r8169: improve handling task scheduling
|
||
|
|
|
||
|
|
If we know that the task is going to be a no-op, don't even schedule it.
|
||
|
|
And remove the check for netif_running() in the worker function, the
|
||
|
|
check for flag RTL_FLAG_TASK_ENABLED is sufficient. Note that we can't
|
||
|
|
remove the check for flag RTL_FLAG_TASK_ENABLED in the worker function
|
||
|
|
because we have no guarantee when it will be executed.
|
||
|
|
|
||
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
||
|
|
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
|
||
|
|
Link: https://lore.kernel.org/r/c65873a3-7394-4107-99a7-83f20030779c@gmail.com
|
||
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/realtek/r8169_main.c | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
||
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
||
|
|
@@ -2252,6 +2252,9 @@ u16 rtl8168h_2_get_adc_bias_ioffset(stru
|
||
|
|
|
||
|
|
static void rtl_schedule_task(struct rtl8169_private *tp, enum rtl_flag flag)
|
||
|
|
{
|
||
|
|
+ if (!test_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags))
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
set_bit(flag, tp->wk.flags);
|
||
|
|
schedule_work(&tp->wk.work);
|
||
|
|
}
|
||
|
|
@@ -4491,8 +4494,7 @@ static void rtl_task(struct work_struct
|
||
|
|
|
||
|
|
rtnl_lock();
|
||
|
|
|
||
|
|
- if (!netif_running(tp->dev) ||
|
||
|
|
- !test_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags))
|
||
|
|
+ if (!test_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags))
|
||
|
|
goto out_unlock;
|
||
|
|
|
||
|
|
if (test_and_clear_bit(RTL_FLAG_TASK_TX_TIMEOUT, tp->wk.flags)) {
|