diff options
| author | Susant Sahani <susant@redhat.com> | 2017-09-28 00:45:15 +0530 |
|---|---|---|
| committer | Susant Sahani <susant@redhat.com> | 2017-09-28 00:45:15 +0530 |
| commit | 5971cb9de9081b537945d28895df70992e5664d0 (patch) | |
| tree | 3bc29fc2146cf410bb81f1b6410bb6ac8b99ba09 /src | |
| parent | 7f676aa324cb5498a5f9caaaa3d51ecfe53242e0 (diff) | |
| download | systemd-5971cb9de9081b537945d28895df70992e5664d0.tar.gz systemd-5971cb9de9081b537945d28895df70992e5664d0.tar.bz2 systemd-5971cb9de9081b537945d28895df70992e5664d0.zip | |
networkd: Bridge slave don't look for RA/dhcp(IPv4/IPv6)
Incase of bridge slaves we have disabled RA, DHCP(IPv4/IPv6). just skip the check in link_check_ready
for IPv6.
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/networkd-link.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 6b591271a0..9220197627 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -743,20 +743,23 @@ void link_check_ready(Link *link) { !link->ipv4ll_route) return; - if (link_ipv6ll_enabled(link)) - if (in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address) > 0) + if (!link->network->bridge) { + + if (link_ipv6ll_enabled(link)) + if (in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address) > 0) + return; + + if ((link_dhcp4_enabled(link) && !link_dhcp6_enabled(link) && + !link->dhcp4_configured) || + (link_dhcp6_enabled(link) && !link_dhcp4_enabled(link) && + !link->dhcp6_configured) || + (link_dhcp4_enabled(link) && link_dhcp6_enabled(link) && + !link->dhcp4_configured && !link->dhcp6_configured)) return; - if ((link_dhcp4_enabled(link) && !link_dhcp6_enabled(link) && - !link->dhcp4_configured) || - (link_dhcp6_enabled(link) && !link_dhcp4_enabled(link) && - !link->dhcp6_configured) || - (link_dhcp4_enabled(link) && link_dhcp6_enabled(link) && - !link->dhcp4_configured && !link->dhcp6_configured)) - return; - - if (link_ipv6_accept_ra_enabled(link) && !link->ndisc_configured) - return; + if (link_ipv6_accept_ra_enabled(link) && !link->ndisc_configured) + return; + } SET_FOREACH(a, link->addresses, i) if (!address_is_ready(a)) |