From ee531b802347c1bed40bf5f3b4183530c854c5dd Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Thu, 18 Feb 2016 13:16:10 +0000
Subject: [PATCH] don't complain on relaunch when ODP is not supported

...and WEAVE_NO_FASTDP isn't set.

Fixes #1929.
---
 weave | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/weave b/weave
index f4dd5393..60b5c073 100755
--- a/weave
+++ b/weave
@@ -536,7 +536,9 @@ create_bridge() {
         add_iptables_rule nat POSTROUTING -j WEAVE
     else
         if [ -n "$LAUNCHING_ROUTER" ] ; then
-            if [ "$BRIDGE_TYPE" = bridge -a -z "$WEAVE_NO_FASTDP" ] ; then
+            if [ "$BRIDGE_TYPE" = bridge -a -z "$WEAVE_NO_FASTDP" ] &&
+                util_op create-datapath $DATAPATH 2>/dev/null &&
+                util_op delete-datapath $DATAPATH 2>/dev/null ; then
                 cat <<EOF >&1
 WEAVE_NO_FASTDP is not set, but there is already a bridge present of
 the wrong type for fast datapath.  Please do 'weave reset' to remove