It's always the size of 'odp_actions' following adding the sample actions.
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
ofproto/ofproto-dpif-xlate.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 6bad7f9..e69605e 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -4953,8 +4953,6 @@ xlate_actions(struct xlate_in *xin, struct xlate_out
*xout)
/* Do not perform special processing on recirculated packets,
* as recirculated packets are not really received by the bridge. */
if (xin->recirc || !process_special(&ctx, in_port)) {
- size_t sample_actions_len;
-
if (flow->in_port.ofp_port
!= vsp_realdev_to_vlandev(xbridge->ofproto,
flow->in_port.ofp_port,
@@ -4966,10 +4964,8 @@ xlate_actions(struct xlate_in *xin, struct xlate_out
*xout)
if (!xin->recirc) {
add_sflow_action(&ctx);
add_ipfix_action(&ctx);
- sample_actions_len = ctx.odp_actions->size;
- } else {
- sample_actions_len = 0;
}
+ size_t sample_actions_len = ctx.odp_actions->size;
if (tnl_may_send && (!in_port || may_receive(in_port, &ctx))) {
const struct ofpact *ofpacts;
--
2.1.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
