From eb233c07981e2ef4b2f472af0ac1a3850f773658 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 11 Nov 2013 13:32:23 -0800 Subject: [PATCH] odp-util: Fix formatting of ipfix action cookies, to fix a testsuite failure Problem introduced by previous commit 96ed775f19 (odp-util: Fix IPFIX breakage with old kernel modules.) Signed-off-by: Ben Pfaff --- lib/odp-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/odp-util.c b/lib/odp-util.c index f68bf3f25..491b3723e 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -316,7 +316,7 @@ format_odp_userspace_action(struct ds *ds, const struct nlattr *attr) cookie.flow_sample.collector_set_id, cookie.flow_sample.obs_domain_id, cookie.flow_sample.obs_point_id); - } else if (userdata_len == sizeof cookie.ipfix + } else if (userdata_len >= sizeof cookie.ipfix && cookie.type == USER_ACTION_COOKIE_IPFIX) { ds_put_format(ds, ",ipfix"); } else { -- 2.20.1