Thanks, applied as follows (at end).
On Wed, Sep 11, 2013 at 11:47:49AM -0700, Andy Zhou wrote:
> This looks good to me.
>
>
> On Wed, Sep 11, 2013 at 10:28 AM, Ben Pfaff <b...@nicira.com> wrote:
>
> > On Tue, Sep 10, 2013 at 01:33:08PM -0700, Andy Zhou wrote:
> > > 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 <ho...@verge.net.au>
> > > Signed-off-by: Andy Zhou <az...@nicira.com>
> >
> > I agree that OFPTC11_TABLE_MISS_MASK isn't really an enum value so it
> > would be better separately. But on the other hand it's harder to find
> > it when it's not right with the other values. So how about this (this
> > is a manually edited diff, I'm sure it won't apply):
> >
> > > @@ -452,7 +454,6 @@ 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
> > > };
> > >
> > > /* Flow setup and teardown (controller -> datapath). */
> >
--8<--------------------------cut here-------------------------->8--
From: Andy Zhou <az...@nicira.com>
Date: Tue, 10 Sep 2013 13:33:08 -0700
Subject: [PATCH] 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 <ho...@verge.net.au>
Signed-off-by: Andy Zhou <az...@nicira.com>
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
include/openflow/openflow-1.1.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h
index de88ffa..4ee9c5c 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). */
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
