style: require comma after __ADD() macro

  $ sed -i 's/^\([\t ]\+\<__ADD\> \?([^)]\+)\) *$/\1,/' `git grep -w -l __ADD`

Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>

18 files changed, 363 insertions, 363 deletions

diff --git a/lib/route/addr.c b/lib/route/addr.c
index e6e91d2..426b4dc 100644
--- a/lib/route/addr.c
+++ b/lib/route/addr.c
@@ -461,17 +461,17 @@ static int addr_compare(struct nl_object *_a, struct nl_object *_b,
 }
 
 static const struct trans_tbl addr_attrs[] = {
-	__ADD(ADDR_ATTR_FAMILY, family)
-	__ADD(ADDR_ATTR_PREFIXLEN, prefixlen)
-	__ADD(ADDR_ATTR_FLAGS, flags)
-	__ADD(ADDR_ATTR_SCOPE, scope)
-	__ADD(ADDR_ATTR_IFINDEX, ifindex)
-	__ADD(ADDR_ATTR_LABEL, label)
-	__ADD(ADDR_ATTR_CACHEINFO, cacheinfo)
-	__ADD(ADDR_ATTR_PEER, peer)
-	__ADD(ADDR_ATTR_LOCAL, local)
-	__ADD(ADDR_ATTR_BROADCAST, broadcast)
-	__ADD(ADDR_ATTR_MULTICAST, multicast)
+	__ADD(ADDR_ATTR_FAMILY, family),
+	__ADD(ADDR_ATTR_PREFIXLEN, prefixlen),
+	__ADD(ADDR_ATTR_FLAGS, flags),
+	__ADD(ADDR_ATTR_SCOPE, scope),
+	__ADD(ADDR_ATTR_IFINDEX, ifindex),
+	__ADD(ADDR_ATTR_LABEL, label),
+	__ADD(ADDR_ATTR_CACHEINFO, cacheinfo),
+	__ADD(ADDR_ATTR_PEER, peer),
+	__ADD(ADDR_ATTR_LOCAL, local),
+	__ADD(ADDR_ATTR_BROADCAST, broadcast),
+	__ADD(ADDR_ATTR_MULTICAST, multicast),
 };
 
 static char *addr_attrs2str(int attrs, char *buf, size_t len)
@@ -1061,15 +1061,15 @@ uint32_t rtnl_addr_get_last_update_time(struct rtnl_addr *addr)
  */
 
 static const struct trans_tbl addr_flags[] = {
-	__ADD(IFA_F_SECONDARY, secondary)
-	__ADD(IFA_F_NODAD, nodad)
-	__ADD(IFA_F_OPTIMISTIC, optimistic)
-	__ADD(IFA_F_HOMEADDRESS, homeaddress)
-	__ADD(IFA_F_DEPRECATED, deprecated)
-	__ADD(IFA_F_TENTATIVE, tentative)
-	__ADD(IFA_F_PERMANENT, permanent)
-	__ADD(IFA_F_MANAGETEMPADDR, mngtmpaddr)
-	__ADD(IFA_F_NOPREFIXROUTE, noprefixroute)
+	__ADD(IFA_F_SECONDARY, secondary),
+	__ADD(IFA_F_NODAD, nodad),
+	__ADD(IFA_F_OPTIMISTIC, optimistic),
+	__ADD(IFA_F_HOMEADDRESS, homeaddress),
+	__ADD(IFA_F_DEPRECATED, deprecated),
+	__ADD(IFA_F_TENTATIVE, tentative),
+	__ADD(IFA_F_PERMANENT, permanent),
+	__ADD(IFA_F_MANAGETEMPADDR, mngtmpaddr),
+	__ADD(IFA_F_NOPREFIXROUTE, noprefixroute),
 };
 
 char *rtnl_addr_flags2str(int flags, char *buf, size_t size)
diff --git a/lib/route/cls/ematch/meta.c b/lib/route/cls/ematch/meta.c
index 44f11b9..6249bb1 100644
--- a/lib/route/cls/ematch/meta.c
+++ b/lib/route/cls/ematch/meta.c
@@ -165,51 +165,51 @@ static int meta_parse(struct rtnl_ematch *e, void *data, size_t len)
 }
 
 static const struct trans_tbl meta_int[] = {
-	__ADD(TCF_META_ID_RANDOM, random)
-	__ADD(TCF_META_ID_LOADAVG_0, loadavg_0)
-	__ADD(TCF_META_ID_LOADAVG_1, loadavg_1)
-	__ADD(TCF_META_ID_LOADAVG_2, loadavg_2)
-	__ADD(TCF_META_ID_DEV, dev)
-	__ADD(TCF_META_ID_PRIORITY, prio)
-	__ADD(TCF_META_ID_PROTOCOL, proto)
-	__ADD(TCF_META_ID_PKTTYPE, pkttype)
-	__ADD(TCF_META_ID_PKTLEN, pktlen)
-	__ADD(TCF_META_ID_DATALEN, datalen)
-	__ADD(TCF_META_ID_MACLEN, maclen)
-	__ADD(TCF_META_ID_NFMARK, mark)
-	__ADD(TCF_META_ID_TCINDEX, tcindex)
-	__ADD(TCF_META_ID_RTCLASSID, rtclassid)
-	__ADD(TCF_META_ID_RTIIF, rtiif)
-	__ADD(TCF_META_ID_SK_FAMILY, sk_family)
-	__ADD(TCF_META_ID_SK_STATE, sk_state)
-	__ADD(TCF_META_ID_SK_REUSE, sk_reuse)
-	__ADD(TCF_META_ID_SK_REFCNT, sk_refcnt)
-	__ADD(TCF_META_ID_SK_RCVBUF, sk_rcvbuf)
-	__ADD(TCF_META_ID_SK_SNDBUF, sk_sndbuf)
-	__ADD(TCF_META_ID_SK_SHUTDOWN, sk_sutdown)
-	__ADD(TCF_META_ID_SK_PROTO, sk_proto)
-	__ADD(TCF_META_ID_SK_TYPE, sk_type)
-	__ADD(TCF_META_ID_SK_RMEM_ALLOC, sk_rmem_alloc)
-	__ADD(TCF_META_ID_SK_WMEM_ALLOC, sk_wmem_alloc)
-	__ADD(TCF_META_ID_SK_WMEM_QUEUED, sk_wmem_queued)
-	__ADD(TCF_META_ID_SK_RCV_QLEN, sk_rcv_qlen)
-	__ADD(TCF_META_ID_SK_SND_QLEN, sk_snd_qlen)
-	__ADD(TCF_META_ID_SK_ERR_QLEN, sk_err_qlen)
-	__ADD(TCF_META_ID_SK_FORWARD_ALLOCS, sk_forward_allocs)
-	__ADD(TCF_META_ID_SK_ALLOCS, sk_allocs)
-	__ADD(TCF_META_ID_SK_ROUTE_CAPS, sk_route_caps)
-	__ADD(TCF_META_ID_SK_HASH, sk_hash)
-	__ADD(TCF_META_ID_SK_LINGERTIME, sk_lingertime)
-	__ADD(TCF_META_ID_SK_ACK_BACKLOG, sk_ack_backlog)
-	__ADD(TCF_META_ID_SK_MAX_ACK_BACKLOG, sk_max_ack_backlog)
-	__ADD(TCF_META_ID_SK_PRIO, sk_prio)
-	__ADD(TCF_META_ID_SK_RCVLOWAT, sk_rcvlowat)
-	__ADD(TCF_META_ID_SK_RCVTIMEO, sk_rcvtimeo)
-	__ADD(TCF_META_ID_SK_SNDTIMEO, sk_sndtimeo)
-	__ADD(TCF_META_ID_SK_SENDMSG_OFF, sk_sendmsg_off)
-	__ADD(TCF_META_ID_SK_WRITE_PENDING, sk_write_pending)
-	__ADD(TCF_META_ID_VLAN_TAG, vlan)
-	__ADD(TCF_META_ID_RXHASH, rxhash)
+	__ADD(TCF_META_ID_RANDOM, random),
+	__ADD(TCF_META_ID_LOADAVG_0, loadavg_0),
+	__ADD(TCF_META_ID_LOADAVG_1, loadavg_1),
+	__ADD(TCF_META_ID_LOADAVG_2, loadavg_2),
+	__ADD(TCF_META_ID_DEV, dev),
+	__ADD(TCF_META_ID_PRIORITY, prio),
+	__ADD(TCF_META_ID_PROTOCOL, proto),
+	__ADD(TCF_META_ID_PKTTYPE, pkttype),
+	__ADD(TCF_META_ID_PKTLEN, pktlen),
+	__ADD(TCF_META_ID_DATALEN, datalen),
+	__ADD(TCF_META_ID_MACLEN, maclen),
+	__ADD(TCF_META_ID_NFMARK, mark),
+	__ADD(TCF_META_ID_TCINDEX, tcindex),
+	__ADD(TCF_META_ID_RTCLASSID, rtclassid),
+	__ADD(TCF_META_ID_RTIIF, rtiif),
+	__ADD(TCF_META_ID_SK_FAMILY, sk_family),
+	__ADD(TCF_META_ID_SK_STATE, sk_state),
+	__ADD(TCF_META_ID_SK_REUSE, sk_reuse),
+	__ADD(TCF_META_ID_SK_REFCNT, sk_refcnt),
+	__ADD(TCF_META_ID_SK_RCVBUF, sk_rcvbuf),
+	__ADD(TCF_META_ID_SK_SNDBUF, sk_sndbuf),
+	__ADD(TCF_META_ID_SK_SHUTDOWN, sk_sutdown),
+	__ADD(TCF_META_ID_SK_PROTO, sk_proto),
+	__ADD(TCF_META_ID_SK_TYPE, sk_type),
+	__ADD(TCF_META_ID_SK_RMEM_ALLOC, sk_rmem_alloc),
+	__ADD(TCF_META_ID_SK_WMEM_ALLOC, sk_wmem_alloc),
+	__ADD(TCF_META_ID_SK_WMEM_QUEUED, sk_wmem_queued),
+	__ADD(TCF_META_ID_SK_RCV_QLEN, sk_rcv_qlen),
+	__ADD(TCF_META_ID_SK_SND_QLEN, sk_snd_qlen),
+	__ADD(TCF_META_ID_SK_ERR_QLEN, sk_err_qlen),
+	__ADD(TCF_META_ID_SK_FORWARD_ALLOCS, sk_forward_allocs),
+	__ADD(TCF_META_ID_SK_ALLOCS, sk_allocs),
+	__ADD(TCF_META_ID_SK_ROUTE_CAPS, sk_route_caps),
+	__ADD(TCF_META_ID_SK_HASH, sk_hash),
+	__ADD(TCF_META_ID_SK_LINGERTIME, sk_lingertime),
+	__ADD(TCF_META_ID_SK_ACK_BACKLOG, sk_ack_backlog),
+	__ADD(TCF_META_ID_SK_MAX_ACK_BACKLOG, sk_max_ack_backlog),
+	__ADD(TCF_META_ID_SK_PRIO, sk_prio),
+	__ADD(TCF_META_ID_SK_RCVLOWAT, sk_rcvlowat),
+	__ADD(TCF_META_ID_SK_RCVTIMEO, sk_rcvtimeo),
+	__ADD(TCF_META_ID_SK_SNDTIMEO, sk_sndtimeo),
+	__ADD(TCF_META_ID_SK_SENDMSG_OFF, sk_sendmsg_off),
+	__ADD(TCF_META_ID_SK_WRITE_PENDING, sk_write_pending),
+	__ADD(TCF_META_ID_VLAN_TAG, vlan),
+	__ADD(TCF_META_ID_RXHASH, rxhash),
 };
 
 static char *int_id2str(int id, char *buf, size_t size)
