X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fflow.c;h=e7ed2a97efe1b33e58d72765653289cea61573c6;hb=758a12d2d92bfadbebcc65506780c8be68ecf3ac;hp=ebbd927aeb1fcfd33708ddb07ad0f0bee730826f;hpb=29b639ed7522594dac03bd10ad477f2f188ce4b6;p=sliver-openvswitch.git diff --git a/lib/flow.c b/lib/flow.c index ebbd927ae..e7ed2a97e 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -138,7 +138,7 @@ parse_ethertype(struct ofpbuf *b) * present and has a correct length, and otherwise NULL. */ int -flow_extract(struct ofpbuf *packet, ovs_be32 tun_id, uint16_t in_port, +flow_extract(struct ofpbuf *packet, ovs_be64 tun_id, uint16_t in_port, struct flow *flow) { struct ofpbuf b = *packet; @@ -261,8 +261,8 @@ flow_to_string(const struct flow *flow) void flow_format(struct ds *ds, const struct flow *flow) { - ds_put_format(ds, "tunnel%#"PRIx32":in_port%04"PRIx16":tci(", - ntohl(flow->tun_id), flow->in_port); + ds_put_format(ds, "tunnel%#"PRIx64":in_port%04"PRIx16":tci(", + flow->tun_id, flow->in_port); if (flow->vlan_tci) { ds_put_format(ds, "vlan%"PRIu16",pcp%d", vlan_tci_to_vid(flow->vlan_tci),