]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #19603 from yuwata/network-link-get-by-name
authorLennart Poettering <lennart@poettering.net>
Wed, 19 May 2021 19:35:48 +0000 (21:35 +0200)
committerGitHub <noreply@github.com>
Wed, 19 May 2021 19:35:48 +0000 (21:35 +0200)
network: introduce link_get_by_name() and use it in resolving interface name specifier in MultiPathRoute=

1  2 
src/network/networkd-link.c
src/network/networkd-link.h
src/network/networkd-manager.c
src/network/networkd-manager.h
src/network/networkd-route.c

Simple merge
Simple merge
Simple merge
index ef98c519d6271dbd3005b0f7a83d21f7e537bd45,07913516097f11b11f334e2720cdb9202a5f18ba..6b9b0697b2197bc99f4f24e046fdd33a205c80fe
@@@ -42,9 -42,9 +42,10 @@@ struct Manager 
          LinkAddressState address_state;
          LinkAddressState ipv4_address_state;
          LinkAddressState ipv6_address_state;
 +        LinkOnlineState online_state;
  
          Hashmap *links;
+         Hashmap *links_by_name;
          Hashmap *netdevs;
          OrderedHashmap *networks;
          Hashmap *dhcp6_prefixes;
Simple merge