@@ -218,8 +218,8 @@ static char *int_id2str(int id, char *buf, size_t size)
 }
 
 static const struct trans_tbl meta_var[] = {
-	__ADD(TCF_META_ID_DEV,devname)
-	__ADD(TCF_META_ID_SK_BOUND_IF,sk_bound_if)
+	__ADD(TCF_META_ID_DEV,devname),
+	__ADD(TCF_META_ID_SK_BOUND_IF,sk_bound_if),
 };
 
 static char *var_id2str(int id, char *buf, size_t size)
diff --git a/lib/route/cls/police.c b/lib/route/cls/police.c
index 1f5d284..14b5608 100644
--- a/lib/route/cls/police.c
+++ b/lib/route/cls/police.c
@@ -23,12 +23,12 @@
  */
 
 static const struct trans_tbl police_types[] = {
-	__ADD(TC_POLICE_UNSPEC,unspec)
-	__ADD(TC_POLICE_OK,ok)
-	__ADD(TC_POLICE_RECLASSIFY,reclassify)
-	__ADD(TC_POLICE_SHOT,shot)
+	__ADD(TC_POLICE_UNSPEC,unspec),
+	__ADD(TC_POLICE_OK,ok),
+	__ADD(TC_POLICE_RECLASSIFY,reclassify),
+	__ADD(TC_POLICE_SHOT,shot),
 #ifdef TC_POLICE_PIPE
-	__ADD(TC_POLICE_PIPE,pipe)
+	__ADD(TC_POLICE_PIPE,pipe),
 #endif
 };
 
diff --git a/lib/route/link.c b/lib/route/link.c
index 3d31ffc..7a53532 100644
--- a/lib/route/link.c
+++ b/lib/route/link.c
@@ -951,32 +951,32 @@ protinfo_mismatch:
 }
 
 static const struct trans_tbl link_attrs[] = {
-	__ADD(LINK_ATTR_MTU, mtu)
-	__ADD(LINK_ATTR_LINK, link)
-	__ADD(LINK_ATTR_TXQLEN, txqlen)
-	__ADD(LINK_ATTR_WEIGHT, weight)
-	__ADD(LINK_ATTR_MASTER, master)
-	__ADD(LINK_ATTR_QDISC, qdisc)
-	__ADD(LINK_ATTR_MAP, map)
-	__ADD(LINK_ATTR_ADDR, address)
-	__ADD(LINK_ATTR_BRD, broadcast)
-	__ADD(LINK_ATTR_FLAGS, flags)
-	__ADD(LINK_ATTR_IFNAME, name)
-	__ADD(LINK_ATTR_IFINDEX, ifindex)
-	__ADD(LINK_ATTR_FAMILY, family)
-	__ADD(LINK_ATTR_ARPTYPE, arptype)
-	__ADD(LINK_ATTR_STATS, stats)
-	__ADD(LINK_ATTR_CHANGE, change)
-	__ADD(LINK_ATTR_OPERSTATE, operstate)
-	__ADD(LINK_ATTR_LINKMODE, linkmode)
-	__ADD(LINK_ATTR_IFALIAS, ifalias)
-	__ADD(LINK_ATTR_NUM_VF, num_vf)
-	__ADD(LINK_ATTR_PROMISCUITY, promiscuity)
-	__ADD(LINK_ATTR_NUM_TX_QUEUES, num_tx_queues)
-	__ADD(LINK_ATTR_NUM_RX_QUEUES, num_rx_queues)
-	__ADD(LINK_ATTR_GROUP, group)
-	__ADD(LINK_ATTR_CARRIER, carrier)
-	__ADD(LINK_ATTR_PHYS_PORT_ID, phys_port_id)
+	__ADD(LINK_ATTR_MTU, mtu),
+	__ADD(LINK_ATTR_LINK, link),
+	__ADD(LINK_ATTR_TXQLEN, txqlen),
+	__ADD(LINK_ATTR_WEIGHT, weight),
+	__ADD(LINK_ATTR_MASTER, master),
+	__ADD(LINK_ATTR_QDISC, qdisc),
+	__ADD(LINK_ATTR_MAP, map),
+	__ADD(LINK_ATTR_ADDR, address),
+	__ADD(LINK_ATTR_BRD, broadcast),
+	__ADD(LINK_ATTR_FLAGS, flags),
+	__ADD(LINK_ATTR_IFNAME, name),
+	__ADD(LINK_ATTR_IFINDEX, ifindex),
+	__ADD(LINK_ATTR_FAMILY, family),
+	__ADD(LINK_ATTR_ARPTYPE, arptype),
+	__ADD(LINK_ATTR_STATS, stats),
+	__ADD(LINK_ATTR_CHANGE, change),
+	__ADD(LINK_ATTR_OPERSTATE, operstate),
+	__ADD(LINK_ATTR_LINKMODE, linkmode),
+	__ADD(LINK_ATTR_IFALIAS, ifalias),
+	__ADD(LINK_ATTR_NUM_VF, num_vf),
+	__ADD(LINK_ATTR_PROMISCUITY, promiscuity),
+	__ADD(LINK_ATTR_NUM_TX_QUEUES, num_tx_queues),
+	__ADD(LINK_ATTR_NUM_RX_QUEUES, num_rx_queues),
+	__ADD(LINK_ATTR_GROUP, group),
+	__ADD(LINK_ATTR_CARRIER, carrier),
+	__ADD(LINK_ATTR_PHYS_PORT_ID, phys_port_id),
 };
 
 static char *link_attrs2str(int attrs, char *buf, size_t len)
