mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 07:15:17 +00:00
Code Issues Releases Wiki Activity

Revert "utilities/ovs-ctl: Force removal of ip_gre/gre"

Browse Source 
This reverts commit 2bdd1f3d96.

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>
This commit is contained in:
Greg Rose
2018-06-04 13:14:37 -07:00
committed by Ben Pfaff
parent 27d09fbc64
commit a94f9524db
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utilities/ovs-lib.in
View File

@@ -622,14 +622,6 @@ force_reload_kmod () {
action "Removing $vport module" rmmod $vport action "Removing $vport module" rmmod $vport
done 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 if test -e /sys/module/openvswitch; then
action "Removing openvswitch module" rmmod openvswitch action "Removing openvswitch module" rmmod openvswitch
fi fi