From: jamal <hadi@cyberus.ca>
Date: Fri, 8 Dec 2006 01:58:23 +0000 (-0500)
Subject: update xfrm monitoring to use nl_mgrp
X-Git-Tag: v2.6.19-061214~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b8225122d1b22c74f05bd12398bd602d49e6e13;p=thirdparty%2Fiproute2.git

update xfrm monitoring to use nl_mgrp

Stephen,
I will wait until you sync all these patches ive sent; then send a
couple more then i will be done.

cheers,
jamal

[XFRM] update xfrm monitoring to use nl_mgrp

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

diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c
index b2014b4af..925e229c2 100644
--- a/ip/xfrm_monitor.c
+++ b/ip/xfrm_monitor.c
@@ -292,17 +292,17 @@ int do_xfrm_monitor(int argc, char **argv)
 	}
 
 	if (lacquire)
-		groups |= XFRMGRP_ACQUIRE;
+		groups |= nl_mgrp(XFRMNLGRP_ACQUIRE);
 	if (lexpire)
-		groups |= XFRMGRP_EXPIRE;
+		groups |= nl_mgrp(XFRMNLGRP_EXPIRE);
 	if (lsa)
-		groups |= XFRMGRP_SA;
+		groups |= nl_mgrp(XFRMNLGRP_SA);
 	if (lpolicy)
-		groups |= XFRMGRP_POLICY;
+		groups |= nl_mgrp(XFRMNLGRP_POLICY);
 	if (laevent)
-		groups |= (1 <<  (XFRMNLGRP_AEVENTS - 1));
+		groups |= nl_mgrp(XFRMNLGRP_AEVENTS);
 	if (lreport)
-		groups |= XFRMGRP_REPORT;
+		groups |= nl_mgrp(XFRMNLGRP_REPORT);
 
 	if (file) {
 		FILE *fp;