diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2011-07-03 23:59:44 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2011-07-03 23:59:44 +0000 |
| commit | 83041e559f3063321d066902536d1e73bd778e23 (patch) | |
| tree | fd97bcf1416283867ec63dc5b1340b51379b69e5 /sbin/pfctl | |
| parent | 69c6e3e717bc952ed47f81420147377d3ee74a7d (diff) | |
g/c RIO traces (aka clean up after tedu :))
Diffstat (limited to 'sbin/pfctl')
| -rw-r--r-- | sbin/pfctl/parse.y | 8 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_altq.c | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 9fac047d119..814f64514f9 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.600 2011/07/03 23:37:55 zinke Exp $ */ +/* $OpenBSD: parse.y,v 1.601 2011/07/03 23:59:43 henning Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -1514,8 +1514,6 @@ cbqflags_item : STRING { $$ = CBQCLF_RED; else if (!strcmp($1, "ecn")) $$ = CBQCLF_RED|CBQCLF_ECN; - else if (!strcmp($1, "rio")) - $$ = CBQCLF_RIO; else { yyerror("unknown cbq flag \"%s\"", $1); free($1); @@ -1536,8 +1534,6 @@ priqflags_item : STRING { $$ = PRCF_RED; else if (!strcmp($1, "ecn")) $$ = PRCF_RED|PRCF_ECN; - else if (!strcmp($1, "rio")) - $$ = PRCF_RIO; else { yyerror("unknown priq flag \"%s\"", $1); free($1); @@ -1636,8 +1632,6 @@ hfscopts_item : LINKSHARE bandwidth { hfsc_opts.flags |= HFCF_RED; else if (!strcmp($1, "ecn")) hfsc_opts.flags |= HFCF_RED|HFCF_ECN; - else if (!strcmp($1, "rio")) - hfsc_opts.flags |= HFCF_RIO; else { yyerror("unknown hfsc flag \"%s\"", $1); free($1); diff --git a/sbin/pfctl/pfctl_altq.c b/sbin/pfctl/pfctl_altq.c index a7cb695604e..b8a0b42a2ee 100644 --- a/sbin/pfctl/pfctl_altq.c +++ b/sbin/pfctl/pfctl_altq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_altq.c,v 1.95 2011/07/03 23:46:23 henning Exp $ */ +/* $OpenBSD: pfctl_altq.c,v 1.96 2011/07/03 23:59:43 henning Exp $ */ /* * Copyright (c) 2002 @@ -546,8 +546,6 @@ print_cbq_opts(const struct pf_altq *a) printf(" red"); if (opts->flags & CBQCLF_ECN) printf(" ecn"); - if (opts->flags & CBQCLF_RIO) - printf(" rio"); if (opts->flags & CBQCLF_FLOWVALVE) printf(" flowvalve"); if (opts->flags & CBQCLF_BORROW) @@ -631,8 +629,6 @@ print_priq_opts(const struct pf_altq *a) printf(" red"); if (opts->flags & PRCF_ECN) printf(" ecn"); - if (opts->flags & PRCF_RIO) - printf(" rio"); if (opts->flags & PRCF_DEFAULTCLASS) printf(" default"); printf(" ) "); @@ -845,8 +841,6 @@ print_hfsc_opts(const struct pf_altq *a, const struct node_queue_opt *qopts) printf(" red"); if (opts->flags & HFCF_ECN) printf(" ecn"); - if (opts->flags & HFCF_RIO) - printf(" rio"); if (opts->flags & HFCF_DEFAULTCLASS) printf(" default"); if (opts->rtsc_m2 != 0) |