aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-03-02 15:43:53 -0800
committerBen Pfaff <blp@nicira.com>2012-03-02 15:43:53 -0800
commit0d1abcdb3fb70d70866b700f66d3b36247066fc7 (patch)
treebab519a3127a3215417669faa18377ab8f505914
parent1d5260da440959adfc1b2be7a4b476e7970bf08d (diff)
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.
-rw-r--r--AUTHORS1
-rw-r--r--ofproto/connmgr.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index cf234385..150d1bbf 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 d74cbb35..46d6d796 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);