From: Gurucharan Shetty <gshetty@nicira.com>
Date: Wed, 10 Apr 2013 18:53:40 +0000 (-0700)
Subject: ovs-ctl.in: Merge a single line function.
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=0a69a5e4d4560fd462c0b39804f496742a7927fe;p=cascardo%2Fovs.git

ovs-ctl.in: Merge a single line function.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
---

diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 933c5d76e..1f10491df 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -30,7 +30,7 @@ done
 ## start ##
 ## ----- ##
 
-insert_openvswitch_mod_if_required () {
+insert_mod_if_required () {
     # If openvswitch is already loaded then we're done.
     test -e /sys/module/openvswitch -o -e /sys/module/openvswitch_mod && \
      return 0
@@ -52,10 +52,6 @@ insert_openvswitch_mod_if_required () {
     action "Inserting openvswitch module" modprobe openvswitch
 }
 
-insert_mod_if_required () {
-    insert_openvswitch_mod_if_required || return 1
-}
-
 ovs_vsctl () {
     ovs-vsctl --no-wait "$@"
 }