This patch adds some trailing whitespace in ovs-ofctl.8.in, otherwise looks good.
Ethan On Thu, Jan 26, 2012 at 15:53, Ben Pfaff <b...@nicira.com> wrote: > These options do have an effect if the mod-flows command creates a new > flow. > > Signed-off-by: Ben Pfaff <b...@nicira.com> > --- > lib/ofp-parse.c | 4 ++-- > utilities/ovs-ofctl.8.in | 21 ++++++++++++++------- > 2 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c > index 5321364..54622f0 100644 > --- a/lib/ofp-parse.c > +++ b/lib/ofp-parse.c > @@ -518,11 +518,11 @@ parse_ofp_str(struct ofputil_flow_mod *fm, int > command, const char *str_, > break; > > case OFPFC_MODIFY: > - fields = F_ACTIONS; > + fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY; > break; > > case OFPFC_MODIFY_STRICT: > - fields = F_ACTIONS | F_PRIORITY; > + fields = F_ACTIONS | F_TIMEOUT | F_PRIORITY; > break; > > default: > diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in > index 2a20a2f..78da223 100644 > --- a/utilities/ovs-ofctl.8.in > +++ b/utilities/ovs-ofctl.8.in > @@ -972,7 +972,11 @@ The following additional field sets the priority for > flows added by > the \fBadd\-flow\fR and \fBadd\-flows\fR commands. For > \fBmod\-flows\fR and \fBdel\-flows\fR when \fB\-\-strict\fR is > specified, priority must match along with the rest of the flow > -specification. Other commands do not allow priority to be specified. > +specification. For \fBmod\-flows\fR without \fB\-\-strict\fR, > +priority is only significant if the command creates a new flow, that > +is, non-strict \fBmod\-flows\fR does not match on priority and will > +not change the priority of existing flows. Other commands do not > +allow priority to be specified. > . > .IP \fBpriority=\fIvalue\fR > The priority at which a wildcarded entry will match in comparison to > @@ -983,14 +987,17 @@ priority value of 65535. When adding a flow, if the > field is not specified, > the flow's priority will default to 32768. > . > .PP > -The \fBadd\-flow\fR and \fBadd\-flows\fR commands support additional > -optional fields: > +The \fBadd\-flow\fR, \fBadd\-flows\fR, and \fBmod\-flows\fR commands > +support the following additional options. These options affect only > +new flows. Thus, for \fBadd\-flow\fR and \fBadd\-flows\fR, these > +options are always significant, but for \fBmod\-flows\fR they are > +significant only if the command creates a new flow, that is, their > +values do not update existing flows. > . > -.TP > -\fBidle_timeout=\fIseconds\fR > +.IP "\fBidle_timeout=\fIseconds\fR" > Causes the flow to expire after the given number of seconds of > -inactivity. A value of 0 (the default) prevents a flow from expiring due > to > -inactivity. > +inactivity. A value of 0 (the default) prevents a flow from expiring > +due to inactivity. > . > .IP \fBhard_timeout=\fIseconds\fR > Causes the flow to expire after the given number of seconds, > -- > 1.7.2.5 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev >
_______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
