Seems better as we no longer modify the flow.
Signed-off-by: Jarno Rajahalme <[email protected]>
---
ofproto/ofproto-dpif-upcall.c | 12 ++++++------
ofproto/ofproto-dpif-xlate.c | 8 ++++----
ofproto/ofproto-dpif-xlate.h | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c
index 418597c..49e541d 100644
--- a/ofproto/ofproto-dpif-upcall.c
+++ b/ofproto/ofproto-dpif-upcall.c
@@ -823,8 +823,8 @@ upcall_receive(struct upcall *upcall, const struct
dpif_backer *backer,
{
int error;
- error = xlate_receive(backer, flow, &upcall->ofproto, &upcall->ipfix,
- &upcall->sflow, NULL, &upcall->in_port);
+ error = xlate_lookup(backer, flow, &upcall->ofproto, &upcall->ipfix,
+ &upcall->sflow, NULL, &upcall->in_port);
if (error) {
return error;
}
@@ -1301,8 +1301,8 @@ revalidate_ukey(struct udpif *udpif, struct udpif_key
*ukey,
goto exit;
}
- error = xlate_receive(udpif->backer, &flow, &ofproto, NULL, NULL, &netflow,
- &ofp_in_port);
+ error = xlate_lookup(udpif->backer, &flow, &ofproto, NULL, NULL, &netflow,
+ &ofp_in_port);
if (error) {
goto exit;
}
@@ -1435,8 +1435,8 @@ push_dump_ops__(struct udpif *udpif, struct dump_op *ops,
size_t n_ops)
continue;
}
- error = xlate_receive(udpif->backer, &flow, &ofproto,
- NULL, NULL, &netflow, &ofp_in_port);
+ error = xlate_lookup(udpif->backer, &flow, &ofproto,
+ NULL, NULL, &netflow, &ofp_in_port);
if (!error) {
struct xlate_in xin;
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index ffb2580..6081041 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -978,10 +978,10 @@ xlate_lookup_ofproto(const struct dpif_backer *backer,
const struct flow *flow,
* Returns 0 if successful, ENODEV if the parsed flow has no associated ofport.
*/
int
-xlate_receive(const struct dpif_backer *backer, const struct flow *flow,
- struct ofproto_dpif **ofproto, struct dpif_ipfix **ipfix,
- struct dpif_sflow **sflow, struct netflow **netflow,
- ofp_port_t *ofp_in_port)
+xlate_lookup(const struct dpif_backer *backer, const struct flow *flow,
+ struct ofproto_dpif **ofproto, struct dpif_ipfix **ipfix,
+ struct dpif_sflow **sflow, struct netflow **netflow,
+ ofp_port_t *ofp_in_port)
{
const struct xport *xport;
diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h
index 1864980..0f4c0b1 100644
--- a/ofproto/ofproto-dpif-xlate.h
+++ b/ofproto/ofproto-dpif-xlate.h
@@ -176,10 +176,10 @@ void xlate_ofport_remove(struct ofport_dpif *);
struct ofproto_dpif * xlate_lookup_ofproto(const struct dpif_backer *,
const struct flow *,
ofp_port_t *ofp_in_port);
-int xlate_receive(const struct dpif_backer *, const struct flow *,
- struct ofproto_dpif **, struct dpif_ipfix **,
- struct dpif_sflow **, struct netflow **,
- ofp_port_t *ofp_in_port);
+int xlate_lookup(const struct dpif_backer *, const struct flow *,
+ struct ofproto_dpif **, struct dpif_ipfix **,
+ struct dpif_sflow **, struct netflow **,
+ ofp_port_t *ofp_in_port);
void xlate_actions(struct xlate_in *, struct xlate_out *);
void xlate_in_init(struct xlate_in *, struct ofproto_dpif *,
--
1.7.10.4
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
