diff options
| author | Greg Rose <gvrose8192@gmail.com> | 2018-06-04 13:14:37 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-06-05 10:37:53 -0700 |
| commit | a94f9524dbc11c78c83d1a49959497f5e73bf949 (patch) | |
| tree | c1e2cd6fd6a36b5c25e79cbe8dbd8e164eae2790 /utilities | |
| parent | 27d09fbc647901f4edd3c4112595695229c50e8c (diff) | |
| download | openvswitch-a94f9524dbc11c78c83d1a49959497f5e73bf949.tar.gz | |
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>
Diffstat (limited to 'utilities')
| -rw-r--r-- | utilities/ovs-lib.in | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in index 5ba4f8b08..4c3ad0f0b 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -622,14 +622,6 @@ force_reload_kmod () { action "Removing $vport module" rmmod $vport done - if test -e /sys/module/ip_gre; then - action "Forcing removal of ip_gre module" rmmod ip_gre - fi - - if test -e /sys/module/gre; then - action "Forcing removal of gre module" rmmod gre - fi - if test -e /sys/module/openvswitch; then action "Removing openvswitch module" rmmod openvswitch fi |