On Tue, Mar 25, 2014 at 8:29 AM, Ben Pfaff <b...@nicira.com> wrote:
> On Mon, Mar 24, 2014 at 06:58:41PM -0700, Andy Zhou wrote:
>> Signed-off-by: Andy Zhou <az...@nicira.com>
>
> If NXM_NX_RECIRC_ID is not maskable, as its comment says, then
> NXM_NX_RECIRC_ID_W should be omitted, since the _W versions of NXMs are
> used only for masking. Also if NXM_NX_RECIRC_ID is not maskable then
> the match_set_recirc_id_masked() function may not be necessary.
Right. I will push soon with the following incremental changes:
diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index 9ae7735..fe954cd 100644
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -1831,7 +1831,6 @@ OFP_ASSERT(sizeof(struct nx_action_output_reg) == 24);
*
* Masking: not maskable. */
#define NXM_NX_RECIRC_ID NXM_HEADER (0x0001, 36, 4)
-#define NXM_NX_RECIRC_ID_W NXM_HEADER_W(0x0001, 36, 4)
/* ## --------------------- ## */
/* ## Requests and replies. ## */
diff --git a/lib/match.c b/lib/match.c
index bb43b6e..2969972 100644
--- a/lib/match.c
+++ b/lib/match.c
@@ -180,14 +180,8 @@ match_set_dp_hash_masked(struct match *match, uint32_t valu
void
match_set_recirc_id(struct match *match, uint32_t value)
{
- match_set_recirc_id_masked(match, value, UINT32_MAX);
-}
-
-void
-match_set_recirc_id_masked(struct match *match, uint32_t value, uint32_t mask)
-{
- match->wc.masks.recirc_id = mask;
- match->flow.recirc_id = value & mask;
+ match->flow.recirc_id = value;
+ match->wc.masks.recirc_id = UINT32_MAX;
}
>
> Acked-by: Ben Pfaff <b...@nicira.com>
Thanks.
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
