As Jamal suggested, BRANCH is the wrong name, as these keywords go
beyond simple branch control - e.g. loops are possible, too. Therefore
rename the non-terminal to CONTROL instead which should be more
appropriate.
Signed-off-by: Phil Sutter <p...@nwl.cc>
---
man/man8/tc-connmark.8 | 6 +++---
man/man8/tc-pedit.8 | 6 +++---
tc/m_connmark.c | 4 ++--
tc/m_pedit.c | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/man/man8/tc-connmark.8 b/man/man8/tc-connmark.8
index bb4cf7543dfdb..44f29f508d673 100644
--- a/man/man8/tc-connmark.8
+++ b/man/man8/tc-connmark.8
@@ -6,12 +6,12 @@ connmark - netfilter connmark retriever action
.in +8
.ti -8
.BR tc " ... " "action connmark " [ " zone"
-.IR u16_zone_index " ] [ " BRANCH " ] ["
+.IR u16_zone_index " ] [ " CONTROL " ] ["
.BI index " u32_index "
]
.ti -8
-.IR BRANCH " := { " reclassify " | " pipe " | " drop " | " continue " | " ok "
}"
+.IR CONTROL " := { " reclassify " | " pipe " | " drop " | " continue " | " ok
" }"
.SH DESCRIPTION
The connmark action is used to restore the connection's mark value into the
packet's fwmark.
@@ -22,7 +22,7 @@ Specify the conntrack zone when doing conntrack lookups for
packets.
.I u16_zone_index
is a 16bit unsigned decimal value.
.TP
-.I BRANCH
+.I CONTROL
How to continue after executing this action.
.RS
.TP
diff --git a/man/man8/tc-pedit.8 b/man/man8/tc-pedit.8
index c30927ec50954..c34520c046a6c 100644
--- a/man/man8/tc-pedit.8
+++ b/man/man8/tc-pedit.8
@@ -6,7 +6,7 @@ pedit - generic packet editor action
.in +8
.ti -8
.BR tc " ... " "action pedit munge " {
-.IR RAW_OP " | " LAYERED_OP " } [ " BRANCH " ]"
+.IR RAW_OP " | " LAYERED_OP " } [ " CONTROL " ]"
.ti -8
.IR RAW_OP " := "
@@ -45,7 +45,7 @@ pedit - generic packet editor action
.IR RVAL " ]"
.ti -8
-.IR BRANCH " := {"
+.IR CONTROL " := {"
.BR reclassify " | " pipe " | " drop " | " shot " | " continue " | " pass " }"
.SH DESCRIPTION
The
@@ -165,7 +165,7 @@ This optional extra part of
.I CMD_SPEC
allows to exclude bits from being changed.
.TP
-.I BRANCH
+.I CONTROL
The following keywords allow to control how the tree of qdisc, classes,
filters and actions is further traversed after this action.
.RS
diff --git a/tc/m_connmark.c b/tc/m_connmark.c
index 6974c9ba6d16b..405be8341afb1 100644
--- a/tc/m_connmark.c
+++ b/tc/m_connmark.c
@@ -27,10 +27,10 @@
static void
explain(void)
{
- fprintf(stderr, "Usage: ... connmark [zone ZONE] [BRANCH] [index
<INDEX>]\n");
+ fprintf(stderr, "Usage: ... connmark [zone ZONE] [CONTROL] [index
<INDEX>]\n");
fprintf(stderr, "where :\n"
"\tZONE is the conntrack zone\n"
- "\tBRANCH := reclassify|pipe|drop|continue|ok\n");
+ "\tCONTROL := reclassify|pipe|drop|continue|ok\n");
}
static void
diff --git a/tc/m_pedit.c b/tc/m_pedit.c
index a7960d524c29a..390663f130d72 100644
--- a/tc/m_pedit.c
+++ b/tc/m_pedit.c
@@ -35,7 +35,7 @@ static int pedit_debug;
static void
explain(void)
{
- fprintf(stderr, "Usage: ... pedit munge <MUNGE> [<BRANCH>]\n");
+ fprintf(stderr, "Usage: ... pedit munge <MUNGE> [CONTROL]\n");
fprintf(stderr,
"Where: MUNGE := <RAW>|<LAYERED>\n"
"\t<RAW>:= <OFFSETC>[ATC]<CMD>\n "
@@ -47,7 +47,7 @@ explain(void)
"\t\tCMD:= clear | invert | set <setval>| retain\n "
"\t<LAYERED>:= ip <ipdata> | ip6 <ip6data> \n "
" \t\t| udp <udpdata> | tcp <tcpdata> | icmp <icmpdata> \n"
- "\t<BRANCH>:= reclassify | pipe | drop | continue | pass\n"
+ "\tCONTROL:= reclassify | pipe | drop | continue | pass\n"
"For Example usage look at the examples directory\n");
}
--
2.7.2
