]> git.proxmox.com Git - ovs.git/commit
Revert "utilities/ovs-ctl: Force removal of ip_gre/gre"
authorGreg Rose <gvrose8192@gmail.com>
Mon, 4 Jun 2018 20:14:37 +0000 (13:14 -0700)
committerBen Pfaff <blp@ovn.org>
Tue, 5 Jun 2018 17:37:53 +0000 (10:37 -0700)
commita94f9524dbc11c78c83d1a49959497f5e73bf949
treec1e2cd6fd6a36b5c25e79cbe8dbd8e164eae2790
parent27d09fbc647901f4edd3c4112595695229c50e8c
Revert "utilities/ovs-ctl: Force removal of ip_gre/gre"

This reverts commit 2bdd1f3d96a86bea6bdb8788f23ec7dd99b289e3.

This is the wrong direction for the solution to the ip_gre/gre kernel
module conflicts, as reported by Jiri Benc <jbenc@redhat.com> and others in
https://mail.openvswitch.org/pipermail/ovs-dev/2018-June/347803.html and
elsewhere in the same thread

Rather than attempting to force the removal of the ip_gre/gre kernel
modules, which often fails because they're in use, we will add a patch that
does not cause the openvswitch kernel module to fail to load when the
ip_gre/gre protocol entry points are already claimed.

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: William Tu <u9012063@gmail.com>
utilities/ovs-lib.in