This patch updates usage and man pages.

This patch has not been proposed upstream because we are not yet

proposing Solaris specific requirements upstream.

diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in

index 5b0c52e..6a2b0a1 100644

--- a/utilities/ovs-ofctl.8.in

+++ b/utilities/ovs-ofctl.8.in

@@ -96,22 +96,11 @@ may be any one of the following:

 Enable or disable the interface.  This is equivalent to \fBifconfig

 up\fR or \fBifconfig down\fR on a Unix system.

 .

-.IP \fBstp\fR

-.IQ \fBno\-stp\fR

-Enable or disable 802.1D spanning tree protocol (STP) on the

-interface.  OpenFlow implementations that don't support STP will

-refuse to enable it.

-.

 .IP \fBreceive\fR

 .IQ \fBno\-receive\fR

-.IQ \fBreceive\-stp\fR

-.IQ \fBno\-receive\-stp\fR

 Enable or disable OpenFlow processing of packets received on this

 interface.  When packet processing is disabled, packets will be

-dropped instead of being processed through the OpenFlow table.  The

-\fBreceive\fR or \fBno\-receive\fR setting applies to all packets

-except 802.1D spanning tree packets, which are separately controlled

-by \fBreceive\-stp\fR or \fBno\-receive\-stp\fR.

+dropped instead of being processed through the OpenFlow table.

 .

 .IP \fBforward\fR

 .IQ \fBno\-forward\fR

@@ -669,15 +658,6 @@ When \fBdl_type\fR is wildcarded or set to a value other than 0x0800 or

 0x86dd, the value of \fBip_dscp\fR is ignored (see \fBFlow Syntax\fR

 above).

 .

-.IP \fBnw_ecn=\fIecn\fR

-.IQ \fBip_ecn=\fIecn\fR

-Matches \fIecn\fR bits in IP ToS or IPv6 traffic class fields, which is

-specified as a decimal number between 0 and 3, inclusive.

-.IP

-When \fBdl_type\fR is wildcarded or set to a value other than 0x0800 or

-0x86dd, the value of \fBnw_ecn\fR is ignored (see \fBFlow Syntax\fR

-above).

-.

 .IP \fBnw_ttl=\fIttl\fR

 Matches IP TTL or IPv6 hop limit value \fIttl\fR, which is

 specified as a decimal number between 0 and 255, inclusive.

@@ -760,48 +740,6 @@ Like the exact-match forms of \fBtp_src\fR and \fBtp_dst\fR described

 above, the bitwise match forms apply only when \fBdl_type\fR and

 \fBnw_proto\fR specify TCP or UDP or SCTP.

 .

-.IP \fBtcp_flags=\fIflags\fB/\fImask\fR

-.IQ \fBtcp_flags=\fR[\fB+\fIflag\fR...][\fB-\fIflag\fR...]

-Bitwise match on TCP flags.  The \fIflags\fR and \fImask\fR are 16-bit

-numbers written in decimal or in hexadecimal prefixed by \fB0x\fR.

-Each 1-bit in \fImask\fR requires that the corresponding bit in

-\fIflags\fR must match.  Each 0-bit in \fImask\fR causes the corresponding

-bit to be ignored.

-.IP

-Alternatively, the flags can be specified by their symbolic names

-(listed below), each preceded by either \fB+\fR for a flag that must

-be set, or \fB\-\fR for a flag that must be unset, without any other

-delimiters between the flags.  Flags not mentioned are wildcarded.

-For example, \fBtcp,tcp_flags=+syn\-ack\fR matches TCP SYNs that are

-not ACKs.

-.IP

-TCP protocol currently defines 9 flag bits, and additional 3 bits are

-reserved (must be transmitted as zero), see RFCs 793, 3168, and 3540.

-The flag bits are, numbering from the least significant bit:

-.RS

-.IP "\fB0: fin\fR"

-No more data from sender.

-.IP "\fB1: syn\fR"

-Synchronize sequence numbers.

-.IP "\fB2: rst\fR"

-Reset the connection.

-.IP "\fB3: psh\fR"

-Push function.

-.IP "\fB4: ack\fR"

-Acknowledgement field significant.

