summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJarno Rajahalme <jrajahalme@nicira.com>2014-12-22 11:31:18 -0800
committerJarno Rajahalme <jrajahalme@nicira.com>2014-12-22 11:38:51 -0800
commitb58990a668c66fae2240ce86362925a2a6dfff48 (patch)
treee7b0638135dab3c75713b46ba640dec0defc1f6b /lib
parent475b8f065d694adad1581b562b2aa38580af28fc (diff)
downloadopenvswitch-b58990a668c66fae2240ce86362925a2a6dfff48.tar.gz
rconn: Make OF 1.4 bundle messages 'admitted'.
Use of OF 1.4 bundle messages by a controller should indicate that the controller has decided to use the switch, hence make is_admitted_msg() return 'true' for them. Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/rconn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rconn.c b/lib/rconn.c
index 0ee8f0ded..2686c3ab3 100644
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -1389,8 +1389,6 @@ is_admitted_msg(const struct ofpbuf *b)
case OFPTYPE_GROUP_FEATURES_STATS_REPLY:
case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
- case OFPTYPE_BUNDLE_CONTROL:
- case OFPTYPE_BUNDLE_ADD_MESSAGE:
return false;
case OFPTYPE_PACKET_IN:
@@ -1438,6 +1436,8 @@ is_admitted_msg(const struct ofpbuf *b)
case OFPTYPE_FLOW_MONITOR_CANCEL:
case OFPTYPE_FLOW_MONITOR_PAUSED:
case OFPTYPE_FLOW_MONITOR_RESUMED:
+ case OFPTYPE_BUNDLE_CONTROL:
+ case OFPTYPE_BUNDLE_ADD_MESSAGE:
default:
return true;
}