Merge pull request #30967 from yuwata/network-can-required-operstate-for-online

[thirdparty/systemd.git] / src / network / networkd-link.c

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index d553a716fa497b87048801ec02c4168ac73cbe19..49ed8f59bb1804c67d1eb46203e3edd8135fe3a7 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -77,6 +77,11 @@ void link_required_operstate_for_online(Link *link, LinkOperationalStateRange *r
 
         if (link->network && operational_state_range_is_valid(&link->network->required_operstate_for_online))
                 *ret = link->network->required_operstate_for_online;
+        else if (link->iftype == ARPHRD_CAN)
+                *ret = (const LinkOperationalStateRange) {
+                        .min = LINK_OPERSTATE_CARRIER,
+                        .max = LINK_OPERSTATE_CARRIER,
+                };
         else
                 *ret = LINK_OPERSTATE_RANGE_DEFAULT;
 }
@@ -997,7 +1002,7 @@ static int link_drop_requests(Link *link) {
                                 ;
                         }
 
-                request_detach(link->manager, req);
+                request_detach(req);
         }
 
         return ret;