X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fvswitch.xml;h=0bc4ccdc86a6c4e56f59f12b35712596e1ea2c61;hb=59af549f66c770a9c76a4f00d10abf5dd2009f6e;hp=32d4c595b20c1a412358df72685005d5392aea8d;hpb=c93f9a78c349dee759524861a6e80694675283fc;p=sliver-openvswitch.git diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 32d4c595b..0bc4ccdc8 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -569,21 +569,13 @@
01:80:c2:00:00:0x
Other reserved protocols.
-
00:00:5e:00:01:xx
-
VRRP IPv4 virtual router MAC address.
+
00:e0:2b:00:00:00
+
Extreme Discovery Protocol (EDP).
-
00:00:5e:00:02:xx
-
VRRP IPv6 virtual router MAC address.
- -
00:00:0c:07:ac:xx
-
HSRP Version 1.
- -
00:00:0c:9f:fx:xx -
-
HSRP Version 2.
- -
00:07:b4:xx:xx:xx
-
GLBP.
+
+ 00:e0:2b:00:00:04 and 00:e0:2b:00:00:06 +
+
Ethernet Automatic Protection Switching (EAPS).
01:00:0c:cc:cc:cc
@@ -600,6 +592,9 @@
01:00:0c:00:00:00
Cisco Inter Switch Link.
+ +
01:00:0c:cc:cc:cx
+
Cisco CFM.
@@ -807,8 +802,13 @@

A port that has more than one interface is a ``bonded port.'' Bonding - allows for load balancing and fail-over. Some kinds of bonding will - work with any kind of upstream switch:

+ allows for load balancing and fail-over.

+ +

+ The following types of bonding will work with any kind of upstream + switch. On the upstream switch, do not configure the interfaces as a + bond: +

balance-slb
@@ -820,7 +820,8 @@
active-backup
Assigns all flows to one slave, failing over to a backup slave when - the active slave is disabled. + the active slave is disabled. This is the only bonding mode in which + interfaces may be plugged into different upstream switches.
@@ -839,6 +840,7 @@
stable
+

Deprecated and slated for removal in February 2013.

Attempts to always assign a given flow to the same slave consistently. In an effort to maintain stability, no load balancing is done. Uses a similar hashing strategy to @@ -895,7 +897,7 @@

- The number of milliseconds for which carrier must stay up on an + The number of milliseconds for which the link must stay up on an interface before the interface is considered to be up. Specify 0 to enable the interface immediately.

@@ -908,7 +910,7 @@ - The number of milliseconds for which carrier must stay down on an + The number of milliseconds for which the link must stay down on an interface before the interface is considered to be down. Specify 0 to disable the interface immediately. @@ -961,12 +963,10 @@ - +

These settings control behavior when a bond is in - balance-slb mode, regardless of whether the bond was - intentionally configured in SLB mode or it fell back to SLB mode - because LACP negotiation failed. + balance-slb or balance-tcp mode.

@@ -1199,6 +1199,21 @@ IPsec tunnel.
+
gre64
+
+ It is same as GRE, but it allows 64 bit key. To store higher 32-bits + of key, it uses GRE protocol sequence number field. This is non + standard use of GRE protocol since OVS does not increment + sequence number for every packet at time of encap as expected by + standard GRE implementation. See + for information on configuring GRE tunnels. +
+ +
ipsec_gre64
+
+ Same as IPSEC_GRE except 64 bit key. +
+
capwap
An Ethernet tunnel over the UDP transport portion of CAPWAP (RFC @@ -1215,7 +1230,8 @@
null
-
An ignored interface.
+
An ignored interface. Deprecated and slated for removal in + February 2013.
 @@ -1223,7 +1239,8 @@

These options apply to interfaces with of - gre, ipsec_gre, and capwap. + gre, ipsec_gre, gre64, + ipsec_gre64, and capwap.

@@ -1349,7 +1366,7 @@ of the tunnel headers. Note that this option causes behavior that is typically reserved for routers and therefore is not entirely in compliance with the IEEE 802.1D specification for bridges. Default is - enabled; set to false to disable. + disabled; set to true to enable. @@ -1701,6 +1718,12 @@ faulted otherwise.

+

+ When operating over tunnels which have no in_key, or an + in_key of flow. CFM will only accept CCMs + with a tunnel key of zero. +

+ A Maintenance Point ID (MPID) uniquely identifies each endpoint within a Maintenance Association. The MPID is used to identify this endpoint @@ -1769,9 +1792,11 @@ frame having an invalid interval. - - Indicates a CFM fault was triggered because the CFM module received - a CCM frame with a sequence number that it was not expecting. + +

When in extended mode, indicates the operational state of the + remote endpoint as either up or down. See + . +

@@ -1854,7 +1879,7 @@ When set, the CFM module will apply a VLAN tag to all CCMs it generates - with the given PCP value. The VLAN ID of the tag is governed by the + with the given PCP value, the VLAN ID of the tag is governed by the value of . If is unset, a VLAN ID of zero is used. @@ -2129,7 +2154,7 @@

The eviction process only considers flows that have an idle timeout or a hard timeout. That is, eviction never deletes permanent flows. - (Permanent flows do count against . + (Permanent flows do count against .)

@@ -2756,10 +2781,9 @@ Service (QoS) on IP networks. The DSCP value specified here is used when establishing the connection - between the controller and the Open vSwitch. The connection must be - reset for the new DSCP values to take effect. If no value is - specified, a default value of 48 is chosen. Valid DSCP values must be - in the range 0 to 63. + between the controller and the Open vSwitch. If no value is specified, + a default value of 48 is chosen. Valid DSCP values must be in the + range 0 to 63. @@ -3003,10 +3027,9 @@ Service (QoS) on IP networks. The DSCP value specified here is used when establishing the connection - between the manager and the Open vSwitch. The connection must be - reset for the new DSCP values to take effect. If no value is - specified, a default value of 48 is chosen. Valid DSCP values must be - in the range 0 to 63. + between the manager and the Open vSwitch. If no value is specified, a + default value of 48 is chosen. Valid DSCP values must be in the range + 0 to 63.