Skip to content

Commit 16bfb12

Browse files
yuwatabluca
authored andcommitted
Revert "network: delay to configure address until it is removed on reconfigure"
This reverts commit 6e8477e. The commit intended to fix a race reported at #28009. However, unfortunately, it does not fix the root of the race, and reveals the race in more simple setups. See reports in #28358.
1 parent acfff02 commit 16bfb12

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

src/network/networkd-address.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,9 +1212,6 @@ static bool address_is_ready_to_configure(Link *link, const Address *address) {
12121212
if (!link_is_ready_to_configure(link, false))
12131213
return false;
12141214

1215-
if (address_is_removing(address))
1216-
return false;
1217-
12181215
if (!ipv4acd_bound(address))
12191216
return false;
12201217

src/network/networkd-util.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@ int network_config_state_to_string_alloc(NetworkConfigState s, char **ret);
125125
NETWORK_CONFIG_STATE_REMOVING, \
126126
NETWORK_CONFIG_STATE_REMOVING); \
127127
} \
128-
static inline bool name##_is_removing(const type *t) { \
129-
assert(t); \
130-
return FLAGS_SET(t->state, NETWORK_CONFIG_STATE_REMOVING); \
131-
} \
132128
static inline void name##_enter_removed(type *t) { \
133129
name##_update_state(t, \
134130
NETWORK_CONFIG_STATE_CONFIGURED | \

0 commit comments

Comments
 (0)