odp-util: Fix formatting of ipfix action cookies, to fix a testsuite failure
authorBen Pfaff <blp@nicira.com>
Mon, 11 Nov 2013 21:32:23 +0000 (13:32 -0800)
committerBen Pfaff <blp@nicira.com>
Mon, 11 Nov 2013 21:38:02 +0000 (13:38 -0800)
Problem introduced by previous commit 96ed775f19 (odp-util: Fix IPFIX
breakage with old kernel modules.)

Signed-off-by: Ben Pfaff <blp@nicira.com>
lib/odp-util.c

index f68bf3f..491b372 100644 (file)
@@ -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 {