From: Andy Zhou <azhou@nicira.com>
Date: Tue, 10 Sep 2013 20:33:08 +0000 (-0700)
Subject: openflow-1.1+: move OFPTC11_TABLE_MISS_MASK out of enum
X-Git-Tag: sliver-openvswitch-2.0.90-1~15^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0be44ca82f2dee4e7087429b1f208db3712aa643;p=sliver-openvswitch.git

openflow-1.1+: move OFPTC11_TABLE_MISS_MASK out of enum

OFPTC11_TABLE_MISS_MASK is not a valid configuration, but to indicate
there are only 2 bits being used for table miss configuration. Move
it out of the enum definition.

Reported-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Andy Zhou <azhou@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h
index de88ffaae..4ee9c5c32 100644
--- a/include/openflow/openflow-1.1.h
+++ b/include/openflow/openflow-1.1.h
@@ -452,7 +452,7 @@ enum ofp11_table_config {
                                              pipeline (OpenFlow 1.0
                                              behavior). */
     OFPTC11_TABLE_MISS_DROP = 2 << 0,     /* Drop the packet. */
-    OFPTC11_TABLE_MISS_MASK = 3
+#define OFPTC11_TABLE_MISS_MASK (3 << 0)
 };
 
 /* Flow setup and teardown (controller -> datapath). */