core: move nm_utils_ip4_address_is_link_local() to header file

It's so simple, let's move it so it can be inlined.

2 files changed, 12 insertions, 12 deletions

diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index d186405672..75e0941aa9 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -3829,17 +3829,6 @@ nm_utils_ifname_cpy (char *dst, const char *name)
 
 /*****************************************************************************/
 
-#define IPV4LL_NETWORK (htonl (0xA9FE0000L))
-#define IPV4LL_NETMASK (htonl (0xFFFF0000L))
-
-gboolean
-nm_utils_ip4_address_is_link_local (in_addr_t addr)
-{
-	return (addr & IPV4LL_NETMASK) == IPV4LL_NETWORK;
-}
-
-/*****************************************************************************/
-
 /**
  * Takes a pair @timestamp and @duration, and returns the remaining duration based
  * on the new timestamp @now.
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index 190a81aa81..5d36bd593c 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -446,7 +446,18 @@ guint32 nm_utils_lifetime_get (guint32 timestamp,
                                gint32 now,
                                guint32 *out_preferred);
 
-gboolean nm_utils_ip4_address_is_link_local (in_addr_t addr);
+/*****************************************************************************/
+
+#define NM_IPV4LL_NETWORK ((in_addr_t) (htonl (0xA9FE0000lu)))
+#define NM_IPV4LL_NETMASK ((in_addr_t) (htonl (0xFFFF0000lu)))
+
+static inline gboolean
+nm_utils_ip4_address_is_link_local (in_addr_t addr)
+{
+	return (addr & NM_IPV4LL_NETMASK) == NM_IPV4LL_NETWORK;
+}
+
+/*****************************************************************************/
 
 const char *nm_utils_dnsmasq_status_to_string (int status, char *dest, gsize size);