sd-netlink: move definitions of RTA_TYPE() and RTA_FLAGS() to netlink-util.h

diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c
index 000a50ee3e2558f9471408caa599ace1247b15ae..abe316b64bdc021a995628b0fcdbbece8e4f729d 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-message.c
+++ b/src/libsystemd/sd-netlink/netlink-message.c
@@ -17,9 +17,6 @@
 
 #define GET_CONTAINER(m, i) ((struct rtattr*)((uint8_t*)(m)->hdr + (m)->containers[i].offset))
 
-#define RTA_TYPE(rta) ((rta)->rta_type & NLA_TYPE_MASK)
-#define RTA_FLAGS(rta) ((rta)->rta_type & ~NLA_TYPE_MASK)
-
 int message_new_empty(sd_netlink *nl, sd_netlink_message **ret) {
         sd_netlink_message *m;
 

diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h
index 369f5d50e47a09c7fc70f4df2a81c7fd5b190e17..56bbfd30d11d39c6e60aa83e8f7405a2cef85fc9 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-util.h
+++ b/src/libsystemd/sd-netlink/netlink-util.h
@@ -10,6 +10,9 @@
 #include "ordered-set.h"
 #include "socket-util.h"
 
+#define RTA_FLAGS(rta) ((rta)->rta_type & ~NLA_TYPE_MASK)
+#define RTA_TYPE(rta)  ((rta)->rta_type & NLA_TYPE_MASK)
+
 /* See struct rtvia in rtnetlink.h */
 typedef struct RouteVia {
         uint16_t family;

diff --git a/src/network/networkd-bridge-vlan.c b/src/network/networkd-bridge-vlan.c
index 3c052675217611d5c9179bb727a49eb98a33970f..0deffa46510d5df536c6b2d618a22a1aad86bc8c 100644 (file)
--- a/src/network/networkd-bridge-vlan.c
+++ b/src/network/networkd-bridge-vlan.c
@@ -267,8 +267,6 @@ int bridge_vlan_set_message(Link *link, sd_netlink_message *m, bool is_set) {
         return 0;
 }
 
-#define RTA_TYPE(rta) ((rta)->rta_type & NLA_TYPE_MASK)
-
 int link_update_bridge_vlan(Link *link, sd_netlink_message *m) {
         _cleanup_free_ void *data = NULL;
         size_t len;