@@ -2511,25 +2511,25 @@ int rtnl_link_release(struct nl_sock *sock, struct rtnl_link *slave)
  */
 
 static const struct trans_tbl link_flags[] = {
-	__ADD(IFF_LOOPBACK, loopback)
-	__ADD(IFF_BROADCAST, broadcast)
-	__ADD(IFF_POINTOPOINT, pointopoint)
-	__ADD(IFF_MULTICAST, multicast)
-	__ADD(IFF_NOARP, noarp)
-	__ADD(IFF_ALLMULTI, allmulti)
-	__ADD(IFF_PROMISC, promisc)
-	__ADD(IFF_MASTER, master)
-	__ADD(IFF_SLAVE, slave)
-	__ADD(IFF_DEBUG, debug)
-	__ADD(IFF_DYNAMIC, dynamic)
-	__ADD(IFF_AUTOMEDIA, automedia)
-	__ADD(IFF_PORTSEL, portsel)
-	__ADD(IFF_NOTRAILERS, notrailers)
-	__ADD(IFF_UP, up)
-	__ADD(IFF_RUNNING, running)
-	__ADD(IFF_LOWER_UP, lowerup)
-	__ADD(IFF_DORMANT, dormant)
-	__ADD(IFF_ECHO, echo)
+	__ADD(IFF_LOOPBACK, loopback),
+	__ADD(IFF_BROADCAST, broadcast),
+	__ADD(IFF_POINTOPOINT, pointopoint),
+	__ADD(IFF_MULTICAST, multicast),
+	__ADD(IFF_NOARP, noarp),
+	__ADD(IFF_ALLMULTI, allmulti),
+	__ADD(IFF_PROMISC, promisc),
+	__ADD(IFF_MASTER, master),
+	__ADD(IFF_SLAVE, slave),
+	__ADD(IFF_DEBUG, debug),
+	__ADD(IFF_DYNAMIC, dynamic),
+	__ADD(IFF_AUTOMEDIA, automedia),
+	__ADD(IFF_PORTSEL, portsel),
+	__ADD(IFF_NOTRAILERS, notrailers),
+	__ADD(IFF_UP, up),
+	__ADD(IFF_RUNNING, running),
+	__ADD(IFF_LOWER_UP, lowerup),
+	__ADD(IFF_DORMANT, dormant),
+	__ADD(IFF_ECHO, echo),
 };
 
 char *rtnl_link_flags2str(int flags, char *buf, size_t len)
