diff options
author | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-09-10 21:10:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-10 21:10:58 +0100 |
commit | c54e851acb122bf2f2578ad6d5a86b7ab071c526 (patch) | |
tree | e4d55c9af205cbf465f09c823abd438658b1c751 /src | |
parent | 992fccd411ef983b0a3b843314fba4787cdd6518 (diff) | |
parent | 995cc7a72c42bcdb1fefc0b103523c7766b0d399 (diff) | |
download | systemd-c54e851acb122bf2f2578ad6d5a86b7ab071c526.tar.gz |
Merge pull request #20699 from yuwata/network-drop-foreign
network: do not drop foreign configs when carrier of unmanaged interface is lost
Diffstat (limited to 'src')
-rw-r--r-- | src/network/networkd-link.c | 5 | ||||
-rw-r--r-- | src/network/networkd-neighbor.c | 9 | ||||
-rw-r--r-- | src/network/networkd-nexthop.c | 9 | ||||
-rw-r--r-- | src/network/networkd-routing-policy-rule.c | 9 |
4 files changed, 4 insertions, 28 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 8ae5f35f4c..a5a23a33b4 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1621,7 +1621,10 @@ static int link_carrier_lost(Link *link) { /* let's shortcut things for CAN which doesn't need most of what's done below. */ return 0; - if (link->network && link->network->ignore_carrier_loss) + if (!link->network) + return 0; + + if (link->network->ignore_carrier_loss) return 0; r = link_stop_engines(link, false); diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c index d5a8b6e97e..70d1828c9d 100644 --- a/src/network/networkd-neighbor.c +++ b/src/network/networkd-neighbor.c @@ -477,15 +477,6 @@ int request_process_neighbor(Request *req) { if (r < 0) return r; - /* To prevent a double decrement on failure in after_configure(). */ - req->message_counter = NULL; - - if (req->after_configure) { - r = req->after_configure(req, ret); - if (r < 0) - return r; - } - return 1; } diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c index 5584d45025..0015ab4c0c 100644 --- a/src/network/networkd-nexthop.c +++ b/src/network/networkd-nexthop.c @@ -812,15 +812,6 @@ int request_process_nexthop(Request *req) { if (r < 0) return r; - /* To prevent a double decrement on failure in after_configure(). */ - req->message_counter = NULL; - - if (req->after_configure) { - r = req->after_configure(req, ret); - if (r < 0) - return r; - } - return 1; } diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c index a89c5877d9..e388881e0e 100644 --- a/src/network/networkd-routing-policy-rule.c +++ b/src/network/networkd-routing-policy-rule.c @@ -884,15 +884,6 @@ int request_process_routing_policy_rule(Request *req) { if (r < 0) return r; - /* To prevent a double decrement on failure in after_configure(). */ - req->message_counter = NULL; - - if (req->after_configure) { - r = req->after_configure(req, ret); - if (r < 0) - return r; - } - return 1; } |