[IPROUTE2][ALL] update rest to use nl_mgrp

[IPROUTE2][ALL] update rest to use nl_mgrp

[jamal]

[-- Attachment #1: Type: text/plain, Size: 14 bytes --]

cheers,
jamal

[-- Attachment #2: convrestmg --]
[-- Type: text/plain, Size: 2670 bytes --]

[ALL] update rest to use nl_mgrp

Signed-off-by: J Hadi Salim <hadi@cyberus.ca>

---
commit 539bc1cc1b002700504ad8cbe82ea451026c5fe4
tree 208bd273db5bf023c33e5256da615a20173c1921
parent 40076f622e0aacb2b792d3ac1b5d12aa97c4da9c
author Jamal Hadi Salim <hadi@cyberus.ca> Sun, 25 Feb 2007 11:43:54 -0500
committer Jamal Hadi Salim <hadi@cyberus.ca> Sun, 25 Feb 2007 11:43:54 -0500

 ip/ipmonitor.c  |   12 ++++++------
 ip/rtmon.c      |   10 +++++-----
 tc/tc_monitor.c |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c
index 704ada7..f1a1f27 100644
--- 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 8c464cb..b538a52 100644
--- 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 1af6cf0..bf58744 100644
--- 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) {