update rest to use nl_mgrp

cheers,
jamal

[ALL] update rest to use nl_mgrp

Signed-off-by: J Hadi Salim <hadi@cyberus.ca>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>

diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c
index 704ada72a237e1aac50e0589984a1255f12c1bc1..f1a1f273f2badd010bb45ffd6a52d62837d7c295 100644 (file)
--- a/ip/ipmonitor.c
+++ b/ip/ipmonitor.c
@@ -132,22 +132,22 @@ int do_ipmonitor(int argc, char **argv)
        }
 
        if (llink)
-               groups |= RTMGRP_LINK;
+               groups |= nl_mgrp(RTNLGRP_LINK);
        if (laddr) {
                if (!preferred_family || preferred_family == AF_INET)
-                       groups |= RTMGRP_IPV4_IFADDR;
+                       groups |= nl_mgrp(RTNLGRP_IPV4_IFADDR);
                if (!preferred_family || preferred_family == AF_INET6)
-                       groups |= RTMGRP_IPV6_IFADDR;
+                       groups |= nl_mgrp(RTNLGRP_IPV6_IFADDR);
        }
        if (lroute) {
                if (!preferred_family || preferred_family == AF_INET)
-                       groups |= RTMGRP_IPV4_ROUTE;
+                       groups |= nl_mgrp(RTNLGRP_IPV4_ROUTE);
                if (!preferred_family || preferred_family == AF_INET6)
-                       groups |= RTMGRP_IPV6_ROUTE;
+                       groups |= nl_mgrp(RTNLGRP_IPV6_ROUTE);
        }
        if (lprefix) {
                if (!preferred_family || preferred_family == AF_INET6)
-                       groups |= RTMGRP_IPV6_PREFIX;
+                       groups |= nl_mgrp(RTNLGRP_IPV6_PREFIX);
        }
 
        if (file) {

diff --git a/ip/rtmon.c b/ip/rtmon.c
index 8c464cbdd9b0ca3c01b07e6768ceb3476f7a27d7..b538a52e630be8527771ce5648c9ed7fc4d8bd3f 100644 (file)
--- a/ip/rtmon.c
+++ b/ip/rtmon.c
@@ -134,18 +134,18 @@ main(int argc, char **argv)
                exit(-1);
        }
        if (llink)
-               groups |= RTMGRP_LINK;
+               groups |= nl_mgrp(RTNLGRP_LINK);
        if (laddr) {
                if (!family || family == AF_INET)
-                       groups |= RTMGRP_IPV4_IFADDR;
+                       groups |= nl_mgrp(RTNLGRP_IPV4_IFADDR);
                if (!family || family == AF_INET6)
-                       groups |= RTMGRP_IPV6_IFADDR;
+                       groups |= nl_mgrp(RTNLGRP_IPV6_IFADDR);
        }
        if (lroute) {
                if (!family || family == AF_INET)
-                       groups |= RTMGRP_IPV4_ROUTE;
+                       groups |= nl_mgrp(RTNLGRP_IPV4_ROUTE);
                if (!family || family == AF_INET6)
-                       groups |= RTMGRP_IPV6_ROUTE;
+                       groups |= nl_mgrp(RTNLGRP_IPV6_ROUTE);
        }
 
        fp = fopen(file, "w");

diff --git a/tc/tc_monitor.c b/tc/tc_monitor.c
index 1af6cf0af8a3797f5facd7dfcfecf6bb0c60c452..bf587445a2be1add89e7180da5ce69a05ba99938 100644 (file)
--- a/tc/tc_monitor.c
+++ b/tc/tc_monitor.c
@@ -68,7 +68,7 @@ int do_tcmonitor(int argc, char **argv)
 {
        struct rtnl_handle rth;
        char *file = NULL;
-       unsigned groups = RTMGRP_TC;
+       unsigned groups = nl_mgrp(RTNLGRP_TC);
 
        while (argc > 0) {
                if (matches(*argv, "file") == 0) {