This reverts commit 2bdd1f3d96a86bea6bdb8788f23ec7dd99b289e3. 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 <[email protected]> --- utilities/ovs-lib.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in index 5ba4f8b..4c3ad0f 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 -- 1.8.3.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
