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

[Yifeng Sun]

Please backport this patch to upstream OVS down to 2.10.

Author: Greg Rose <roseg at vmware.com>
Date:   Wed Jun 6 15:34:44 2018 -0700

This reverts commit a94f9524dbc11c78c83d1a49959497f5e73bf949.

Signed-off-by: Greg Rose <roseg at vmware.com>
---
 utilities/ovs-lib.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index 090a144..f6b5393 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -627,6 +627,14 @@ force_reload_kmod () {
         action "Removing datapath: $dp" ovs-dpctl del-dp "$dp"
     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
+
     ovs_kmod_ctl remove
 
     # Start vswitchd by asking it to wait till flow restore is finished.
-- 
2.7.4