Recirculation id was scanned without a mask, which led to it being
ignored.
Signed-off-by: Jarno Rajahalme <jrajaha...@nicira.com>
---
lib/odp-util.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/lib/odp-util.c b/lib/odp-util.c
index 7c85ece..dc1e7dc 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -2652,11 +2652,6 @@ scan_mpls_bos(const char *s, ovs_be32 *key, ovs_be32
*mask)
SCAN_TYPE(SCAN_AS, &skey, &smask); \
} SCAN_END_SINGLE(ATTR)
-#define SCAN_SINGLE_NO_MASK(NAME, TYPE, SCAN_AS, ATTR) \
- SCAN_BEGIN(NAME, TYPE) { \
- SCAN_TYPE(SCAN_AS, &skey, NULL); \
- } SCAN_END_SINGLE(ATTR)
-
/* scan_port needs one extra argument. */
#define SCAN_SINGLE_PORT(NAME, TYPE, ATTR) \
SCAN_BEGIN(NAME, TYPE) { \
@@ -2673,7 +2668,7 @@ parse_odp_key_mask_attr(const char *s, const struct simap
*port_names,
{
SCAN_SINGLE("skb_priority(", uint32_t, u32, OVS_KEY_ATTR_PRIORITY);
SCAN_SINGLE("skb_mark(", uint32_t, u32, OVS_KEY_ATTR_SKB_MARK);
- SCAN_SINGLE_NO_MASK("recirc_id(", uint32_t, u32, OVS_KEY_ATTR_RECIRC_ID);
+ SCAN_SINGLE("recirc_id(", uint32_t, u32, OVS_KEY_ATTR_RECIRC_ID);
SCAN_SINGLE("dp_hash(", uint32_t, u32, OVS_KEY_ATTR_DP_HASH);
SCAN_BEGIN("tunnel(", struct flow_tnl) {
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