@@ -2544,69 +2544,69 @@ int rtnl_link_str2flags(const char *name)
 }
 
 static const struct trans_tbl link_stats[] = {
-	__ADD(RTNL_LINK_RX_PACKETS, rx_packets)
-	__ADD(RTNL_LINK_TX_PACKETS, tx_packets)
-	__ADD(RTNL_LINK_RX_BYTES, rx_bytes)
-	__ADD(RTNL_LINK_TX_BYTES, tx_bytes)
-	__ADD(RTNL_LINK_RX_ERRORS, rx_errors)
-	__ADD(RTNL_LINK_TX_ERRORS, tx_errors)
-	__ADD(RTNL_LINK_RX_DROPPED, rx_dropped)
-	__ADD(RTNL_LINK_TX_DROPPED, tx_dropped)
-	__ADD(RTNL_LINK_RX_COMPRESSED, rx_compressed)
-	__ADD(RTNL_LINK_TX_COMPRESSED, tx_compressed)
-	__ADD(RTNL_LINK_RX_FIFO_ERR, rx_fifo_err)
-	__ADD(RTNL_LINK_TX_FIFO_ERR, tx_fifo_err)
-	__ADD(RTNL_LINK_RX_LEN_ERR, rx_len_err)
-	__ADD(RTNL_LINK_RX_OVER_ERR, rx_over_err)
-	__ADD(RTNL_LINK_RX_CRC_ERR, rx_crc_err)
-	__ADD(RTNL_LINK_RX_FRAME_ERR, rx_frame_err)
-	__ADD(RTNL_LINK_RX_MISSED_ERR, rx_missed_err)
-	__ADD(RTNL_LINK_TX_ABORT_ERR, tx_abort_err)
-	__ADD(RTNL_LINK_TX_CARRIER_ERR, tx_carrier_err)
-	__ADD(RTNL_LINK_TX_HBEAT_ERR, tx_hbeat_err)
-	__ADD(RTNL_LINK_TX_WIN_ERR, tx_win_err)
-	__ADD(RTNL_LINK_COLLISIONS, collisions)
-	__ADD(RTNL_LINK_MULTICAST, multicast)
-	__ADD(RTNL_LINK_IP6_INPKTS, Ip6InReceives)
-	__ADD(RTNL_LINK_IP6_INHDRERRORS, Ip6InHdrErrors)
-	__ADD(RTNL_LINK_IP6_INTOOBIGERRORS, Ip6InTooBigErrors)
-	__ADD(RTNL_LINK_IP6_INNOROUTES, Ip6InNoRoutes)
-	__ADD(RTNL_LINK_IP6_INADDRERRORS, Ip6InAddrErrors)
-	__ADD(RTNL_LINK_IP6_INUNKNOWNPROTOS, Ip6InUnknownProtos)
-	__ADD(RTNL_LINK_IP6_INTRUNCATEDPKTS, Ip6InTruncatedPkts)
-	__ADD(RTNL_LINK_IP6_INDISCARDS, Ip6InDiscards)
-	__ADD(RTNL_LINK_IP6_INDELIVERS, Ip6InDelivers)
-	__ADD(RTNL_LINK_IP6_OUTFORWDATAGRAMS, Ip6OutForwDatagrams)
-	__ADD(RTNL_LINK_IP6_OUTPKTS, Ip6OutRequests)
-	__ADD(RTNL_LINK_IP6_OUTDISCARDS, Ip6OutDiscards)
-	__ADD(RTNL_LINK_IP6_OUTNOROUTES, Ip6OutNoRoutes)
-	__ADD(RTNL_LINK_IP6_REASMTIMEOUT, Ip6ReasmTimeout)
-	__ADD(RTNL_LINK_IP6_REASMREQDS, Ip6ReasmReqds)
-	__ADD(RTNL_LINK_IP6_REASMOKS, Ip6ReasmOKs)
-	__ADD(RTNL_LINK_IP6_REASMFAILS, Ip6ReasmFails)
-	__ADD(RTNL_LINK_IP6_FRAGOKS, Ip6FragOKs)
-	__ADD(RTNL_LINK_IP6_FRAGFAILS, Ip6FragFails)
-	__ADD(RTNL_LINK_IP6_FRAGCREATES, Ip6FragCreates)
-	__ADD(RTNL_LINK_IP6_INMCASTPKTS, Ip6InMcastPkts)
-	__ADD(RTNL_LINK_IP6_OUTMCASTPKTS, Ip6OutMcastPkts)
-	__ADD(RTNL_LINK_IP6_INBCASTPKTS, Ip6InBcastPkts)
-	__ADD(RTNL_LINK_IP6_OUTBCASTPKTS, Ip6OutBcastPkts)
-	__ADD(RTNL_LINK_IP6_INOCTETS, Ip6InOctets)
-	__ADD(RTNL_LINK_IP6_OUTOCTETS, Ip6OutOctets)
-	__ADD(RTNL_LINK_IP6_INMCASTOCTETS, Ip6InMcastOctets)
-	__ADD(RTNL_LINK_IP6_OUTMCASTOCTETS, Ip6OutMcastOctets)
-	__ADD(RTNL_LINK_IP6_INBCASTOCTETS, Ip6InBcastOctets)
-	__ADD(RTNL_LINK_IP6_OUTBCASTOCTETS, Ip6OutBcastOctets)
-	__ADD(RTNL_LINK_ICMP6_INMSGS, ICMP6_InMsgs)
-	__ADD(RTNL_LINK_ICMP6_INERRORS, ICMP6_InErrors)
-	__ADD(RTNL_LINK_ICMP6_OUTMSGS, ICMP6_OutMsgs)
-	__ADD(RTNL_LINK_ICMP6_OUTERRORS, ICMP6_OutErrors)
-	__ADD(RTNL_LINK_ICMP6_CSUMERRORS, ICMP6_InCsumErrors)
-	__ADD(RTNL_LINK_IP6_CSUMERRORS, Ip6_InCsumErrors)
-	__ADD(RTNL_LINK_IP6_NOECTPKTS, Ip6_InNoECTPkts)
-	__ADD(RTNL_LINK_IP6_ECT1PKTS, Ip6_InECT1Pkts)
-	__ADD(RTNL_LINK_IP6_ECT0PKTS, Ip6_InECT0Pkts)
-	__ADD(RTNL_LINK_IP6_CEPKTS, Ip6_InCEPkts)
+	__ADD(RTNL_LINK_RX_PACKETS, rx_packets),
+	__ADD(RTNL_LINK_TX_PACKETS, tx_packets),
+	__ADD(RTNL_LINK_RX_BYTES, rx_bytes),
+	__ADD(RTNL_LINK_TX_BYTES, tx_bytes),
+	__ADD(RTNL_LINK_RX_ERRORS, rx_errors),
+	__ADD(RTNL_LINK_TX_ERRORS, tx_errors),
+	__ADD(RTNL_LINK_RX_DROPPED, rx_dropped),
+	__ADD(RTNL_LINK_TX_DROPPED, tx_dropped),
+	__ADD(RTNL_LINK_RX_COMPRESSED, rx_compressed),
+	__ADD(RTNL_LINK_TX_COMPRESSED, tx_compressed),
+	__ADD(RTNL_LINK_RX_FIFO_ERR, rx_fifo_err),
+	__ADD(RTNL_LINK_TX_FIFO_ERR, tx_fifo_err),
+	__ADD(RTNL_LINK_RX_LEN_ERR, rx_len_err),
+	__ADD(RTNL_LINK_RX_OVER_ERR, rx_over_err),
+	__ADD(RTNL_LINK_RX_CRC_ERR, rx_crc_err),
+	__ADD(RTNL_LINK_RX_FRAME_ERR, rx_frame_err),
+	__ADD(RTNL_LINK_RX_MISSED_ERR, rx_missed_err),
+	__ADD(RTNL_LINK_TX_ABORT_ERR, tx_abort_err),
+	__ADD(RTNL_LINK_TX_CARRIER_ERR, tx_carrier_err),
+	__ADD(RTNL_LINK_TX_HBEAT_ERR, tx_hbeat_err),
+	__ADD(RTNL_LINK_TX_WIN_ERR, tx_win_err),
+	__ADD(RTNL_LINK_COLLISIONS, collisions),
+	__ADD(RTNL_LINK_MULTICAST, multicast),
+	__ADD(RTNL_LINK_IP6_INPKTS, Ip6InReceives),
+	__ADD(RTNL_LINK_IP6_INHDRERRORS, Ip6InHdrErrors),
+	__ADD(RTNL_LINK_IP6_INTOOBIGERRORS, Ip6InTooBigErrors),
+	__ADD(RTNL_LINK_IP6_INNOROUTES, Ip6InNoRoutes),
+	__ADD(RTNL_LINK_IP6_INADDRERRORS, Ip6InAddrErrors),
+	__ADD(RTNL_LINK_IP6_INUNKNOWNPROTOS, Ip6InUnknownProtos),
+	__ADD(RTNL_LINK_IP6_INTRUNCATEDPKTS, Ip6InTruncatedPkts),
+	__ADD(RTNL_LINK_IP6_INDISCARDS, Ip6InDiscards),
+	__ADD(RTNL_LINK_IP6_INDELIVERS, Ip6InDelivers),
+	__ADD(RTNL_LINK_IP6_OUTFORWDATAGRAMS, Ip6OutForwDatagrams),
+	__ADD(RTNL_LINK_IP6_OUTPKTS, Ip6OutRequests),
+	__ADD(RTNL_LINK_IP6_OUTDISCARDS, Ip6OutDiscards),
+	__ADD(RTNL_LINK_IP6_OUTNOROUTES, Ip6OutNoRoutes),
+	__ADD(RTNL_LINK_IP6_REASMTIMEOUT, Ip6ReasmTimeout),
+	__ADD(RTNL_LINK_IP6_REASMREQDS, Ip6ReasmReqds),
+	__ADD(RTNL_LINK_IP6_REASMOKS, Ip6ReasmOKs),
+	__ADD(RTNL_LINK_IP6_REASMFAILS, Ip6ReasmFails),
+	__ADD(RTNL_LINK_IP6_FRAGOKS, Ip6FragOKs),
+	__ADD(RTNL_LINK_IP6_FRAGFAILS, Ip6FragFails),
+	__ADD(RTNL_LINK_IP6_FRAGCREATES, Ip6FragCreates),
+	__ADD(RTNL_LINK_IP6_INMCASTPKTS, Ip6InMcastPkts),
+	__ADD(RTNL_LINK_IP6_OUTMCASTPKTS, Ip6OutMcastPkts),
+	__ADD(RTNL_LINK_IP6_INBCASTPKTS, Ip6InBcastPkts),
+	__ADD(RTNL_LINK_IP6_OUTBCASTPKTS, Ip6OutBcastPkts),
+	__ADD(RTNL_LINK_IP6_INOCTETS, Ip6InOctets),
+	__ADD(RTNL_LINK_IP6_OUTOCTETS, Ip6OutOctets),
+	__ADD(RTNL_LINK_IP6_INMCASTOCTETS, Ip6InMcastOctets),
+	__ADD(RTNL_LINK_IP6_OUTMCASTOCTETS, Ip6OutMcastOctets),
+	__ADD(RTNL_LINK_IP6_INBCASTOCTETS, Ip6InBcastOctets),
+	__ADD(RTNL_LINK_IP6_OUTBCASTOCTETS, Ip6OutBcastOctets),
+	__ADD(RTNL_LINK_ICMP6_INMSGS, ICMP6_InMsgs),
+	__ADD(RTNL_LINK_ICMP6_INERRORS, ICMP6_InErrors),
+	__ADD(RTNL_LINK_ICMP6_OUTMSGS, ICMP6_OutMsgs),
+	__ADD(RTNL_LINK_ICMP6_OUTERRORS, ICMP6_OutErrors),
+	__ADD(RTNL_LINK_ICMP6_CSUMERRORS, ICMP6_InCsumErrors),
+	__ADD(RTNL_LINK_IP6_CSUMERRORS, Ip6_InCsumErrors),
+	__ADD(RTNL_LINK_IP6_NOECTPKTS, Ip6_InNoECTPkts),
+	__ADD(RTNL_LINK_IP6_ECT1PKTS, Ip6_InECT1Pkts),
+	__ADD(RTNL_LINK_IP6_ECT0PKTS, Ip6_InECT0Pkts),
+	__ADD(RTNL_LINK_IP6_CEPKTS, Ip6_InCEPkts),
 };
 
 char *rtnl_link_stat2str(int st, char *buf, size_t len)
@@ -2620,13 +2620,13 @@ int rtnl_link_str2stat(const char *name)
 }
 
 static const struct trans_tbl link_operstates[] = {
-	__ADD(IF_OPER_UNKNOWN, unknown)
-	__ADD(IF_OPER_NOTPRESENT, notpresent)
-	__ADD(IF_OPER_DOWN, down)
-	__ADD(IF_OPER_LOWERLAYERDOWN, lowerlayerdown)
-	__ADD(IF_OPER_TESTING, testing)
-	__ADD(IF_OPER_DORMANT, dormant)
-	__ADD(IF_OPER_UP, up)
+	__ADD(IF_OPER_UNKNOWN, unknown),
+	__ADD(IF_OPER_NOTPRESENT, notpresent),
+	__ADD(IF_OPER_DOWN, down),
+	__ADD(IF_OPER_LOWERLAYERDOWN, lowerlayerdown),
+	__ADD(IF_OPER_TESTING, testing),
+	__ADD(IF_OPER_DORMANT, dormant),
+	__ADD(IF_OPER_UP, up),
 };
 
 char *rtnl_link_operstate2str(uint8_t st, char *buf, size_t len)
