From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 20 Jun 2019 11:36:30 +0000 (+0200)
Subject: Merge pull request #12762 from yuwata/network-introduce-carrier-and-network-state... 
X-Git-Tag: v243-rc1~260
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=762267cdc117895dd2b50657ebd6ea085a1aff8a

Merge pull request #12762 from yuwata/network-introduce-carrier-and-network-state-12752

network: introduce carrier and address state to fix network_is_online()
---

762267cdc117895dd2b50657ebd6ea085a1aff8a
diff --cc src/network/networkd-link-bus.c
index 076845421ce,f44818b65f2..eda0325c2b9
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@@ -60,8 -62,10 +63,10 @@@ const sd_bus_vtable link_vtable[] = 
          SD_BUS_VTABLE_START(0),
  
          SD_BUS_PROPERTY("OperationalState", "s", property_get_operational_state, offsetof(Link, operstate), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+         SD_BUS_PROPERTY("CarrierState", "s", property_get_carrier_state, offsetof(Link, carrier_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+         SD_BUS_PROPERTY("AddressState", "s", property_get_address_state, offsetof(Link, address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
          SD_BUS_PROPERTY("AdministrativeState", "s", property_get_administrative_state, offsetof(Link, state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
 -        SD_BUS_PROPERTY("BitRates", "(dd)", property_get_bit_rates, 0, 0),
 +        SD_BUS_PROPERTY("BitRates", "(tt)", property_get_bit_rates, 0, 0),
  
          SD_BUS_VTABLE_END
  };