-.IP "\fB5: urg\fR"

-Urgent pointer field significant.

-.IP "\fB6: ece\fR"

-ECN Echo.

-.IP "\fB7: cwr\fR"

-Congestion Windows Reduced.

-.IP "\fB8: ns\fR"

-Nonce Sum.

-.IP "\fB9-11:\fR"

-Reserved.

-.IP "\fB12-15:\fR"

-Not matchable, must be zero.

-.RE

 .IP \fBicmp_type=\fItype\fR

 .IQ \fBicmp_code=\fIcode\fR

 When \fBdl_type\fR and \fBnw_proto\fR specify ICMP or ICMPv6, \fItype\fR

@@ -943,27 +881,6 @@ Match packets with no 802.1Q header or tagged with VLAN 0 and priority

 Some of these matching possibilities can also be achieved with

 \fBdl_vlan\fR and \fBdl_vlan_pcp\fR.

 .

-.IP \fBip_frag=\fIfrag_type\fR

-When \fBdl_type\fR specifies IP or IPv6, \fIfrag_type\fR

-specifies what kind of IP fragments or non-fragments to match.  The

-following values of \fIfrag_type\fR are supported:

-.RS

-.IP "\fBno\fR"

-Matches only non-fragmented packets.

-.IP "\fByes\fR"

-Matches all fragments.

-.IP "\fBfirst\fR"

-Matches only fragments with offset 0.

-.IP "\fBlater\fR"

-Matches only fragments with nonzero offset.

-.IP "\fBnot_later\fR"

-Matches non-fragmented packets and fragments with zero offset.

-.RE

-.IP

-The \fBip_frag\fR match type is likely to be most useful in

-\fBnx\-match\fR mode.  See the description of the \fBset\-frags\fR

-command, above, for more details.

-.

 .IP \fBarp_spa=\fIip\fR[\fB/\fInetmask\fR]

 .IQ \fBarp_tpa=\fIip\fR[\fB/\fInetmask\fR]

 When \fBdl_type\fR specifies either ARP or RARP, \fBarp_spa\fR and

@@ -989,7 +906,6 @@ When \fBdl_type\fR specifies either ARP or RARP, \fBarp_sha\fR and

 address is specified as 6 pairs of hexadecimal digits delimited by colons

 (e.g. \fB00:0A:E4:25:6B:B0\fR), with a wildcard mask following the slash.

 .