@@ -2642,13 +2642,13 @@ int rtnl_link_str2operstate(const char *name)
 }
 
 static const struct trans_tbl link_modes[] = {
-	__ADD(IF_LINK_MODE_DEFAULT, default)
-	__ADD(IF_LINK_MODE_DORMANT, dormant)
+	__ADD(IF_LINK_MODE_DEFAULT, default),
+	__ADD(IF_LINK_MODE_DORMANT, dormant),
 };
 
 static const struct trans_tbl carrier_states[] = {
-	__ADD(IF_CARRIER_DOWN, down)
-	__ADD(IF_CARRIER_UP, up)
+	__ADD(IF_CARRIER_DOWN, down),
+	__ADD(IF_CARRIER_UP, up),
 };
 
 char *rtnl_link_mode2str(uint8_t st, char *buf, size_t len)
diff --git a/lib/route/link/bridge.c b/lib/route/link/bridge.c
index 4ca5f6e..544f02c 100644
--- a/lib/route/link/bridge.c
+++ b/lib/route/link/bridge.c
@@ -480,10 +480,10 @@ int rtnl_link_bridge_get_flags(struct rtnl_link *link)
 }
 
 static const struct trans_tbl bridge_flags[] = {
-	__ADD(RTNL_BRIDGE_HAIRPIN_MODE, hairpin_mode)
-	__ADD(RTNL_BRIDGE_BPDU_GUARD, 	bpdu_guard)
-	__ADD(RTNL_BRIDGE_ROOT_BLOCK,	root_block)
-	__ADD(RTNL_BRIDGE_FAST_LEAVE,	fast_leave)
+	__ADD(RTNL_BRIDGE_HAIRPIN_MODE, hairpin_mode),
+	__ADD(RTNL_BRIDGE_BPDU_GUARD, 	bpdu_guard),
+	__ADD(RTNL_BRIDGE_ROOT_BLOCK,	root_block),
+	__ADD(RTNL_BRIDGE_FAST_LEAVE,	fast_leave),
 };
 
 /**
diff --git a/lib/route/link/can.c b/lib/route/link/can.c
index 60da42d..489119d 100644
--- a/lib/route/link/can.c
+++ b/lib/route/link/can.c
@@ -751,11 +751,11 @@ int rtnl_link_can_unset_ctrlmode(struct rtnl_link *link, uint32_t ctrlmode)
  */
 
 static const struct trans_tbl can_ctrlmode[] = {
-	__ADD(CAN_CTRLMODE_LOOPBACK, loopback)
-	__ADD(CAN_CTRLMODE_LISTENONLY, listen-only)
-	__ADD(CAN_CTRLMODE_3_SAMPLES, triple-sampling)
-	__ADD(CAN_CTRLMODE_ONE_SHOT, one-shot)
-	__ADD(CAN_CTRLMODE_BERR_REPORTING, berr-reporting)
+	__ADD(CAN_CTRLMODE_LOOPBACK, loopback),
+	__ADD(CAN_CTRLMODE_LISTENONLY, listen-only),
+	__ADD(CAN_CTRLMODE_3_SAMPLES, triple-sampling),
+	__ADD(CAN_CTRLMODE_ONE_SHOT, one-shot),
+	__ADD(CAN_CTRLMODE_BERR_REPORTING, berr-reporting),
 };
 
 char *rtnl_link_can_ctrlmode2str(int ctrlmode, char *buf, size_t len)
diff --git a/lib/route/link/inet.c b/lib/route/link/inet.c
index e94342f..f166755 100644
--- a/lib/route/link/inet.c
+++ b/lib/route/link/inet.c
@@ -141,34 +141,34 @@ nla_put_failure:
 }
 
 static const struct trans_tbl inet_devconf[] = {
-	__ADD(IPV4_DEVCONF_FORWARDING, forwarding)
-	__ADD(IPV4_DEVCONF_MC_FORWARDING, mc_forwarding)
-	__ADD(IPV4_DEVCONF_PROXY_ARP, proxy_arp)
-	__ADD(IPV4_DEVCONF_ACCEPT_REDIRECTS, accept_redirects)
-	__ADD(IPV4_DEVCONF_SECURE_REDIRECTS, secure_redirects)
-	__ADD(IPV4_DEVCONF_SEND_REDIRECTS, send_redirects)
-	__ADD(IPV4_DEVCONF_SHARED_MEDIA, shared_media)
-	__ADD(IPV4_DEVCONF_RP_FILTER, rp_filter)
-	__ADD(IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE, accept_source_route)
-	__ADD(IPV4_DEVCONF_BOOTP_RELAY, bootp_relay)
-	__ADD(IPV4_DEVCONF_LOG_MARTIANS, log_martians)
-	__ADD(IPV4_DEVCONF_TAG, tag)
-	__ADD(IPV4_DEVCONF_ARPFILTER, arpfilter)
-	__ADD(IPV4_DEVCONF_MEDIUM_ID, medium_id)
-	__ADD(IPV4_DEVCONF_NOXFRM, noxfrm)
-	__ADD(IPV4_DEVCONF_NOPOLICY, nopolicy)
-	__ADD(IPV4_DEVCONF_FORCE_IGMP_VERSION, force_igmp_version)
-	__ADD(IPV4_DEVCONF_ARP_ANNOUNCE, arp_announce)
-	__ADD(IPV4_DEVCONF_ARP_IGNORE, arp_ignore)
-	__ADD(IPV4_DEVCONF_PROMOTE_SECONDARIES, promote_secondaries)
-	__ADD(IPV4_DEVCONF_ARP_ACCEPT, arp_accept)
-	__ADD(IPV4_DEVCONF_ARP_NOTIFY, arp_notify)
-	__ADD(IPV4_DEVCONF_ACCEPT_LOCAL, accept_local)
-	__ADD(IPV4_DEVCONF_SRC_VMARK, src_vmark)
-	__ADD(IPV4_DEVCONF_PROXY_ARP_PVLAN, proxy_arp_pvlan)
-	__ADD(IPV4_DEVCONF_ROUTE_LOCALNET, route_localnet)
-	__ADD(IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL, igmpv2_unsolicited_report_interval)
-	__ADD(IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL, igmpv3_unsolicited_report_interval)
+	__ADD(IPV4_DEVCONF_FORWARDING, forwarding),
+	__ADD(IPV4_DEVCONF_MC_FORWARDING, mc_forwarding),
+	__ADD(IPV4_DEVCONF_PROXY_ARP, proxy_arp),
+	__ADD(IPV4_DEVCONF_ACCEPT_REDIRECTS, accept_redirects),
+	__ADD(IPV4_DEVCONF_SECURE_REDIRECTS, secure_redirects),
+	__ADD(IPV4_DEVCONF_SEND_REDIRECTS, send_redirects),
+	__ADD(IPV4_DEVCONF_SHARED_MEDIA, shared_media),
+	__ADD(IPV4_DEVCONF_RP_FILTER, rp_filter),
+	__ADD(IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE, accept_source_route),
+	__ADD(IPV4_DEVCONF_BOOTP_RELAY, bootp_relay),
+	__ADD(IPV4_DEVCONF_LOG_MARTIANS, log_martians),
+	__ADD(IPV4_DEVCONF_TAG, tag),
+	__ADD(IPV4_DEVCONF_ARPFILTER, arpfilter),
+	__ADD(IPV4_DEVCONF_MEDIUM_ID, medium_id),
+	__ADD(IPV4_DEVCONF_NOXFRM, noxfrm),
+	__ADD(IPV4_DEVCONF_NOPOLICY, nopolicy),
+	__ADD(IPV4_DEVCONF_FORCE_IGMP_VERSION, force_igmp_version),
+	__ADD(IPV4_DEVCONF_ARP_ANNOUNCE, arp_announce),
+	__ADD(IPV4_DEVCONF_ARP_IGNORE, arp_ignore),
+	__ADD(IPV4_DEVCONF_PROMOTE_SECONDARIES, promote_secondaries),
+	__ADD(IPV4_DEVCONF_ARP_ACCEPT, arp_accept),
+	__ADD(IPV4_DEVCONF_ARP_NOTIFY, arp_notify),
+	__ADD(IPV4_DEVCONF_ACCEPT_LOCAL, accept_local),
+	__ADD(IPV4_DEVCONF_SRC_VMARK, src_vmark),
+	__ADD(IPV4_DEVCONF_PROXY_ARP_PVLAN, proxy_arp_pvlan),
+	__ADD(IPV4_DEVCONF_ROUTE_LOCALNET, route_localnet),
+	__ADD(IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL, igmpv2_unsolicited_report_interval),
+	__ADD(IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL, igmpv3_unsolicited_report_interval),
 };
 
 const char *rtnl_link_inet_devconf2str(int type, char *buf, size_t len)
