From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 18 Feb 2019 12:00:13 +0000 (+0100)
Subject: Merge pull request #11681 from yuwata/network-link-enslaved-operstate
X-Git-Tag: v242-rc1~302
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=1cfece4a45abb0ae1a4a61ba671f4c157728e2c8

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

network: introduce new 'enslaved' operstate
---

1cfece4a45abb0ae1a4a61ba671f4c157728e2c8
diff --cc src/network/networkd-link.c
index ceb960a032f,acb4943b843..0cff3cf6272
--- a/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;
  }