rstp: Add 'rstp-admin-p2p-mac' and 'rstp-admin-port-state' setters.

'rstp-admin-port-state' is the Administrative Bridge Port state
variable defined in the 802.1D-2004 standard.  It can be set to
include or exclude a port from the active topology by management
(section 7.4).

operPointToPointMAC and 'rstp-admin-p2p-mac' are a pair of parameters
that permit inspection of, and control over, the administrative and
operational state of the point-to-point status of the MAC entity by
the MAC Relay Entity.  adminPointToPointMAC can be set by management
and its value is reflected on operPointToPointMAC.

Signed-off-by: Daniele Venturino <daniele.venturino@m3s.it>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>

1 files changed, 16 insertions, 5 deletions

diff --git a/utilities/ovs-vsctl.8.in b/utilities/ovs-vsctl.8.in
index 8cf13ae3b..ddb841028 100644
--- a/utilities/ovs-vsctl.8.in
+++ b/utilities/ovs-vsctl.8.in
@@ -987,8 +987,8 @@ Set the multicast snooping table size \fBbr0\fR to 2048 entries:
 .B "ovs\-vsctl set Bridge br0 other_config:mcast-snooping-table-size=2048"
 .PP
 Disable flooding of unregistered multicast packets to all ports. When
-set to true, the switch will send unregistered multicast packets only
-to ports connected to multicast routers. When it is set to false, the
+set to \fBtrue\fR, the switch will send unregistered multicast packets only
+to ports connected to multicast routers. When it is set to \fBfalse\fR, the
 switch will send them to all ports. This command disables the flood of
 unregistered packets on bridge \fBbr0\fR.
 .IP
@@ -1043,15 +1043,15 @@ Set the bridge transmit hold count of \fBbr0\fR to 7 s. This value should be bet
 .IP
 .B "ovs\-vsctl set Bridge br0 other_config:rstp-transmit-hold-count=7"
 .PP
-Enable RSTP on the Port \fBeth0\fR.
+Enable RSTP on the Port \fBeth0\fR:
 .IP
 .B "ovs\-vsctl set Port eth0 other_config:rstp-enable=true"
 .PP
-Disable RSTP on the Port \fBeth0\fR.
+Disable RSTP on the Port \fBeth0\fR:
 .IP
 .B "ovs\-vsctl set Port eth0 other_config:rstp-enable=false"
 .PP
-Set the priority of port \fBeth0\fR to 20. The value must be specified in
+Set the priority of port \fBeth0\fR to 32. The value must be specified in
 decimal notation and should be a multiple of 16 (if not, it is rounded down to the
 nearest multiple of 16). The default priority value is 0x80 (128).
 .IP
@@ -1073,6 +1073,17 @@ Set the auto edge value of port \fBeth0\fR:
 .IP
 .B "ovs\-vsctl set Port eth0 other_config:rstp-port-auto-edge=true"
 .PP
+Set the admin point to point mac value of port \fBeth0\fR.  Acceptable
+values are 0 (force \fBfalse\fR), 1 (force \fBtrue\fR, the default value) or
+2 (\fBauto\fR).
+.IP
+.B "ovs\-vsctl set Port eth0 other_config:rstp-admin-p2p-mac=1"
+.PP
+Set the admin port state value of port \fBeth0\fR.  \fBtrue\fR is the
+default value.
+.IP
+.B "ovs\-vsctl set Port eth0 other_config:rstp-admin-port-state=false"
+.PP
 Set the mcheck value of port \fBeth0\fR:
 .IP
 .B "ovs\-vsctl set Port eth0 other_config:rstp-port-mcheck=true"