Merge pull request #11681 from yuwata/network-link-enslaved-operstate

network: introduce new 'enslaved' operstate

diff --cc src/network/networkd-link.c
index ceb960a032f0770d32fc44b394f6cda2a7875d1e,acb4943b843b510c697d7a7fc24852d3a566bd22..0cff3cf62729c090690ca4e55e86a3d5c539f95d
--- 1/src/network/networkd-link.c
--- 2/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@@ -106,9 -96,12 +115,12 @@@ static bool link_ipv4ll_enabled(Link *l
          if (!link->network)
                  return false;
  
 -        if (streq_ptr(link->kind, "wireguard"))
 +        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
                  return false;
  
+         if (link->network->bond)
+                 return false;
+ 
          return link->network->link_local & ADDRESS_FAMILY_IPV4;
  }
  
@@@ -124,9 -117,12 +136,12 @@@ static bool link_ipv6ll_enabled(Link *l
          if (!link->network)
                  return false;
  
 -        if (streq_ptr(link->kind, "wireguard"))
 +        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
                  return false;
  
+         if (link->network->bond)
+                 return false;
+ 
          return link->network->link_local & ADDRESS_FAMILY_IPV6;
  }
  

diff --cc src/network/networkd-link.h
Simple merge

diff --cc test/test-network/systemd-networkd-tests.py
Simple merge