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)
This commit is contained in:
osdl.net!shemminger 2004-09-28 18:35:49 +00:00
parent 99475d054b
commit 6b7dff17f6
5 changed files with 24 additions and 30 deletions

View File

@ -135,9 +135,8 @@ static int fw_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u
return 0; return 0;
} }
struct filter_util fw_util = { struct filter_util fw_filter_util = {
NULL, .id = "fw",
"fw", .parse_fopt = fw_parse_opt,
fw_parse_opt, .print_fopt = fw_print_opt,
fw_print_opt,
}; };

View File

@ -167,9 +167,8 @@ static int route_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt,
return 0; return 0;
} }
struct filter_util route_util = { struct filter_util route_filter_util = {
NULL, .id = "route",
"route", .parse_fopt = route_parse_opt,
route_parse_opt, .print_fopt = route_print_opt,
route_print_opt,
}; };

View File

@ -393,16 +393,14 @@ static int rsvp_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, _
return 0; return 0;
} }
struct filter_util rsvp_util = { struct filter_util rsvp_filter_util = {
NULL, .id = "rsvp",
"rsvp", .parse_fopt = rsvp_parse_opt,
rsvp_parse_opt, .print_fopt = rsvp_print_opt,
rsvp_print_opt,
}; };
struct filter_util rsvp6_util = { struct filter_util rsvp6_filter_util = {
NULL, .id = "rsvp6",
"rsvp6", .parse_fopt = rsvp_parse_opt,
rsvp_parse_opt, .print_fopt = rsvp_print_opt,
rsvp_print_opt,
}; };

View File

@ -178,9 +178,8 @@ static int tcindex_print_opt(struct filter_util *qu, FILE *f,
return 0; return 0;
} }
struct filter_util tcindex_util = { struct filter_util tcindex_filter_util = {
NULL, .id = "tcindex",
"tcindex", .parse_fopt = tcindex_parse_opt,
tcindex_parse_opt, .print_fopt = tcindex_print_opt,
tcindex_print_opt,
}; };

View File

@ -1012,9 +1012,8 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, __
return 0; return 0;
} }
struct filter_util u32_util = { struct filter_util u32_filter_util = {
NULL, .id = "u32",
"u32", .parse_fopt = u32_parse_opt,
u32_parse_opt, .print_fopt = u32_print_opt,
u32_print_opt,
}; };