kmod-macros: Don't unload kmod in VSWITCHD_STOP.

We already queue the removal of the kernel module in OVS_VSWITCHD_START,
via an ON_EXIT() call. That command is executed in both the success and
failure cases, so it is unnecessary to unload the kernel module in
OVS_VSWITCHD_STOP.

Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Daniele Di Proietto <diproiettod@vmware.com>

diff --git a/tests/kmod-macros.at b/tests/kmod-macros.at
index 902f8e11f3f93bdc3df769daf5561f0b00df69a8..c74d3486400578938f65a587695900b81712d671 100644 (file)
--- a/tests/kmod-macros.at
+++ b/tests/kmod-macros.at
@@ -32,5 +32,4 @@ m4_define([OVS_KMOD_VSWITCHD_STOP],
   [AT_CHECK([ovs-vsctl del-br br0])
    OVS_VSWITCHD_STOP([$1])
    AT_CHECK([:; $2])
-   AT_CHECK([modprobe -r openvswitch])
   ])