datapath: Fix OVS build failure on older kernel

[openvswitch] / rhel / etc_init.d_openvswitch

diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
index c7543cc5517be88d5e30f0f3a37c6fad53071462..5501d188156b2f61ce5559f99581567758438480 100755 (executable)
--- a/rhel/etc_init.d_openvswitch
+++ b/rhel/etc_init.d_openvswitch
@@ -31,9 +31,6 @@
 test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
 
 start () {
-    # Allow GRE traffic.
-    /sbin/iptables -I INPUT -p gre -j ACCEPT
-
     set $ovs_ctl ${1-start}
     set "$@" --system-id=random
     if test X"$FORCE_COREFILES" != X; then
@@ -48,12 +45,10 @@ start () {
     if test X"$VSWITCHD_MLOCKALL" != X; then
        set "$@" --mlockall="$VSWITCHD_MLOCKALL"
     fi
-    if test ! -e /var/run/openvswitch.booted; then
-        touch /var/run/openvswitch.booted
-        set "$@" --delete-bridges
-    fi
     "$@"
 
+    $ovs_ctl --protocol=gre enable-protocol
+
     touch /var/lock/subsys/openvswitch
 }