X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=INSTALL.OpenFlow;h=173a68833a06e9d99ab5f73a627865b922568e35;hb=refs%2Fheads%2Fbranch-1.1;hp=7a4a7e6f174533a47e2933dcd99fca3b9d335a27;hpb=a0bc29a541fc7dc6e20137d5558e2094d614e6ab;p=sliver-openvswitch.git

diff --git a/INSTALL.OpenFlow b/INSTALL.OpenFlow
index 7a4a7e6f1..173a68833 100644
--- a/INSTALL.OpenFlow
+++ b/INSTALL.OpenFlow
@@ -3,9 +3,11 @@
 
 Open vSwitch uses OpenFlow as its preferred method of remote flow
 table configuration.  This is the simplest method of using it with an
-OpenFlow controller.  The ovs-vsctl "set-controller" command will set
-the controller for one or more bridges.  We recommend using OpenFlow
-in this manner.
+OpenFlow controller.  The ovs-vsctl "set-controller" command can also
+be used in conjunction with ovs-vswitchd to set the controller for one
+or more bridges.  We recommend using OpenFlow in this manner and in this
+case you should not run ovs-openflowd.  Directions for setting up
+ovs-vswitchd can be found in INSTALL.Linux.
 
 However, it is also possible to use Open vSwitch as a simple OpenFlow
 switch like that provided by the OpenFlow reference implementation
@@ -56,10 +58,10 @@ OpenFlow switch.
 
       % insmod datapath/linux-2.6/openvswitch_mod.ko
 
-   This kernel module cannot be loaded if the Linux bridge module is
-   already loaded.  Thus, you may need to remove any existing bridges
-   and unload the bridge module with "rmmod bridge" before you can do
-   this.
+   If your Linux kernel is earlier than 2.6.36, this kernel module
+   cannot be loaded if the Linux bridge module is already loaded.
+   Thus, you may need to remove any existing bridges and unload the
+   bridge module with "rmmod bridge" before you can do this.
 
 3. Create a datapath instance.  The command below creates a datapath
    identified as dp0 (see ovs-dpctl(8) for more detailed usage
@@ -116,10 +118,6 @@ OpenFlow switch.
              contact the DHCP server until the secure channel has 
              started.  The address will be obtained in step 7.
 
-      - If you are using in-band control with controller discovery, no
-        configuration is required at this point.  You may proceed to
-        the next step.
-
 6. Run ovs-openflowd to start the secure channel connecting the datapath to
    a remote controller.  If the controller is running on host
    192.168.1.2 port 6633 (the default port), the ovs-openflowd invocation
@@ -127,9 +125,6 @@ OpenFlow switch.
 
       # ovs-openflowd dp0 tcp:192.168.1.2
 
-   - If you are using in-band control with controller discovery, omit
-     the second argument to the ovs-openflowd command.
-
    - If you are using out-of-band control, add --out-of-band to the
      command line.
 
@@ -137,16 +132,13 @@ OpenFlow switch.
    in an insecure manner.  Please see INSTALL.SSL for a description of
    how to connect securely using SSL.
 
-7. If you are using in-band control with manual configuration, and the
-   switch obtains its IP address dynamically, then you may now obtain
-   the switch's IP address, e.g. by invoking a DHCP client.  The
-   secure channel will only be able to connect to the controller after
-   an IP address has been obtained.
+7. If you are using in-band control, and the switch obtains its IP address
+   dynamically, then you may now obtain the switch's IP address, e.g. by
+   invoking a DHCP client.  The secure channel will only be able to connect
+   to the controller after an IP address has been obtained.
 
 8. The secure channel should connect to the controller within a few
-   seconds.  It may take a little longer if controller discovery is in
-   use, because the switch must then also obtain its own IP address
-   and the controller's location via DHCP.
+   seconds.
 
 References
 ----------