From bcb9094323c83c2f070277c30a1390f7afb70c46 Mon Sep 17 00:00:00 2001 From: Simon Horman <horms@verge.net.au> Date: Mon, 13 Feb 2012 12:31:43 +0900 Subject: [PATCH] ovs-ofctl: Clarify that tun_id will not be nonzero unless the key is nonzero The Open vSwtich datapath's GRE implementation does not appear to make a distinction between no key present and a zero key present, which appears to be consistent with the (other) Linux implementation of GRE. Make this a little clearer in the documentation. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Jesse Gross <jesse@nicira.com> --- utilities/ovs-ofctl.8.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index 1e85bc510..455298e3e 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -675,11 +675,11 @@ digits delimited by colons. .IP \fBtun_id=\fItunnel-id\fR[\fB/\fImask\fR] Matches tunnel identifier \fItunnel-id\fR. Only packets that arrive over a tunnel that carries a key (e.g. GRE with the RFC 2890 key -extension) will have a nonzero tunnel ID. If \fImask\fR is omitted, -\fItunnel-id\fR is the exact tunnel ID to match; if \fImask\fR is -specified, then a 1-bit in \fImask\fR indicates that the corresponding -bit in \fItunnel-id\fR must match exactly, and a 0-bit wildcards that -bit. +extension and a nonzero key value) will have a nonzero tunnel ID. +If \fImask\fR is omitted, \fItunnel-id\fR is the exact tunnel ID to match; +if \fImask\fR is specified, then a 1-bit in \fImask\fR indicates that the +corresponding bit in \fItunnel-id\fR must match exactly, and a 0-bit +wildcards that bit. . .IP "\fBreg\fIidx\fB=\fIvalue\fR[\fB/\fImask\fR]" Matches \fIvalue\fR either exactly or with optional \fImask\fR in -- 2.47.0