diff options
| author | Ben Pfaff <blp@ovn.org> | 2018-10-09 11:15:00 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-02-05 13:44:11 -0800 |
| commit | 49d6aafb9cc644e358c231350f9723ba01de8f55 (patch) | |
| tree | 44225631661ecfcf654e408ee1ae763191b0666b /ofproto/ofproto.c | |
| parent | c66be90bd9a04bc98e8ef32f684a3d7283379f66 (diff) | |
| download | openvswitch-49d6aafb9cc644e358c231350f9723ba01de8f55.tar.gz | |
ofproto: Don't always treat passive controllers as "equal".
If a passive controller chooses to configure itself as a slave controller,
I don't know a reason why it should be considered "equal" for some
purposes.
Acked-by: Justin Pettit <jpettit@ovn.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto/ofproto.c')
| -rw-r--r-- | ofproto/ofproto.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index a248e149f..40949eec9 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -3425,8 +3425,7 @@ handle_set_config(struct ofconn *ofconn, const struct ofp_header *oh) static enum ofperr reject_slave_controller(struct ofconn *ofconn) { - if (ofconn_get_type(ofconn) == OFCONN_PRIMARY - && ofconn_get_role(ofconn) == OFPCR12_ROLE_SLAVE) { + if (ofconn_get_role(ofconn) == OFPCR12_ROLE_SLAVE) { return OFPERR_OFPBRC_IS_SLAVE; } else { return 0; |