From deb2e5230b4dcbc0e2e02cc47a0b2d0d7179a044 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Wed, 7 May 2014 16:35:05 +0200 Subject: sd-network: expose both admin and operational state directly Also add a call to check if a link is loopback, as this should commonly be ignored. --- src/libsystemd-network/network-internal.c | 14 -------------- src/libsystemd-network/network-internal.h | 2 -- 2 files changed, 16 deletions(-) (limited to 'src/libsystemd-network') diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index e7ba628fc7..52e614c4ea 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -326,17 +326,3 @@ int net_parse_inaddr(const char *address, unsigned char *family, void *dst) { return 0; } - -bool link_has_carrier(unsigned flags, uint8_t operstate) { - /* see Documentation/networking/operstates.txt in the kernel sources */ - - if (operstate == IF_OPER_UP) - return true; - - if (operstate == IF_OPER_UNKNOWN) - /* operstate may not be implemented, so fall back to flags */ - if ((flags & IFF_LOWER_UP) && !(flags & IFF_DORMANT)) - return true; - - return false; -} diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h index ef3cb8b91d..836472a776 100644 --- a/src/libsystemd-network/network-internal.h +++ b/src/libsystemd-network/network-internal.h @@ -65,5 +65,3 @@ int config_parse_ifalias(const char *unit, const char *filename, unsigned line, int net_parse_inaddr(const char *address, unsigned char *family, void *dst); int net_get_unique_predictable_data(struct udev_device *device, uint8_t result[8]); - -bool link_has_carrier(unsigned flags, uint8_t operstate); -- cgit v1.2.3-54-g00ecf