diff --git a/lib/route/link/inet6.c b/lib/route/link/inet6.c
index 6fa2741..feb0226 100644
--- a/lib/route/link/inet6.c
+++ b/lib/route/link/inet6.c
@@ -208,11 +208,11 @@ static int inet6_parse_protinfo(struct rtnl_link *link, struct nlattr *attr,
 #define IF_READY	0x80000000
 
 static const struct trans_tbl inet6_flags[] = {
-	__ADD(IF_RA_OTHERCONF, ra_otherconf)
-	__ADD(IF_RA_MANAGED, ra_managed)
-	__ADD(IF_RA_RCVD, ra_rcvd)
-	__ADD(IF_RS_SENT, rs_sent)
-	__ADD(IF_READY, ready)
+	__ADD(IF_RA_OTHERCONF, ra_otherconf),
+	__ADD(IF_RA_MANAGED, ra_managed),
+	__ADD(IF_RA_RCVD, ra_rcvd),
+	__ADD(IF_RS_SENT, rs_sent),
+	__ADD(IF_READY, ready),
 };
 
 static char *inet6_flags2str(int flags, char *buf, size_t len)
@@ -222,35 +222,35 @@ static char *inet6_flags2str(int flags, char *buf, size_t len)
 }
 
 static const struct trans_tbl inet6_devconf[] = {
-	__ADD(DEVCONF_FORWARDING, forwarding)
-	__ADD(DEVCONF_HOPLIMIT, hoplimit)
-	__ADD(DEVCONF_MTU6, mtu6)
-	__ADD(DEVCONF_ACCEPT_RA, accept_ra)
-	__ADD(DEVCONF_ACCEPT_REDIRECTS, accept_redirects)
-	__ADD(DEVCONF_AUTOCONF, autoconf)
-	__ADD(DEVCONF_DAD_TRANSMITS, dad_transmits)
-	__ADD(DEVCONF_RTR_SOLICITS, rtr_solicits)
-	__ADD(DEVCONF_RTR_SOLICIT_INTERVAL, rtr_solicit_interval)
-	__ADD(DEVCONF_RTR_SOLICIT_DELAY, rtr_solicit_delay)
-	__ADD(DEVCONF_USE_TEMPADDR, use_tempaddr)
-	__ADD(DEVCONF_TEMP_VALID_LFT, temp_valid_lft)
-	__ADD(DEVCONF_TEMP_PREFERED_LFT, temp_prefered_lft)
-	__ADD(DEVCONF_REGEN_MAX_RETRY, regen_max_retry)
-	__ADD(DEVCONF_MAX_DESYNC_FACTOR, max_desync_factor)
-	__ADD(DEVCONF_MAX_ADDRESSES, max_addresses)
-	__ADD(DEVCONF_FORCE_MLD_VERSION, force_mld_version)
-	__ADD(DEVCONF_ACCEPT_RA_DEFRTR, accept_ra_defrtr)
-	__ADD(DEVCONF_ACCEPT_RA_PINFO, accept_ra_pinfo)
-	__ADD(DEVCONF_ACCEPT_RA_RTR_PREF, accept_ra_rtr_pref)
-	__ADD(DEVCONF_RTR_PROBE_INTERVAL, rtr_probe_interval)
-	__ADD(DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN, accept_ra_rt_info)
-	__ADD(DEVCONF_PROXY_NDP, proxy_ndp)
-	__ADD(DEVCONF_OPTIMISTIC_DAD, optimistic_dad)
-	__ADD(DEVCONF_ACCEPT_SOURCE_ROUTE, accept_source_route)
-	__ADD(DEVCONF_MC_FORWARDING, mc_forwarding)
-	__ADD(DEVCONF_DISABLE_IPV6, disable_ipv6)
-	__ADD(DEVCONF_ACCEPT_DAD, accept_dad)
-	__ADD(DEVCONF_FORCE_TLLAO, force_tllao)
+	__ADD(DEVCONF_FORWARDING, forwarding),
+	__ADD(DEVCONF_HOPLIMIT, hoplimit),
+	__ADD(DEVCONF_MTU6, mtu6),
+	__ADD(DEVCONF_ACCEPT_RA, accept_ra),
+	__ADD(DEVCONF_ACCEPT_REDIRECTS, accept_redirects),
+	__ADD(DEVCONF_AUTOCONF, autoconf),
+	__ADD(DEVCONF_DAD_TRANSMITS, dad_transmits),
+	__ADD(DEVCONF_RTR_SOLICITS, rtr_solicits),
+	__ADD(DEVCONF_RTR_SOLICIT_INTERVAL, rtr_solicit_interval),
+	__ADD(DEVCONF_RTR_SOLICIT_DELAY, rtr_solicit_delay),
+	__ADD(DEVCONF_USE_TEMPADDR, use_tempaddr),
+	__ADD(DEVCONF_TEMP_VALID_LFT, temp_valid_lft),
+	__ADD(DEVCONF_TEMP_PREFERED_LFT, temp_prefered_lft),
+	__ADD(DEVCONF_REGEN_MAX_RETRY, regen_max_retry),
+	__ADD(DEVCONF_MAX_DESYNC_FACTOR, max_desync_factor),
+	__ADD(DEVCONF_MAX_ADDRESSES, max_addresses),
+	__ADD(DEVCONF_FORCE_MLD_VERSION, force_mld_version),
+	__ADD(DEVCONF_ACCEPT_RA_DEFRTR, accept_ra_defrtr),
+	__ADD(DEVCONF_ACCEPT_RA_PINFO, accept_ra_pinfo),
+	__ADD(DEVCONF_ACCEPT_RA_RTR_PREF, accept_ra_rtr_pref),
+	__ADD(DEVCONF_RTR_PROBE_INTERVAL, rtr_probe_interval),
+	__ADD(DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN, accept_ra_rt_info),
+	__ADD(DEVCONF_PROXY_NDP, proxy_ndp),
+	__ADD(DEVCONF_OPTIMISTIC_DAD, optimistic_dad),
+	__ADD(DEVCONF_ACCEPT_SOURCE_ROUTE, accept_source_route),
+	__ADD(DEVCONF_MC_FORWARDING, mc_forwarding),
+	__ADD(DEVCONF_DISABLE_IPV6, disable_ipv6),
+	__ADD(DEVCONF_ACCEPT_DAD, accept_dad),
+	__ADD(DEVCONF_FORCE_TLLAO, force_tllao),
 };
 
 static char *inet6_devconf2str(int type, char *buf, size_t len)
