Message ID | etPan.55f3198e.202e2383.2446@rlenglet-mac |
---|---|
State | Not Applicable |
Headers | show |
On 11 September 2015 at 11:12, Romain Lenglet <romain.lenglet@oracle.com> wrote: > LGTM, thanks! > > Acked-by: Romain Lenglet <romain.lenglet@oracle.com> Thanks, applied to master and branch-2.[134].
diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 48ff827..9ad8fa2 100644 --- a/ofproto/ofproto-dpif-ipfix.c +++ b/ofproto/ofproto-dpif-ipfix.c @@ -1692,6 +1692,10 @@ dpif_ipfix_bridge_sample(struct dpif_ipfix *di, const struct dp_packet *packet, struct dpif_ipfix_port * tunnel_port = NULL; ovs_mutex_lock(&mutex); + if (!bridge_exporter_enabled(di)) { + ovs_mutex_unlock(&mutex); + return; + } /* Use the sampling probability as an approximation of the number * of matched packets. */ packet_delta_count = UINT32_MAX / di->bridge_exporter.probability;