37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
From 8ed0c0bc4899f73934f3fc1c55c5cbb58b789a4d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Fri, 20 Sep 2024 09:58:12 +0900
|
||
|
|
Subject: [PATCH] sd-ipv4acd: fix assertion triggered when an ARP received in
|
||
|
|
STARTED state
|
||
|
|
|
||
|
|
When a network is busy, an ARP may be received before the timer event
|
||
|
|
source triggered first time.
|
||
|
|
|
||
|
|
Fixes #34489.
|
||
|
|
|
||
|
|
(cherry picked from commit 146b44d0a0001712ced2f22ca76d242eedac26ad)
|
||
|
|
(cherry picked from commit 06eb9b14829f3a5819f6daefb09fdb855cd868f4)
|
||
|
|
(cherry picked from commit b054898f12f1987d5c6fae91e664cd7f57f7fdaa)
|
||
|
|
|
||
|
|
Conflict:NA
|
||
|
|
Reference:https://github.com/systemd/systemd/commit/146b44d0a0001712ced2f22ca76d242eedac26ad
|
||
|
|
---
|
||
|
|
src/libsystemd-network/sd-ipv4acd.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
|
||
|
|
index d34c63e854..c7102cc4f6 100644
|
||
|
|
--- a/src/libsystemd-network/sd-ipv4acd.c
|
||
|
|
+++ b/src/libsystemd-network/sd-ipv4acd.c
|
||
|
|
@@ -396,6 +396,7 @@ static int ipv4acd_on_packet(
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
|
||
|
|
+ case IPV4ACD_STATE_STARTED:
|
||
|
|
case IPV4ACD_STATE_WAITING_PROBE:
|
||
|
|
case IPV4ACD_STATE_PROBING:
|
||
|
|
case IPV4ACD_STATE_WAITING_ANNOUNCE:
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|