diff options
| -rw-r--r-- | lib/odp-util.c | 2 | ||||
| -rw-r--r-- | tests/mpls-xlate.at | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/odp-util.c b/lib/odp-util.c index 962b84b2c..4845d28ef 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -495,7 +495,7 @@ format_mpls(struct ds *ds, const struct ovs_key_mpls *mpls_key, static void format_odp_recirc_action(struct ds *ds, uint32_t recirc_id) { - ds_put_format(ds, "recirc(%"PRIu32")", recirc_id); + ds_put_format(ds, "recirc(%#"PRIx32")", recirc_id); } static void diff --git a/tests/mpls-xlate.at b/tests/mpls-xlate.at index 571b8ce45..8f286c3a5 100644 --- a/tests/mpls-xlate.at +++ b/tests/mpls-xlate.at @@ -47,12 +47,12 @@ AT_CHECK([tail -1 stdout], [0], dnl Double MPLS pop AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=60,tc=0/0,ttl=64,bos=0)' -generate], [0], [stdout]) AT_CHECK([tail -1 stdout], [0], - [Datapath actions: pop_mpls(eth_type=0x8847),recirc(1) + [Datapath actions: pop_mpls(eth_type=0x8847),recirc(0x1) ]) AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'recirc_id(1),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=50,tc=0/0,ttl=64,bos=0)' -generate], [0], [stdout]) AT_CHECK([tail -1 stdout], [0], - [Datapath actions: pop_mpls(eth_type=0x800),recirc(2) + [Datapath actions: pop_mpls(eth_type=0x800),recirc(0x2) ]) AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'recirc_id(2),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)' -generate], [0], [stdout]) |