diff --git a/lib/route/link/macvlan.c b/lib/route/link/macvlan.c
index 2340903..c3eeb3f 100644
--- a/lib/route/link/macvlan.c
+++ b/lib/route/link/macvlan.c
@@ -310,14 +310,14 @@ uint16_t rtnl_link_macvlan_get_flags(struct rtnl_link *link)
 /** @} */
 
 static const struct trans_tbl macvlan_flags[] = {
-	__ADD(MACVLAN_FLAG_NOPROMISC, nopromisc)
+	__ADD(MACVLAN_FLAG_NOPROMISC, nopromisc),
 };
 
 static const struct trans_tbl macvlan_modes[] = {
-	__ADD(MACVLAN_MODE_PRIVATE, private)
-	__ADD(MACVLAN_MODE_VEPA, vepa)
-	__ADD(MACVLAN_MODE_BRIDGE, bridge)
-	__ADD(MACVLAN_MODE_PASSTHRU, passthru)
+	__ADD(MACVLAN_MODE_PRIVATE, private),
+	__ADD(MACVLAN_MODE_VEPA, vepa),
+	__ADD(MACVLAN_MODE_BRIDGE, bridge),
+	__ADD(MACVLAN_MODE_PASSTHRU, passthru),
 };
 
 /**
diff --git a/lib/route/link/vlan.c b/lib/route/link/vlan.c
index b9f0c66..f977bc4 100644
--- a/lib/route/link/vlan.c
+++ b/lib/route/link/vlan.c
@@ -603,7 +603,7 @@ struct vlan_map *rtnl_link_vlan_get_egress_map(struct rtnl_link *link,
 /** @} */
 
 static const struct trans_tbl vlan_flags[] = {
-	__ADD(VLAN_FLAG_REORDER_HDR, reorder_hdr)
+	__ADD(VLAN_FLAG_REORDER_HDR, reorder_hdr),
 };
 
 /**
diff --git a/lib/route/neigh.c b/lib/route/neigh.c
index ad26b4d..0caf6dd 100644
--- a/lib/route/neigh.c
+++ b/lib/route/neigh.c
@@ -285,15 +285,15 @@ static int neigh_compare(struct nl_object *_a, struct nl_object *_b,
 }
 
 static const struct trans_tbl neigh_attrs[] = {
-	__ADD(NEIGH_ATTR_FLAGS, flags)
-	__ADD(NEIGH_ATTR_STATE, state)
-	__ADD(NEIGH_ATTR_LLADDR, lladdr)
-	__ADD(NEIGH_ATTR_DST, dst)
-	__ADD(NEIGH_ATTR_CACHEINFO, cacheinfo)
-	__ADD(NEIGH_ATTR_IFINDEX, ifindex)
-	__ADD(NEIGH_ATTR_FAMILY, family)
-	__ADD(NEIGH_ATTR_TYPE, type)
-	__ADD(NEIGH_ATTR_PROBES, probes)
+	__ADD(NEIGH_ATTR_FLAGS, flags),
+	__ADD(NEIGH_ATTR_STATE, state),
+	__ADD(NEIGH_ATTR_LLADDR, lladdr),
+	__ADD(NEIGH_ATTR_DST, dst),
+	__ADD(NEIGH_ATTR_CACHEINFO, cacheinfo),
+	__ADD(NEIGH_ATTR_IFINDEX, ifindex),
+	__ADD(NEIGH_ATTR_FAMILY, family),
+	__ADD(NEIGH_ATTR_TYPE, type),
+	__ADD(NEIGH_ATTR_PROBES, probes),
 };
 
 static char *neigh_attrs2str(int attrs, char *buf, size_t len)
@@ -728,14 +728,14 @@ int rtnl_neigh_delete(struct nl_sock *sk, struct rtnl_neigh *neigh,
  */
 
 static const struct trans_tbl neigh_states[] = {
-	__ADD(NUD_INCOMPLETE, incomplete)
-	__ADD(NUD_REACHABLE, reachable)
-	__ADD(NUD_STALE, stale)
-	__ADD(NUD_DELAY, delay)
-	__ADD(NUD_PROBE, probe)
-	__ADD(NUD_FAILED, failed)
-	__ADD(NUD_NOARP, norarp)
-	__ADD(NUD_PERMANENT, permanent)
+	__ADD(NUD_INCOMPLETE, incomplete),
+	__ADD(NUD_REACHABLE, reachable),
+	__ADD(NUD_STALE, stale),
+	__ADD(NUD_DELAY, delay),
+	__ADD(NUD_PROBE, probe),
+	__ADD(NUD_FAILED, failed),
+	__ADD(NUD_NOARP, norarp),
+	__ADD(NUD_PERMANENT, permanent),
 };
 
 char * rtnl_neigh_state2str(int state, char *buf, size_t len)
@@ -757,9 +757,9 @@ int rtnl_neigh_str2state(const char *name)
  */
 
 static const struct trans_tbl neigh_flags[] = {
-	__ADD(NTF_USE, use)
-	__ADD(NTF_PROXY, proxy)
-	__ADD(NTF_ROUTER, router)
+	__ADD(NTF_USE, use),
+	__ADD(NTF_PROXY, proxy),
+	__ADD(NTF_ROUTER, router),
 };
 
 char * rtnl_neigh_flags2str(int flags, char *buf, size_t len)
diff --git a/lib/route/nexthop.c b/lib/route/nexthop.c
index d3ca499..a7cda90 100644
--- a/lib/route/nexthop.c
+++ b/lib/route/nexthop.c
@@ -277,9 +277,9 @@ uint32_t rtnl_route_nh_get_realms(struct rtnl_nexthop *nh)
  */
 
 static const struct trans_tbl nh_flags[] = {
-	__ADD(RTNH_F_DEAD, dead)
-	__ADD(RTNH_F_PERVASIVE, pervasive)
-	__ADD(RTNH_F_ONLINK, onlink)
+	__ADD(RTNH_F_DEAD, dead),
+	__ADD(RTNH_F_PERVASIVE, pervasive),
+	__ADD(RTNH_F_ONLINK, onlink),
 };
 
 char *rtnl_route_nh_flags2str(int flags, char *buf, size_t len)
