datapath: Make GRE support conditional on CONFIG_NET_IPGRE_DEMUX.

[sliver-openvswitch.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 28bc1a0..4749e30 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -49,9 +49,9 @@ INSTALL.userspace for more information.
       NET_ACT_POLICE, either built-in or as modules.  (NET_CLS_POLICE is
       obsolete and not needed.)
 
       NET_ACT_POLICE, either built-in or as modules.  (NET_CLS_POLICE is
       obsolete and not needed.)
 

-      If GRE tunneling is being used it is recommended that the kernel
-      be compiled with IPv6 support (CONFIG_IPV6).  This allows for
-      special handling (such as path MTU discovery) of IPv6 packets.
+      To use GRE tunneling on Linux 2.6.37 or newer, kernel support
+      for GRE must be compiled in or available as a module
+      (CONFIG_NET_IPGRE_DEMUX).

 
       To configure HTB or HFSC quality of service with Open vSwitch,
       you must enable the respective configuration options.
 
       To configure HTB or HFSC quality of service with Open vSwitch,
       you must enable the respective configuration options.


@@ -286,10 +286,10 @@ any managers specified in the database itself, and to use the SSL
 configuration in the database:
 
       % ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock \
 configuration in the database:
 
       % ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock \

-                     --remote=db:Open_vSwitch,manager_options \
-                     --private-key=db:SSL,private_key \
-                     --certificate=db:SSL,certificate \
-                     --bootstrap-ca-cert=db:SSL,ca_cert \
+                     --remote=db:Open_vSwitch,Open_vSwitch,manager_options \
+                     --private-key=db:Open_vSwitch,SSL,private_key \
+                     --certificate=db:Open_vSwitch,SSL,certificate \
+                     --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \

                      --pidfile --detach
 
 (If you built Open vSwitch without SSL support, then omit
                      --pidfile --detach
 
 (If you built Open vSwitch without SSL support, then omit