[ovs-dev] [PATCH] ovs-ctl: Do not load brcompat_mod if the bridge module is already loaded.

[Ben Pfaff]

brcompat_mod and the Linux bridge module are incompatible, so it doesn't
make sense to try to load both at the same time.  This commit prevents
ovs-ctl from trying.

Signed-off-by: Ben Pfaff <blp at nicira.com>
Reported-by: Rogério Vinhal Nunes
Launchpad bug #917309.
---
 AUTHORS              |    1 +
 utilities/ovs-ctl.in |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 87b3ccd..328218d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -114,6 +114,7 @@ Peter Phaal             peter.phaal at inmon.com
 Ram Jothikumar          rjothikumar at nicira.com
 Ramana Reddy            gtvrreddy at gmail.com
 Roger Leigh             rleigh at codelibre.net
+Rogério Vinhal Nunes
 Sean Brady              sbrady at gtfservices.com
 Sebastian Andrzej Siewior  sebastian at breakpoint.cc
 Sébastien RICCIO        sr at swisscenter.com
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 5640ee8..d1df6a8 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -52,6 +52,10 @@ insert_openvswitch_mod_if_required () {
 }
 
 insert_brcompat_mod_if_required () {
+    if test -e /sys/module/bridge; then
+        log_warning_msg "bridge module is loaded, not loading brcompat_mod"
+        return 1
+    fi
     test -e /sys/module/brcompat_mod && return 0
     action "Inserting brcompat module" modprobe brcompat_mod
 }
-- 
1.7.2.5