dpif-netdev: Properly track whether there is a vlan header.

[openvswitch] / vswitchd / ovs-vswitchd.8.in

diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in
index b7c99404c73fff51e6fcf5e8102fa7d553acf23e..f2fc43c80806bc978e8dbb47953aa74c23fe7bf9 100644 (file)
--- a/vswitchd/ovs-vswitchd.8.in
+++ b/vswitchd/ovs-vswitchd.8.in
@@ -18,9 +18,10 @@ ovs\-vswitchd \- Open vSwitch daemon
 A daemon that manages and controls any number of Open vSwitch switches 
 on the local machine.
 .PP
 A daemon that manages and controls any number of Open vSwitch switches 
 on the local machine.
 .PP

-The mandatory \fIdatabase\fR argument specifies the
-\fBovsdb\-server\fR from which \fBovs\-vswitchd\fR's configuration
-should be retrieved.  It takes one of the following forms:
+The mandatory \fIdatabase\fR argument normally takes the form
+\fBunix:\fIfile\fR, where \fIfile\fR is the name of a Unix domain
+socket on which \fBovsdb\-server\fR is listening.  However, all of the
+following forms are accepted:

 .so ovsdb/remote-active.man
 .so ovsdb/remote-passive.man
 .PP
 .so ovsdb/remote-active.man
 .so ovsdb/remote-passive.man
 .PP


@@ -75,7 +76,7 @@ Open vSwitch distribution for instructions on how to build and load
 the Open vSwitch kernel module.
 .PP
 .SH OPTIONS
 the Open vSwitch kernel module.
 .PP
 .SH OPTIONS

-.IP "\fB--mlockall\fR"
+.IP "\fB\-\-mlockall\fR"

 Causes \fBovs\-vswitchd\fR to call the \fBmlockall()\fR function, to
 attempt to lock all of its process memory into physical RAM,
 preventing the kernel from paging any of its memory to disk.  This
 Causes \fBovs\-vswitchd\fR to call the \fBmlockall()\fR function, to
 attempt to lock all of its process memory into physical RAM,
 preventing the kernel from paging any of its memory to disk.  This


@@ -86,12 +87,14 @@ only allow privileged users, such as the superuser, to use it.
 \fBovs\-vswitchd\fR emits a log message if \fBmlockall()\fR is
 unavailable or unsuccessful.
 .
 \fBovs\-vswitchd\fR emits a log message if \fBmlockall()\fR is
 unavailable or unsuccessful.
 .

-.IP "\fB--fake-proc-net\fR"
+.IP "\fB\-\-fake\-proc\-net\fR"

 Causes \fBovs\-vswitchd\fR to simulate some files in \fB/proc/net/vlan\fR
 and \fB/proc/net/bonding\fR that some legacy software expects to
 exist.  This option should only be used if such legacy software is
 actually in use.  It requires the \fBbrcompat_mod.ko\fR kernel module
 to be loaded.
 Causes \fBovs\-vswitchd\fR to simulate some files in \fB/proc/net/vlan\fR
 and \fB/proc/net/bonding\fR that some legacy software expects to
 exist.  This option should only be used if such legacy software is
 actually in use.  It requires the \fBbrcompat_mod.ko\fR kernel module
 to be loaded.

+.IP
+On non-Linux hosts, this option is accepted but has no effect.

 .
 .so lib/daemon.man
 .SS "Public Key Infrastructure Options"
 .
 .so lib/daemon.man
 .SS "Public Key Infrastructure Options"


@@ -106,16 +109,25 @@ to be loaded.
 \fBovs\-vswitchd\fR process.  The currently supported commands are
 described below.  The command descriptions assume an understanding of
 how to configure Open vSwitch.
 \fBovs\-vswitchd\fR process.  The currently supported commands are
 described below.  The command descriptions assume an understanding of
 how to configure Open vSwitch.

+.SS "GENERAL COMMANDS"
+.IP "\fBexit\fR"
+Causes \fBovs\-vswitchd\fR to gracefully terminate.

 .SS "BRIDGE COMMANDS"
 These commands manage bridges.
 .IP "\fBfdb/show\fR \fIbridge\fR"
 Lists each MAC address/VLAN pair learned by the specified \fIbridge\fR,
 along with the port on which it was learned and the age of the entry,
 in seconds.
 .SS "BRIDGE COMMANDS"
 These commands manage bridges.
 .IP "\fBfdb/show\fR \fIbridge\fR"
 Lists each MAC address/VLAN pair learned by the specified \fIbridge\fR,
 along with the port on which it was learned and the age of the entry,
 in seconds.

+.IP "\fBbridge/reconnect\fR [\fIbridge\fR]"
+Makes \fIbridge\fR drop all of its OpenFlow controller connections and
+reconnect.  If \fIbridge\fR is not specified, then all bridges drop
+their controller connections and reconnect.
+.IP
+This command might be useful for debugging OpenFlow controller issues.

 .
 .

-.IP "\fBbridge/dump-flows\fR \fIbridge\fR"
+.IP "\fBbridge/dump\-flows\fR \fIbridge\fR"

 Lists all flows in \fIbridge\fR, including those normally hidden to
 Lists all flows in \fIbridge\fR, including those normally hidden to

-commands such as \fBovs-ofctl dump-flows\fR.  Flows set up by mechanisms
+commands such as \fBovs\-ofctl dump\-flows\fR.  Flows set up by mechanisms

 such as in-band control and fail-open are hidden from the controller
 since it is not allowed to modify or override them.
 .SS "BOND COMMANDS"
 such as in-band control and fail-open are hidden from the controller
 since it is not allowed to modify or override them.
 .SS "BOND COMMANDS"


@@ -148,14 +160,14 @@ cause the MAC hash to be shifted to a new slave in the usual
 manner.
 .IP
 A MAC hash cannot be migrated to a disabled slave.
 manner.
 .IP
 A MAC hash cannot be migrated to a disabled slave.

-.IP "\fBbond/set-active-slave\fR \fIport\fR \fIslave\fR"
+.IP "\fBbond/set\-active\-slave\fR \fIport\fR \fIslave\fR"

 Sets \fIslave\fR as the active slave on \fIport\fR.  \fIslave\fR must
 currently be enabled.
 .IP
 The setting is not permanent: a new active slave will be selected
 if \fIslave\fR becomes disabled.
 Sets \fIslave\fR as the active slave on \fIport\fR.  \fIslave\fR must
 currently be enabled.
 .IP
 The setting is not permanent: a new active slave will be selected
 if \fIslave\fR becomes disabled.

-.IP "\fBbond/enable-slave\fR \fIport\fR \fIslave\fR"
-.IQ "\fBbond/disable-slave\fR \fIport\fR \fIslave\fR"
+.IP "\fBbond/enable\-slave\fR \fIport\fR \fIslave\fR"
+.IQ "\fBbond/disable\-slave\fR \fIport\fR \fIslave\fR"

 Enables (or disables) \fIslave\fR on the given bond \fIport\fR, skipping any
 updelay (or downdelay).
 .IP
 Enables (or disables) \fIslave\fR on the given bond \fIport\fR, skipping any
 updelay (or downdelay).
 .IP