From: Ben Pfaff <blp@nicira.com>
Date: Thu, 26 Jan 2012 21:19:39 +0000 (-0800)
Subject: ofproto: Allow service controllers to become masters and slaves.
X-Git-Tag: sliver-openvswitch-0.1-1~353
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9aec6f5a52b1575a30264554736c1275442e3d80;p=sliver-openvswitch.git

ofproto: Allow service controllers to become masters and slaves.

I don't remember why we disallow this.  It seems reasonable to me to enable
it.  A test in a upcoming commit relies upon the ability.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 7e94b219a..fe3b6206c 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -3062,10 +3062,6 @@ handle_role_request(struct ofconn *ofconn, const struct ofp_header *oh)
     struct ofpbuf *buf;
     uint32_t role;
 
-    if (ofconn_get_type(ofconn) != OFCONN_PRIMARY) {
-        return OFPERR_OFPBRC_EPERM;
-    }
-
     role = ntohl(nrr->role);
     if (role != NX_ROLE_OTHER && role != NX_ROLE_MASTER
         && role != NX_ROLE_SLAVE) {