From: Masahide NAKAMURA <nakam@linux-ipv6.org>
Date: Fri, 24 Aug 2007 02:05:07 +0000 (+0900)
Subject: ip: xfrm: Clean-up for internal mask to filter.
X-Git-Tag: v2.6.23-071016~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed01e3906854516188a5d57a31eab2e5e9ba673f;p=thirdparty%2Fiproute2.git

ip: xfrm: Clean-up for internal mask to filter.

Remove unused or redundant usage for xfrm_filter.

Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
---

diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c
index c1086f1c8..f4488acbc 100644
--- a/ip/xfrm_policy.c
+++ b/ip/xfrm_policy.c
@@ -222,16 +222,10 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
 
 			NEXT_ARG();
 			xfrm_policy_dir_parse(&req.xpinfo.dir, &argc, &argv);
-
-			filter.dir_mask = XFRM_FILTER_MASK_FULL;
-
 		} else if (strcmp(*argv, "index") == 0) {
 			NEXT_ARG();
 			if (get_u32(&req.xpinfo.index, *argv, 0))
 				invarg("\"INDEX\" is invalid", *argv);
-
-			filter.index_mask = XFRM_FILTER_MASK_FULL;
-
 		} else if (strcmp(*argv, "ptype") == 0) {
 			if (ptypep)
 				duparg("ptype", *argv);
@@ -239,9 +233,6 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
 
 			NEXT_ARG();
 			xfrm_policy_ptype_parse(&upt.type, &argc, &argv);
-
-			filter.dir_mask = XFRM_FILTER_MASK_FULL;
-
 		} else if (strcmp(*argv, "action") == 0) {
 			NEXT_ARG();
 			if (strcmp(*argv, "allow") == 0)
@@ -250,16 +241,10 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
 				req.xpinfo.action = XFRM_POLICY_BLOCK;
 			else
 				invarg("\"action\" value is invalid\n", *argv);
-
-			filter.action_mask = XFRM_FILTER_MASK_FULL;
-
 		} else if (strcmp(*argv, "priority") == 0) {
 			NEXT_ARG();
 			if (get_u32(&req.xpinfo.priority, *argv, 0))
 				invarg("\"PRIORITY\" is invalid", *argv);
-
-			filter.priority_mask = XFRM_FILTER_MASK_FULL;
-
 		} else if (strcmp(*argv, "limit") == 0) {
 			NEXT_ARG();
 			xfrm_lifetime_cfg_parse(&req.xpinfo.lft, &argc, &argv);
@@ -888,8 +873,6 @@ static int xfrm_policy_flush(int argc, char **argv)
 
 			NEXT_ARG();
 			xfrm_policy_ptype_parse(&upt.type, &argc, &argv);
-
-			filter.dir_mask = XFRM_FILTER_MASK_FULL;
 		} else
 			invarg("unknown", *argv);
 
diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index 54e13305f..2b68f49e5 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -216,8 +216,6 @@ static int xfrm_state_flag_parse(__u8 *flags, int *argcp, char ***argvp)
 		}
 	}
 
-	filter.state_flags_mask = XFRM_FILTER_MASK_FULL;
-
 	*argcp = argc;
 	*argvp = argv;