git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new makefile target for error reporting
[sliver-openvswitch.git]
/
lib
/
flow.c
diff --git
a/lib/flow.c
b/lib/flow.c
index
d899d26
..
3e29aa1
100644
(file)
--- a/
lib/flow.c
+++ b/
lib/flow.c
@@
-356,7
+356,7
@@
invalid:
* present and has a correct length, and otherwise NULL.
*/
void
* present and has a correct length, and otherwise NULL.
*/
void
-flow_extract(struct ofpbuf *packet, uint32_t skb_priority, uint32_t
skb
_mark,
+flow_extract(struct ofpbuf *packet, uint32_t skb_priority, uint32_t
pkt
_mark,
const struct flow_tnl *tnl, const union flow_in_port *in_port,
struct flow *flow)
{
const struct flow_tnl *tnl, const union flow_in_port *in_port,
struct flow *flow)
{
@@
-375,7
+375,7
@@
flow_extract(struct ofpbuf *packet, uint32_t skb_priority, uint32_t skb_mark,
flow->in_port = *in_port;
}
flow->skb_priority = skb_priority;
flow->in_port = *in_port;
}
flow->skb_priority = skb_priority;
- flow->
skb_mark = skb
_mark;
+ flow->
pkt_mark = pkt
_mark;
packet->l2 = b.data;
packet->l2_5 = NULL;
packet->l2 = b.data;
packet->l2_5 = NULL;
@@
-500,6
+500,7
@@
flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd)
fmd->tun_dst = flow->tunnel.ip_dst;
fmd->metadata = flow->metadata;
memcpy(fmd->regs, flow->regs, sizeof fmd->regs);
fmd->tun_dst = flow->tunnel.ip_dst;
fmd->metadata = flow->metadata;
memcpy(fmd->regs, flow->regs, sizeof fmd->regs);
+ fmd->pkt_mark = flow->pkt_mark;
fmd->in_port = flow->in_port.ofp_port;
}
fmd->in_port = flow->in_port.ofp_port;
}