From b64f58b01354a1cfdc56f9617aabc9997f9fb01e Mon Sep 17 00:00:00 2001 From: jamal Date: Sun, 25 Feb 2007 11:55:19 -0500 Subject: [PATCH] update rest to use nl_mgrp cheers, jamal [ALL] update rest to use nl_mgrp Signed-off-by: J Hadi Salim Signed-off-by: Stephen Hemminger --- 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 704ada72..f1a1f273 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 8c464cbd..b538a52e 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 1af6cf0a..bf587445 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) { -- 2.39.5