diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-07 09:35:42 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-12 04:26:06 +0200 |
| commit | e36d601c5e2b836ba52a8f71098e2d2aa6821268 (patch) | |
| tree | 356d44323c3466d964c7b5099d60c27d05068a4a /src/network/networkd-link.c | |
| parent | network: simplify and rename routing_policy_rule_copy() (diff) | |
| download | systemd-e36d601c5e2b836ba52a8f71098e2d2aa6821268.tar.xz systemd-e36d601c5e2b836ba52a8f71098e2d2aa6821268.zip | |
network: change order of dropping network configs
As routes may requires nexthops and addresses, nexthops may requires
addresses.
Diffstat (limited to '')
| -rw-r--r-- | src/network/networkd-link.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index ffaebbbf6d..34359b2541 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2028,17 +2028,17 @@ static int link_drop_foreign_config(Link *link) { assert(link); assert(link->manager); - r = link_drop_foreign_addresses(link); + r = link_drop_foreign_routes(link); - k = link_drop_foreign_neighbors(link); + k = link_drop_foreign_nexthops(link); if (k < 0 && r >= 0) r = k; - k = link_drop_foreign_routes(link); + k = link_drop_foreign_addresses(link); if (k < 0 && r >= 0) r = k; - k = link_drop_foreign_nexthops(link); + k = link_drop_foreign_neighbors(link); if (k < 0 && r >= 0) r = k; @@ -2055,17 +2055,17 @@ static int link_drop_config(Link *link) { assert(link); assert(link->manager); - r = link_drop_addresses(link); + r = link_drop_routes(link); - k = link_drop_neighbors(link); + k = link_drop_nexthops(link); if (k < 0 && r >= 0) r = k; - k = link_drop_routes(link); + k = link_drop_addresses(link); if (k < 0 && r >= 0) r = k; - k = link_drop_nexthops(link); + k = link_drop_neighbors(link); if (k < 0 && r >= 0) r = k; |