From: Ben Pfaff Date: Tue, 12 May 2009 17:21:43 +0000 (-0700) Subject: Remove spanning tree documentation, since STP doesn't work right now. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4abb28326abf0d50d372ee8791f87e414e4bbeb9;p=openvswitch Remove spanning tree documentation, since STP doesn't work right now. --- diff --git a/secchan/main.c b/secchan/main.c index dc046819..cd6a88b3 100644 --- a/secchan/main.c +++ b/secchan/main.c @@ -565,8 +565,6 @@ usage(void) " --snoop=METHOD allow controller snooping on METHOD\n" " (a passive OpenFlow connection method)\n" " --out-of-band controller connection is out-of-band\n" - " --stp enable 802.1D Spanning Tree Protocol\n" - " --no-stp disable 802.1D Spanning Tree Protocol\n" " --netflow=HOST:PORT configure NetFlow output target\n" "\nRate-limiting of \"packet-in\" messages to the controller:\n" " --rate-limit[=PACKETS] max rate, in packets/s (default: 1000)\n" diff --git a/secchan/secchan.8.in b/secchan/secchan.8.in index 1e8ffd82..a9e5e520 100644 --- a/secchan/secchan.8.in +++ b/secchan/secchan.8.in @@ -341,13 +341,6 @@ Configures \fBsecchan\fR to operate in in-band or out-of-band control mode (see \fBContacting the Controller\fR above). When neither option is given, the default is in-band control. -.TP -\fB--stp\fR, \fB--no-stp\fR -Enable or disable implementation of IEEE 802.1D Spanning Tree Protocol -at the switch. The default is \fB--no-stp\fR in this distribution, -because bugs in the STP implementation are still being worked out. -The default will change to \fB--stp\fR at some point in the future. - .TP \fB--netflow=\fIhost\fB:\fIport\fR Configures the given UDP \fIport\fR on the specified IP \fIhost\fR as diff --git a/vswitchd/vswitchd.8.in b/vswitchd/vswitchd.8.in index e85a7f14..2285094c 100644 --- a/vswitchd/vswitchd.8.in +++ b/vswitchd/vswitchd.8.in @@ -39,9 +39,6 @@ balancing ("SLB"). Port mirroring, with optional VLAN tagging. . .IP \(bu -802.1D Spanning Tree Protocol support. -. -.IP \(bu NetFlow v5 flow logging. . .IP \(bu diff --git a/vswitchd/vswitchd.conf.5.in b/vswitchd/vswitchd.conf.5.in index e9103c7f..dc6462f0 100644 --- a/vswitchd/vswitchd.conf.5.in +++ b/vswitchd/vswitchd.conf.5.in @@ -289,70 +289,6 @@ port.eth1.ingress.policing-rate=512 port.eth1.ingress.policing-burst=20 .fi -.SS "IEEE 802.1D-1998 Spanning Tree Support" -.PP -\fBvswitchd\fR supports IEEE 802.1D-1998 Spanning Tree Protocol (STP), -which detects and prevents loops in switch topology. By default, STP -is disabled. To turn it on for a given \fIbridge\fR, set -\fBstp.\fIbridge\fB.enabled\fR to \fBtrue\fR. -.PP -By default, \fBvswitchd\fR chooses a random bridge address each time -STP is enabled for the switch. To use a specific bridge address -(which is recommended), set \fBstp.\fIbridge\fB.address\fR to a MAC -address in the format -\fIxx\fB:\fIxx\fB:\fIxx\fB:\fIxx\fB:\fIxx\fB:\fIxx\fR, where each -\fIx\fR is a hex digit. (A common choice of bridge address is the MAC -address of one of the bridge ports.) -.PP -Bridge priority allows a network administrator to influence the -construction of the spanning tree. The default bridge priority is -32768. It may be overridden by setting -\fBstp.\fIbridge\fB.priority\fR to a number between 0 and 65535, -inclusive. Lower numbers correspond to higher priorities. -.PP -\fBvswitchd\fR does not implement IEEE 802.1D-2004 Rapid Spanning Tree -Protocol (RSTP). -.ST "STP Port Configuration" -Some STP features may be configured on a port-by-port basis. -.PP -To disable STP on an individual \fIport\fR within \fIbridge\fR, set -\fBstp.\fIbridge\fB.port.\fIport\fB.enabled\fR to \fBfalse\fR. STP is -never enabled on a port that is used as an output port for port -mirroring. -.PP -The ``path cost'' of a port reflects how expensive it is (generally, in -time) to send data out a particular port. \fBvswitchd\fR uses a cost -of 19, which is generally appropriate for 100 Mb ports, as the default -path cost for STP ports. Set -\fBstp.\fIbridge\fB.port.\fIport\fB.path-cost\fR to a number between 1 -and 65535, inclusive, to override this default. (Future versions of -\fBvswitchd\fR will choose a default path cost based on the port's -current data rate.) -.PP -Port priority allows a network administrator to influence the -construction of the spanning tree. The default port priority is 128. -It may be overridden by setting -\fBstp.\fIbridge\fB.port.\fIport\fB.priority\fR to a number between 0 and -255, inclusive. Lower numbers correspond to higher priorities. -.ST "Example" -The following syntax enables STP on bridge \fBmybr\fR that consists of -network devices \fBeth0\fR, \fBeth1\fR, and \fBeth2\fR. The bridge -address is set to 00:02:e3:0f:80:a4 and \fBeth2\fR's port priority is -set to 64: -.PP -.RS -.nf - -bridge.mybr.port=eth0 -bridge.mybr.port=eth1 -bridge.mybr.port=eth2 - -stp.mybr.enabled=true -stp.mybr.address=00:02:e3:0f:80:a4 -stp.mybr.port.eth2.priority=64 - -.fi -.RE .SS "NetFlow v5 Flow Logging" NetFlow is a protocol that exports a number of details about terminating flows, such as the principals involved and duration. A bridge may be