diff --git a/lib/route/qdisc/cbq.c b/lib/route/qdisc/cbq.c
index 95f1761..118f893 100644
--- a/lib/route/qdisc/cbq.c
+++ b/lib/route/qdisc/cbq.c
@@ -28,11 +28,11 @@
  */
 
 static const struct trans_tbl ovl_strategies[] = {
-	__ADD(TC_CBQ_OVL_CLASSIC,classic)
-	__ADD(TC_CBQ_OVL_DELAY,delay)
-	__ADD(TC_CBQ_OVL_LOWPRIO,lowprio)
-	__ADD(TC_CBQ_OVL_DROP,drop)
-	__ADD(TC_CBQ_OVL_RCLASSIC,rclassic)
+	__ADD(TC_CBQ_OVL_CLASSIC,classic),
+	__ADD(TC_CBQ_OVL_DELAY,delay),
+	__ADD(TC_CBQ_OVL_LOWPRIO,lowprio),
+	__ADD(TC_CBQ_OVL_DROP,drop),
+	__ADD(TC_CBQ_OVL_RCLASSIC,rclassic),
 };
 
 /**
diff --git a/lib/route/qdisc/prio.c b/lib/route/qdisc/prio.c
index 54a46f0..5a21729 100644
--- a/lib/route/qdisc/prio.c
+++ b/lib/route/qdisc/prio.c
@@ -215,12 +215,12 @@ uint8_t *rtnl_qdisc_prio_get_priomap(struct rtnl_qdisc *qdisc)
  */
 
 static const struct trans_tbl prios[] = {
-	__ADD(TC_PRIO_BESTEFFORT,besteffort)
-	__ADD(TC_PRIO_FILLER,filler)
-	__ADD(TC_PRIO_BULK,bulk)
-	__ADD(TC_PRIO_INTERACTIVE_BULK,interactive_bulk)
-	__ADD(TC_PRIO_INTERACTIVE,interactive)
-	__ADD(TC_PRIO_CONTROL,control)
+	__ADD(TC_PRIO_BESTEFFORT,besteffort),
+	__ADD(TC_PRIO_FILLER,filler),
+	__ADD(TC_PRIO_BULK,bulk),
+	__ADD(TC_PRIO_INTERACTIVE_BULK,interactive_bulk),
+	__ADD(TC_PRIO_INTERACTIVE,interactive),
+	__ADD(TC_PRIO_CONTROL,control),
 };
 
 /**
diff --git a/lib/route/route_obj.c b/lib/route/route_obj.c
index dd4bf49..4063c6f 100644
--- a/lib/route/route_obj.c
+++ b/lib/route/route_obj.c
@@ -544,24 +544,24 @@ static int route_update(struct nl_object *old_obj, struct nl_object *new_obj)
 }
 
 static const struct trans_tbl route_attrs[] = {
-	__ADD(ROUTE_ATTR_FAMILY, family)
-	__ADD(ROUTE_ATTR_TOS, tos)
-	__ADD(ROUTE_ATTR_TABLE, table)
-	__ADD(ROUTE_ATTR_PROTOCOL, protocol)
-	__ADD(ROUTE_ATTR_SCOPE, scope)
-	__ADD(ROUTE_ATTR_TYPE, type)
-	__ADD(ROUTE_ATTR_FLAGS, flags)
-	__ADD(ROUTE_ATTR_DST, dst)
-	__ADD(ROUTE_ATTR_SRC, src)
-	__ADD(ROUTE_ATTR_IIF, iif)
-	__ADD(ROUTE_ATTR_OIF, oif)
-	__ADD(ROUTE_ATTR_GATEWAY, gateway)
-	__ADD(ROUTE_ATTR_PRIO, prio)
-	__ADD(ROUTE_ATTR_PREF_SRC, pref_src)
-	__ADD(ROUTE_ATTR_METRICS, metrics)
-	__ADD(ROUTE_ATTR_MULTIPATH, multipath)
-	__ADD(ROUTE_ATTR_REALMS, realms)
-	__ADD(ROUTE_ATTR_CACHEINFO, cacheinfo)
+	__ADD(ROUTE_ATTR_FAMILY, family),
+	__ADD(ROUTE_ATTR_TOS, tos),
+	__ADD(ROUTE_ATTR_TABLE, table),
+	__ADD(ROUTE_ATTR_PROTOCOL, protocol),
+	__ADD(ROUTE_ATTR_SCOPE, scope),
+	__ADD(ROUTE_ATTR_TYPE, type),
+	__ADD(ROUTE_ATTR_FLAGS, flags),
+	__ADD(ROUTE_ATTR_DST, dst),
+	__ADD(ROUTE_ATTR_SRC, src),
+	__ADD(ROUTE_ATTR_IIF, iif),
+	__ADD(ROUTE_ATTR_OIF, oif),
+	__ADD(ROUTE_ATTR_GATEWAY, gateway),
+	__ADD(ROUTE_ATTR_PRIO, prio),
+	__ADD(ROUTE_ATTR_PREF_SRC, pref_src),
+	__ADD(ROUTE_ATTR_METRICS, metrics),
+	__ADD(ROUTE_ATTR_MULTIPATH, multipath),
+	__ADD(ROUTE_ATTR_REALMS, realms),
+	__ADD(ROUTE_ATTR_CACHEINFO, cacheinfo),
 };
 
 static char *route_attrs2str(int attrs, char *buf, size_t len)
diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
index a5b3966..9cd326f 100644
--- a/lib/route/route_utils.c
+++ b/lib/route/route_utils.c
@@ -140,19 +140,19 @@ int rtnl_route_str2proto(const char *name)
  */
 
 static const struct trans_tbl route_metrices[] = {
-	__ADD(RTAX_UNSPEC, unspec)
-	__ADD(RTAX_LOCK, lock)
-	__ADD(RTAX_MTU, mtu)
-	__ADD(RTAX_WINDOW, window)
-	__ADD(RTAX_RTT, rtt)
-	__ADD(RTAX_RTTVAR, rttvar)
-	__ADD(RTAX_SSTHRESH, ssthresh)
-	__ADD(RTAX_CWND, cwnd)
-	__ADD(RTAX_ADVMSS, advmss)
-	__ADD(RTAX_REORDERING, reordering)
-	__ADD(RTAX_HOPLIMIT, hoplimit)
-	__ADD(RTAX_INITCWND, initcwnd)
-	__ADD(RTAX_FEATURES, features)
+	__ADD(RTAX_UNSPEC, unspec),
+	__ADD(RTAX_LOCK, lock),
+	__ADD(RTAX_MTU, mtu),
+	__ADD(RTAX_WINDOW, window),
+	__ADD(RTAX_RTT, rtt),
+	__ADD(RTAX_RTTVAR, rttvar),
+	__ADD(RTAX_SSTHRESH, ssthresh),
+	__ADD(RTAX_CWND, cwnd),
+	__ADD(RTAX_ADVMSS, advmss),
+	__ADD(RTAX_REORDERING, reordering),
+	__ADD(RTAX_HOPLIMIT, hoplimit),
+	__ADD(RTAX_INITCWND, initcwnd),
+	__ADD(RTAX_FEATURES, features),
 };
 
 char *rtnl_route_metric2str(int metric, char *buf, size_t size)
diff --git a/lib/route/rtnl.c b/lib/route/rtnl.c
index 6a55ca1..242e2a8 100644
--- a/lib/route/rtnl.c
+++ b/lib/route/rtnl.c
@@ -58,18 +58,18 @@ int nl_rtgen_request(struct nl_sock *sk, int type, int family, int flags)
  */
 
 static const struct trans_tbl rtntypes[] = {
-	__ADD(RTN_UNSPEC,unspec)
-	__ADD(RTN_UNICAST,unicast)
-	__ADD(RTN_LOCAL,local)
-	__ADD(RTN_BROADCAST,broadcast)
-	__ADD(RTN_ANYCAST,anycast)
-	__ADD(RTN_MULTICAST,multicast)
-	__ADD(RTN_BLACKHOLE,blackhole)
-	__ADD(RTN_UNREACHABLE,unreachable)
-	__ADD(RTN_PROHIBIT,prohibit)
-	__ADD(RTN_THROW,throw)
-	__ADD(RTN_NAT,nat)
-	__ADD(RTN_XRESOLVE,xresolve)
+	__ADD(RTN_UNSPEC,unspec),
+	__ADD(RTN_UNICAST,unicast),
+	__ADD(RTN_LOCAL,local),
+	__ADD(RTN_BROADCAST,broadcast),
+	__ADD(RTN_ANYCAST,anycast),
+	__ADD(RTN_MULTICAST,multicast),
+	__ADD(RTN_BLACKHOLE,blackhole),
+	__ADD(RTN_UNREACHABLE,unreachable),
+	__ADD(RTN_PROHIBIT,prohibit),
+	__ADD(RTN_THROW,throw),
+	__ADD(RTN_NAT,nat),
+	__ADD(RTN_XRESOLVE,xresolve),
 };
 
 char *nl_rtntype2str(int type, char *buf, size_t size)
@@ -90,11 +90,11 @@ int nl_str2rtntype(const char *name)
  */
 
 static const struct trans_tbl scopes[] = {
-	__ADD(255,nowhere)
-	__ADD(254,host)
-	__ADD(253,link)
-	__ADD(200,site)
-	__ADD(0,global)
+	__ADD(255,nowhere),
+	__ADD(254,host),
+	__ADD(253,link),
+	__ADD(200,site),
+	__ADD(0,global),
 };
 
 char *rtnl_scope2str(int scope, char *buf, size_t size)
diff --git a/lib/route/rule.c b/lib/route/rule.c
index b2161a2..357cb1b 100644
--- a/lib/route/rule.c
+++ b/lib/route/rule.c
@@ -274,19 +274,19 @@ static int rule_compare(struct nl_object *_a, struct nl_object *_b,
 }
 
 static const struct trans_tbl rule_attrs[] = {
-	__ADD(RULE_ATTR_FAMILY, family)
-	__ADD(RULE_ATTR_TABLE, table)
-	__ADD(RULE_ATTR_ACTION, action)
-	__ADD(RULE_ATTR_IIFNAME, iifname)
-	__ADD(RULE_ATTR_OIFNAME, oifname)
-	__ADD(RULE_ATTR_PRIO, prio)
-	__ADD(RULE_ATTR_MARK, mark)
-	__ADD(RULE_ATTR_MASK, mask)
-	__ADD(RULE_ATTR_GOTO, goto)
-	__ADD(RULE_ATTR_SRC, src)
-	__ADD(RULE_ATTR_DST, dst)
-	__ADD(RULE_ATTR_DSFIELD, dsfield)
-	__ADD(RULE_ATTR_FLOW, flow)
+	__ADD(RULE_ATTR_FAMILY, family),
+	__ADD(RULE_ATTR_TABLE, table),
+	__ADD(RULE_ATTR_ACTION, action),
+	__ADD(RULE_ATTR_IIFNAME, iifname),
+	__ADD(RULE_ATTR_OIFNAME, oifname),
+	__ADD(RULE_ATTR_PRIO, prio),
+	__ADD(RULE_ATTR_MARK, mark),
+	__ADD(RULE_ATTR_MASK, mask),
+	__ADD(RULE_ATTR_GOTO, goto),
+	__ADD(RULE_ATTR_SRC, src),
+	__ADD(RULE_ATTR_DST, dst),
+	__ADD(RULE_ATTR_DSFIELD, dsfield),
+	__ADD(RULE_ATTR_FLOW, flow),
 };
 
 static char *rule_attrs2str(int attrs, char *buf, size_t len)