-

 .IP \fBipv6_src=\fIipv6\fR[\fB/\fInetmask\fR]

 .IQ \fBipv6_dst=\fIipv6\fR[\fB/\fInetmask\fR]

 When \fBdl_type\fR is 0x86dd (possibly via shorthand, e.g., \fBipv6\fR

@@ -1006,73 +922,6 @@ and later support arbitrary masks; earlier versions support only CIDR

 masks, that is, CIDR block and IPv6 addresses that are equivalent to

 CIDR blocks.

 .

-.IP \fBipv6_label=\fIlabel\fR

-When \fBdl_type\fR is 0x86dd (possibly via shorthand, e.g., \fBipv6\fR

-or \fBtcp6\fR), matches IPv6 flow label \fIlabel\fR.

-.

-.IP \fBnd_target=\fIipv6\fR[\fB/\fInetmask\fR]

-When \fBdl_type\fR, \fBnw_proto\fR, and \fBicmp_type\fR specify

-IPv6 Neighbor Discovery (ICMPv6 type 135 or 136), matches the target address

-\fIipv6\fR.  \fIipv6\fR is in the same format described earlier for the

-\fBipv6_src\fR and \fBipv6_dst\fR fields.

-.

-.IP \fBnd_sll=\fIxx\fB:\fIxx\fB:\fIxx\fB:\fIxx\fB:\fIxx\fB:\fIxx\fR

-When \fBdl_type\fR, \fBnw_proto\fR, and \fBicmp_type\fR specify IPv6

-Neighbor Solicitation (ICMPv6 type 135), matches the source link\-layer

-address option.  An address is specified as 6 pairs of hexadecimal

-digits delimited by colons.

-.

-.IP \fBnd_tll=\fIxx\fB:\fIxx\fB:\fIxx\fB:\fIxx\fB:\fIxx\fB:\fIxx\fR

-When \fBdl_type\fR, \fBnw_proto\fR, and \fBicmp_type\fR specify IPv6

-Neighbor Advertisement (ICMPv6 type 136), matches the target link\-layer

-address option.  An address is specified as 6 pairs of hexadecimal

-digits delimited by colons.

-.

-.IP \fBmpls_bos=\fIbos\fR

-When \fBdl_type\fR is 0x8847 or 0x8848 (possibly via shorthand e.g.,

-\fBmpls\fR or \fBmplsm\fR), matches the bottom-of-stack bit of the

-outer-most MPLS label stack entry. Valid values are 0 and 1.

-.IP

-If 1 then for a packet with a well-formed MPLS label stack the

-bottom-of-stack bit indicates that the outer label stack entry is also

-the inner-most label stack entry and thus that is that there is only one

-label stack entry present.  Conversely, if 0 then for a packet with a

-well-formed MPLS label stack the bottom-of-stack bit indicates that the

-outer label stack entry is not the inner-most label stack entry and

-thus there is more than one label stack entry present.

-.

-.IP \fBmpls_label=\fIlabel\fR

-When \fBdl_type\fR is 0x8847 or 0x8848 (possibly via shorthand e.g.,

-\fBmpls\fR or \fBmplsm\fR), matches the label of the outer

-MPLS label stack entry. The label is a 20-bit value that is decimal by default;

-use a \fB0x\fR prefix to specify them in hexadecimal.

-.

-.IP \fBmpls_tc=\fItc\fR

-When \fBdl_type\fR is 0x8847 or 0x8848 (possibly via shorthand e.g.,

-\fBmpls\fR or \fBmplsm\fR), matches the traffic-class of the outer

-MPLS label stack entry. Valid values are between 0 (lowest) and 7 (highest).

-.

-.IP \fBtun_id=\fItunnel-id\fR[\fB/\fImask\fR]

-.IQ \fBtunnel_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 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 \fBtun_src=\fIip\fR[\fB/\fInetmask\fR]

-.IQ \fBtun_dst=\fIip\fR[\fB/\fInetmask\fR]

-Matches tunnel IPv4 source (or destination) address \fIip\fR. Only packets

-that arrive over a tunnel will have nonzero tunnel addresses.

-The address may be specified as an IP address or host name

-(e.g. \fB192.168.1.1\fR or \fBwww.example.com\fR).  The optional

-\fInetmask\fR allows restricting a match to a masked IPv4 address.

-The netmask may be specified as a dotted quad

-(e.g. \fB192.168.1.0/255.255.255.0\fR) or as a CIDR block

-(e.g. \fB192.168.1.0/24\fR).

-.

 .IP "\fBreg\fIidx\fB=\fIvalue\fR[\fB/\fImask\fR]"

 Matches \fIvalue\fR either exactly or with optional \fImask\fR in

 register number \fIidx\fR.  The valid range of \fIidx\fR depends on

@@ -1085,13 +934,6 @@ exactly, and a 0-bit wildcards that bit.

 When a packet enters an OpenFlow switch, all of the registers are set

 to 0.  Only explicit Nicira extension actions change register values.

 .

-.IP \fBpkt_mark=\fIvalue\fR[\fB/\fImask\fR]

-Matches packet metadata mark \fIvalue\fR either exactly or with optional

-\fImask\fR. The mark is associated data that may be passed into other

-system components in order to facilitate interaction between subsystems.

-On Linux this corresponds to the skb mark but the exact implementation is

-platform-dependent.

-.

 .PP

 Defining IPv6 flows (those with \fBdl_type\fR equal to 0x86dd) requires

 support for NXM.  The following shorthand notations are available for

@@ -1212,12 +1054,6 @@ as necessary to match the value specified.  If the VLAN tag is added,

 a priority of zero is used (see the \fBmod_vlan_pcp\fR action to set

 this).

 .

-.IP \fBmod_vlan_pcp\fR:\fIvlan_pcp\fR

-Modifies the VLAN priority on a packet.  The VLAN tag is added or modified 

-as necessary to match the value specified.  Valid values are between 0

-(lowest) and 7 (highest).  If the VLAN tag is added, a vid of zero is used 

-(see the \fBmod_vlan_vid\fR action to set this).

-.

 .IP \fBstrip_vlan\fR

 Strips the VLAN tag from a packet if it is present.

 .

@@ -1227,31 +1063,6 @@ for the tag. Only ethertype 0x8100 should be used. (0x88a8 which the spec

 allows isn't supported at the moment.)

 A priority of zero and the tag of zero are used for the new tag.

 .

-.IP \fBpush_mpls\fR:\fIethertype\fR

-Changes the packet's Ethertype to \fIethertype\fR, which must be either

-\fB0x8847\fR or \fB0x8848\fR, and pushes an MPLS LSE.

-.IP

-If the packet does not already contain any MPLS labels then an initial

-label stack entry is pushed.  The label stack entry's label is 2 if the

-packet contains IPv6 and 0 otherwise, its default traffic control value is

-the low 3 bits of the packet's DSCP value (0 if the packet is not IP), and

-its TTL is copied from the IP TTL (64 if the packet is not IP).

-.IP

-If the packet does already contain an MPLS label, pushes a new

-outermost label as a copy of the existing outermost label.

-.IP

-A limitation of the implementation is that processing of actions will stop

-if \fBpush_mpls\fR follows another \fBpush_mpls\fR unless there is a

-\fBpop_mpls\fR in between.

-.

-.IP \fBpop_mpls\fR:\fIethertype\fR

-Strips the outermost MPLS label stack entry.

-Currently the implementation restricts \fIethertype\fR to a non-MPLS Ethertype

-and thus \fBpop_mpls\fR should only be applied to packets with

-an MPLS label stack depth of one. A further limitation is that processing of

-actions will stop if \fBpop_mpls\fR follows another \fBpop_mpls\fR unless

-there is a \fBpush_mpls\fR in between.

-.

 .IP \fBmod_dl_src\fB:\fImac\fR

 Sets the source Ethernet address to \fImac\fR.

 .

@@ -1275,13 +1086,6 @@ Sets the DSCP bits in the IPv4 ToS/DSCP or IPv6 traffic class field to

 \fItos\fR, which must be a multiple of 4 between 0 and 255.  This action

 does not modify the two least significant bits of the ToS field (the ECN bits).

 .

-.IP \fBmod_nw_ecn\fB:\fIecn\fR

-Sets the ECN bits in the IPv4 ToS or IPv6 traffic class field to \fIecn\fR,

-which must be a value between 0 and 3, inclusive.  This action does not modify

-the six most significant bits of the field (the DSCP bits).

-.IP

-Requires OpenFlow 1.1 or later.

-.

 .IP \fBmod_nw_ttl\fB:\fIttl\fR

 Sets the IPv4 TTL or IPv6 hop limit field to \fIttl\fR, which is specified as

 a decimal number between 0 and 255, inclusive.  Switch behavior when setting

@@ -1325,45 +1129,6 @@ OpenFlow implementations do not support queuing at all.

 Restores the queue to the value it was before any \fBset_queue\fR

 actions were applied.

 .

-.IP \fBdec_ttl\fR

-.IQ \fBdec_ttl\fB[\fR(\fIid1,id2\fI)\fR]\fR

-Decrement TTL of IPv4 packet or hop limit of IPv6 packet.  If the

-TTL or hop limit is initially zero or decrementing would make it so, no

-decrement occurs, as packets reaching TTL zero must be rejected.  Instead,

-a ``packet-in'' message with reason code \fBOFPR_INVALID_TTL\fR is

-sent to each connected controller that has enabled receiving them,

-if any.  Processing the current set of actions then stops.  However,

-if the current set of actions was reached through ``resubmit'' then

-remaining actions in outer levels resume processing.  This action

-also optionally supports the ability to specify a list of valid

-controller ids.  Each of controllers in the list will receive the

-``packet_in'' message only if they have registered to receive the

-invalid ttl packets.  If controller ids are not specified, the

-``packet_in'' message will be sent only to the controllers having

-controller id zero which have registered for the invalid ttl packets.

-.

-.IP \fBset_mpls_label\fR:\fIlabel\fR

-Set the label of the outer MPLS label stack entry of a packet.

-\fIlabel\fR should be a 20-bit value that is decimal by default;

-use a \fB0x\fR prefix to specify them in hexadecimal.

-.

-.IP \fBset_mpls_tc\fR:\fItc\fR

-Set the traffic-class of the outer MPLS label stack entry of a packet.

-\fItc\fR should be a in the range 0 to 7 inclusive.

-.

-.IP \fBset_mpls_ttl\fR:\fIttl\fR

-Set the TTL of the outer MPLS label stack entry of a packet.

-\fIttl\fR should be in the range 0 to 255 inclusive.

-.

-.IP \fBdec_mpls_ttl\fR

-Decrement TTL of the outer MPLS label stack entry of a packet.  If the TTL

-is initially zero or decrementing would make it so, no decrement occurs.

-Instead, a ``packet-in'' message with reason code \fBOFPR_INVALID_TTL\fR

-is sent to the main controller (id zero), if it has enabled receiving them.

-Processing the current set of actions then stops.  However, if the current

-set of actions was reached through ``resubmit'' then remaining actions in

-outer levels resume processing.

-.

 .IP \fBnote:\fR[\fIhh\fR]...

 Does nothing at all.  Any number of bytes represented as hex digits

 \fIhh\fR may be included.  Pairs of hex digits may be separated by

@@ -1373,22 +1138,6 @@ payload, so the provided bytes will be padded on the right by enough

 bytes with value 0 to make the total number 6 more than a multiple of

 8.

 .

-.IP "\fBmove:\fIsrc\fB[\fIstart\fB..\fIend\fB]\->\fIdst\fB[\fIstart\fB..\fIend\fB]\fR"

-Copies the named bits from field \fIsrc\fR to field \fIdst\fR.

-\fIsrc\fR and \fIdst\fR must be NXM field names as defined in

-\fBnicira\-ext.h\fR, e.g. \fBNXM_OF_UDP_SRC\fR or \fBNXM_NX_REG0\fR.

-Each \fIstart\fR and \fIend\fR pair, which are inclusive, must specify

-the same number of bits and must fit within its respective field.

-Shorthands for \fB[\fIstart\fB..\fIend\fB]\fR exist: use

-\fB[\fIbit\fB]\fR to specify a single bit or \fB[]\fR to specify an

-entire field.

-.IP

-Examples: \fBmove:NXM_NX_REG0[0..5]\->NXM_NX_REG1[26..31]\fR copies the

-six bits numbered 0 through 5, inclusive, in register 0 into bits 26

-through 31, inclusive;

-\fBmove:NXM_NX_REG0[0..15]\->NXM_OF_VLAN_TCI[]\fR copies the least

-significant 16 bits of register 0 into the VLAN TCI field.

-.

 .IP "\fBload:\fIvalue\fB\->\fIdst\fB[\fIstart\fB..\fIend\fB]"

 Writes \fIvalue\fR to bits \fIstart\fR through \fIend\fR, inclusive,

 in field \fIdst\fR.

@@ -1396,23 +1145,6 @@ in field \fIdst\fR.

 Example: \fBload:55\->NXM_NX_REG2[0..5]\fR loads value 55 (bit pattern

 \fB110111\fR) into bits 0 through 5, inclusive, in register 2.

 .

-.IP "\fBpush:\fIsrc\fB[\fIstart\fB..\fIend\fB]"

-Pushes \fIstart\fR to \fIend\fR bits inclusive, in fields

-on top of the stack.

-.IP

-Example: \fBpush:NXM_NX_REG2[0..5]\fR push the value stored in register

-2 bits 0 through 5, inclusive, on to the internal stack.

-.

-.IP "\fBpop:\fIdst\fB[\fIstart\fB..\fIend\fB]"

-Pops from the top of the stack, retrieves the \fIstart\fR to \fIend\fR bits

-inclusive, from the value popped and store them into the corresponding

-bits in \fIdst\fR.

-.

-.IP

-Example: \fBpop:NXM_NX_REG2[0..5]\fR pops the value from top of the stack.

-Set register 2 bits 0 through 5, inclusive, based on bits 0 through 5 from the

-value just popped.

-.

 .IP "\fBset_field:\fIvalue\fB\->\fIdst"

 Writes the literal \fIvalue\fR into the field \fIdst\fR, which should

 be specified as a name used for matching.  (This is similar to

@@ -1422,50 +1154,6 @@ OpenFlow 1.2 and above.)

 .IP

 Example: \fBset_field:00:11:22:33:44:55->eth_src\fR.

 .

-.IP "\fBmultipath(\fIfields\fB, \fIbasis\fB, \fIalgorithm\fB, \fIn_links\fB, \fIarg\fB, \fIdst\fB[\fIstart\fB..\fIend\fB])\fR"

-Hashes \fIfields\fR using \fIbasis\fR as a universal hash parameter,

-then the applies multipath link selection \fIalgorithm\fR (with

-parameter \fIarg\fR) to choose one of \fIn_links\fR output links

-numbered 0 through \fIn_links\fR minus 1, and stores the link into

-\fIdst\fB[\fIstart\fB..\fIend\fB]\fR, which must be an NXM field as

-described above.

-.IP

-Currently, \fIfields\fR must be either \fBeth_src\fR or

-\fBsymmetric_l4\fR and \fIalgorithm\fR must be one of \fBmodulo_n\fR,

-\fBhash_threshold\fR, \fBhrw\fR, and \fBiter_hash\fR.  Only

-the \fBiter_hash\fR algorithm uses \fIarg\fR.

-.IP

-Refer to \fBnicira\-ext.h\fR for more details.

-.

-.IP "\fBbundle(\fIfields\fB, \fIbasis\fB, \fIalgorithm\fB, \fIslave_type\fB, slaves:[\fIs1\fB, \fIs2\fB, ...])\fR"

-Hashes \fIfields\fR using \fIbasis\fR as a universal hash parameter, then

-applies the bundle link selection \fIalgorithm\fR to choose one of the listed

-slaves represented as \fIslave_type\fR.  Currently the only supported

-\fIslave_type\fR is \fBofport\fR.  Thus, each \fIs1\fR through \fIsN\fR should

-be an OpenFlow port number. Outputs to the selected slave.

-.IP

-Currently, \fIfields\fR must be either \fBeth_src\fR or \fBsymmetric_l4\fR and

-\fIalgorithm\fR must be one of \fBhrw\fR and \fBactive_backup\fR.

-.IP

-Example: \fBbundle(eth_src,0,hrw,ofport,slaves:4,8)\fR uses an Ethernet source

-hash with basis 0, to select between OpenFlow ports 4 and 8 using the Highest

-Random Weight algorithm.

-.IP

-Refer to \fBnicira\-ext.h\fR for more details.

-.

-.IP "\fBbundle_load(\fIfields\fB, \fIbasis\fB, \fIalgorithm\fB, \fIslave_type\fB, \fIdst\fB[\fIstart\fB..\fIend\fB], slaves:[\fIs1\fB, \fIs2\fB, ...])\fR"

-Has the same behavior as the \fBbundle\fR action, with one exception.  Instead

-of outputting to the selected slave, it writes its selection to

-\fIdst\fB[\fIstart\fB..\fIend\fB]\fR, which must be an NXM field as described

-above.

-.IP

-Example: \fBbundle_load(eth_src, 0, hrw, ofport, NXM_NX_REG0[],

-slaves:4, 8)\fR uses an Ethernet source hash with basis 0, to select

-between OpenFlow ports 4 and 8 using the Highest Random Weight

-algorithm, and writes the selection to \fBNXM_NX_REG0[]\fR.

-.IP

-Refer to \fBnicira\-ext.h\fR for more details.

-.

 .IP "\fBlearn(\fIargument\fR[\fB,\fIargument\fR]...\fB)\fR"

 This action adds or modifies a flow in an OpenFlow table, similar to

 \fBovs\-ofctl \-\-strict mod\-flows\fR.  The arguments specify the

@@ -1559,21 +1247,11 @@ the action set, the one written later replaces the earlier action:

 .RS

 .IP 1.

 \fBstrip_vlan\fR

-.IQ

-\fBpop_mpls\fR

 .

 .IP 2.

-\fBpush_mpls\fR

-.

-.IP 3.

 \fBpush_vlan\fR

 .

-.IP 4.

-\fBdec_ttl\fR

-.IQ

-\fBdec_mpls_ttl\fR

-.

-.IP 5.

+.IP 3.

 \fBload\fR

 .IQ

 \fBmod_dl_dst\fR

@@ -1586,8 +1264,6 @@ the action set, the one written later replaces the earlier action:

 .IQ

 \fBmod_nw_tos\fR

 .IQ

-\fBmod_nw_ecn\fR

-.IQ

 \fBmod_nw_ttl\fR

 .IQ

 \fBmod_tp_dst\fR

@@ -1610,10 +1286,10 @@ part of a field, the later modification takes effect, and when they

 modify different parts of a field (or different fields), then both

 modifications are applied.

 .

-.IP 6.

+.IP 4.

 \fBset_queue\fR

 .

-.IP 7.

+.IP 5.

 \fBgroup\fR

 .IQ

 \fBoutput\fR

@@ -1627,14 +1303,6 @@ anywhere and thus the modifications are not visible.)

 .IP

 Only the actions listed above may be written to the action set.

 .

-.IP \fBwrite_metadata\fB:\fIvalue\fR[/\fImask\fR]

-Updates the metadata field for the flow. If \fImask\fR is omitted, the

-metadata field is set exactly to \fIvalue\fR; if \fImask\fR is specified, then

-a 1-bit in \fImask\fR indicates that the corresponding bit in the metadata

-field will be replaced with the corresponding bit from \fIvalue\fR. Both

-\fIvalue\fR and \fImask\fR are 64-bit values that are decimal by default; use

-a \fB0x\fR prefix to specify them in hexadecimal.

-.

 .IP \fBmeter\fR:\fImeter_id\fR

 Apply the \fImeter_id\fR before any other actions. If a meter band rate is

 exceeded, the packet may be dropped, or modified, depending on the meter

@@ -1644,94 +1312,6 @@ for more details.

 .IP \fBgoto_table\fR:\fItable\fR

 Indicates the next table in the process pipeline.

 .

-.IP "\fBfin_timeout(\fIargument\fR[\fB,\fIargument\fR]\fB)"

-This action changes the idle timeout or hard timeout, or both, of this

-OpenFlow rule when the rule matches a TCP packet with the FIN or RST

-flag.  When such a packet is observed, the action reduces the rule's

-timeouts to those specified on the action.  If the rule's existing

-timeout is already shorter than the one that the action specifies,

-then that timeout is unaffected.

-.IP

-\fIargument\fR takes the following forms:

-.RS

-.IP "\fBidle_timeout=\fIseconds\fR"

-Causes the flow to expire after the given number of seconds of

-inactivity.

-.

-.IP "\fBhard_timeout=\fIseconds\fR"

-Causes the flow to expire after the given number of seconds,

-regardless of activity.  (\fIseconds\fR specifies time since the

-flow's creation, not since the receipt of the FIN or RST.)

-.RE

-.IP

-This action was added in Open vSwitch 1.5.90.

-.

-.IP "\fBsample(\fIargument\fR[\fB,\fIargument\fR]...\fB)\fR"

-Samples packets and sends one sample for every sampled packet.

-.IP

-\fIargument\fR takes the following forms:

-.RS

-.IP "\fBprobability=\fIpackets\fR"

-The number of sampled packets out of 65535.  Must be greater or equal to 1.

-.IP "\fBcollector_set_id=\fIid\fR"

-The unsigned 32-bit integer identifier of the set of sample collectors

-to send sampled packets to.  Defaults to 0.

-.IP "\fBobs_domain_id=\fIid\fR"

-When sending samples to IPFIX collectors, the unsigned 32-bit integer

-Observation Domain ID sent in every IPFIX flow record.  Defaults to 0.

-.IP "\fBobs_point_id=\fIid\fR"

-When sending samples to IPFIX collectors, the unsigned 32-bit integer

-Observation Point ID sent in every IPFIX flow record.  Defaults to 0.

-.RE

-.IP