From: Ben Pfaff <blp@nicira.com>
Date: Fri, 2 Mar 2012 23:43:53 +0000 (-0800)
Subject: Revert "connmgr: Make "enable-async-messages" work for primary controllers too."
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0d1abcdb3fb70d70866b700f66d3b36247066fc7;p=sliver-openvswitch.git

Revert "connmgr: Make "enable-async-messages" work for primary controllers too."

Oops.  The feature that this modifies is not actually present on
this branch, breaking the build.

This reverts commit 1d5260da440959adfc1b2be7a4b476e7970bf08d.
---

diff --git a/AUTHORS b/AUTHORS
index cf234385c..150d1bbf1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -89,7 +89,6 @@ Hector Oron             hector.oron@gmail.com
 Henrik Amren            henrik@nicira.com
 Jad Naous               jnaous@gmail.com
 Jamal Hadi Salim        hadi@cyberus.ca
-James Schmidt           jschmidt@nicira.com
 Jan Medved              jmedved@juniper.net
 Janis Hamme             janis.hamme@student.kit.edu
 Jari Sundell            sundell.software@gmail.com
diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
index d74cbb353..46d6d7962 100644
--- a/ofproto/connmgr.c
+++ b/ofproto/connmgr.c
@@ -978,7 +978,6 @@ ofconn_reconfigure(struct ofconn *ofconn, const struct ofproto_controller *c)
     int probe_interval;
 
     ofconn->band = c->band;
-    ofconn->enable_async_msgs = c->enable_async_msgs;
 
     rconn_set_max_backoff(ofconn->rconn, c->max_backoff);