From: Greg Kroah-Hartman Date: Wed, 15 Jan 2025 10:11:07 +0000 (+0100) Subject: drop queue-5.10/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch X-Git-Tag: v6.1.125~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3fa8e63d83dcfff758bf553c3a557558a6603a0;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch --- diff --git a/queue-5.10/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch b/queue-5.10/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch deleted file mode 100644 index b72823247c7..00000000000 --- a/queue-5.10/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 566a2da5a1c692b7238153f9260fed8dfe4d0def Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:36 +0800 -Subject: net: hns3: initialize reset_timer before hclgevf_misc_irq_init() - -From: Jian Shen - -[ Upstream commit d1c2e2961ab460ac2433ff8ad46000582abc573c ] - -Currently the misc irq is initialized before reset_timer setup. But -it will access the reset_timer in the irq handler. So initialize -the reset_timer earlier. - -Fixes: ff200099d271 ("net: hns3: remove unnecessary work in hclgevf_main") -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -index 755935f9efc8..8193c5afe610 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -@@ -2656,6 +2656,7 @@ static void hclgevf_state_init(struct hclgevf_dev *hdev) - clear_bit(HCLGEVF_STATE_RST_FAIL, &hdev->state); - - INIT_DELAYED_WORK(&hdev->service_task, hclgevf_service_task); -+ timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - mutex_init(&hdev->mbx_resp.mbx_mutex); - sema_init(&hdev->reset_sem, 1); -@@ -3279,7 +3280,6 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) - HCLGEVF_DRIVER_NAME); - - hclgevf_task_schedule(hdev, round_jiffies_relative(HZ)); -- timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - return 0; - --- -2.39.5 -