From 6b7dff17f6f97ce80cd260920267aee68f15582b Mon Sep 17 00:00:00 2001
From: "osdl.net!shemminger" <osdl.net!shemminger>
Date: Tue, 28 Sep 2004 18:35:49 +0000
Subject: [PATCH] Fix issues with filter name conflicts and cleanup.

2004/09/04 06:16:51-07:00 net[shemminger]!kaber
: prevent tc crashes

(Logical change 1.81)
---
 tc/f_fw.c      |  9 ++++-----
 tc/f_route.c   |  9 ++++-----
 tc/f_rsvp.c    | 18 ++++++++----------
 tc/f_tcindex.c |  9 ++++-----
 tc/f_u32.c     |  9 ++++-----
 5 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/tc/f_fw.c b/tc/f_fw.c
index 66371268..64084bbf 100644
--- a/tc/f_fw.c
+++ b/tc/f_fw.c
@@ -135,9 +135,8 @@ static int fw_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u
 	return 0;
 }
 
-struct filter_util fw_util = {
-	NULL,
-	"fw",
-	fw_parse_opt,
-	fw_print_opt,
+struct filter_util fw_filter_util = {
+	.id = "fw",
+	.parse_fopt = fw_parse_opt,
+	.print_fopt = fw_print_opt,
 };
diff --git a/tc/f_route.c b/tc/f_route.c
index f13c28b5..15c638c8 100644
--- a/tc/f_route.c
+++ b/tc/f_route.c
@@ -167,9 +167,8 @@ static int route_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt,
 	return 0;
 }
 
-struct filter_util route_util = {
-	NULL,
-	"route",
-	route_parse_opt,
-	route_print_opt,
+struct filter_util route_filter_util = {
+	.id = "route",
+	.parse_fopt = route_parse_opt,
+	.print_fopt = route_print_opt,
 };
diff --git a/tc/f_rsvp.c b/tc/f_rsvp.c
index 3d9b5283..3f33696d 100644
--- a/tc/f_rsvp.c
+++ b/tc/f_rsvp.c
@@ -393,16 +393,14 @@ static int rsvp_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, _
 	return 0;
 }
 
-struct filter_util rsvp_util = {
-	NULL,
-	"rsvp",
-	rsvp_parse_opt,
-	rsvp_print_opt,
+struct filter_util rsvp_filter_util = {
+	.id = "rsvp",
+	.parse_fopt = rsvp_parse_opt,
+	.print_fopt = rsvp_print_opt,
 };
 
-struct filter_util rsvp6_util = {
-	NULL,
-	"rsvp6",
-	rsvp_parse_opt,
-	rsvp_print_opt,
+struct filter_util rsvp6_filter_util = {
+	.id = "rsvp6",
+	.parse_fopt = rsvp_parse_opt,
+	.print_fopt = rsvp_print_opt,
 };
diff --git a/tc/f_tcindex.c b/tc/f_tcindex.c
index 59397487..45f0db22 100644
--- a/tc/f_tcindex.c
+++ b/tc/f_tcindex.c
@@ -178,9 +178,8 @@ static int tcindex_print_opt(struct filter_util *qu, FILE *f,
 	return 0;
 }
 
-struct filter_util tcindex_util = {
-	NULL,
-	"tcindex",
-	tcindex_parse_opt,
-	tcindex_print_opt,
+struct filter_util tcindex_filter_util = {
+	.id = "tcindex",
+	.parse_fopt = tcindex_parse_opt,
+	.print_fopt = tcindex_print_opt,
 };
diff --git a/tc/f_u32.c b/tc/f_u32.c
index d35dafac..56fea713 100644
--- a/tc/f_u32.c
+++ b/tc/f_u32.c
@@ -1012,9 +1012,8 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, __
 	return 0;
 }
 
-struct filter_util u32_util = {
-	NULL,
-	"u32",
-	u32_parse_opt,
-	u32_print_opt,
+struct filter_util u32_filter_util = {
+	.id = "u32",
+	.parse_fopt = u32_parse_opt,
+	.print_fopt = u32_print_opt,
 };