From: Ben Pfaff <blp@nicira.com>
Date: Mon, 11 Nov 2013 21:32:23 +0000 (-0800)
Subject: odp-util: Fix formatting of ipfix action cookies, to fix a testsuite failure
X-Git-Tag: sliver-openvswitch-2.0.90-1~5^2~41
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b075a9b855c5234babf5304723998248ec50740f;p=sliver-openvswitch.git

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 <blp@nicira.com>
---

diff --git a/lib/odp-util.c b/lib/odp-util.c
index a8d561b0e..e20a0ba25 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -308,7 +308,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 {