projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Add compat support for nla_type().
[openvswitch]
/
lib
/
flow.c
diff --git
a/lib/flow.c
b/lib/flow.c
index ebbd927aeb1fcfd33708ddb07ad0f0bee730826f..e7ed2a97efe1b33e58d72765653289cea61573c6 100644
(file)
--- 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
* present and has a correct length, and otherwise NULL.
*/
int
-flow_extract(struct ofpbuf *packet, ovs_be
32
tun_id, uint16_t in_port,
+flow_extract(struct ofpbuf *packet, ovs_be
64
tun_id, uint16_t in_port,
struct flow *flow)
{
struct ofpbuf b = *packet;
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)
{
void
flow_format(struct ds *ds, const struct flow *flow)
{
- ds_put_format(ds, "tunnel%#"PRIx
32
":in_port%04"PRIx16":tci(",
-
ntohl(flow->tun_id)
, flow->in_port);
+ ds_put_format(ds, "tunnel%#"PRIx
64
":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),
if (flow->vlan_tci) {
ds_put_format(ds, "vlan%"PRIu16",pcp%d",
vlan_tci_to_vid(flow->vlan_tci),