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
Merge 'next' into 'master'.
[sliver-openvswitch.git]
/
lib
/
flow.c
diff --git
a/lib/flow.c
b/lib/flow.c
index
42e80ab
..
0a0e9f5
100644
(file)
--- a/
lib/flow.c
+++ b/
lib/flow.c
@@
-306,7
+306,7
@@
invalid:
}
}
-/* Initializes 'flow' members from 'packet', 'tun_id', and '
in_port
.
+/* Initializes 'flow' members from 'packet', 'tun_id', and '
ofp_in_port'
.
* Initializes 'packet' header pointers as follows:
*
* - packet->l2 to the start of the Ethernet header.
* Initializes 'packet' header pointers as follows:
*
* - packet->l2 to the start of the Ethernet header.
@@
-322,7
+322,7
@@
invalid:
* 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_be64 tun_id, uint16_t in_port,
+flow_extract(struct ofpbuf *packet, ovs_be64 tun_id, uint16_t
ofp_
in_port,
struct flow *flow)
{
struct ofpbuf b = *packet;
struct flow *flow)
{
struct ofpbuf b = *packet;
@@
-333,7
+333,7
@@
flow_extract(struct ofpbuf *packet, ovs_be64 tun_id, uint16_t in_port,
memset(flow, 0, sizeof *flow);
flow->tun_id = tun_id;
memset(flow, 0, sizeof *flow);
flow->tun_id = tun_id;
- flow->in_port = in_port;
+ flow->in_port =
ofp_
in_port;
packet->l2 = b.data;
packet->l3 = NULL;
packet->l2 = b.data;
packet->l3 = NULL;