Please disregard the "1/3" in subject, there is no later parts for this patch "series"…
Jarno On Aug 22, 2013, at 4:01 PM, Jarno Rajahalme <[email protected]> wrote: > Signed-off-by: Jarno Rajahalme <[email protected]> > --- > ofproto/ofproto-dpif-upcall.c | 48 ++++++++++++++++++++--------------------- > 1 file changed, 24 insertions(+), 24 deletions(-) > > diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c > index 111b779..db78af3 100644 > --- a/ofproto/ofproto-dpif-upcall.c > +++ b/ofproto/ofproto-dpif-upcall.c > @@ -554,30 +554,30 @@ recv_upcalls(struct udpif *udpif) > } > } > } > - hash = mhash_finish(hash, n_bytes); > - > - handler = &udpif->handlers[hash % udpif->n_handlers]; > - > - ovs_mutex_lock(&handler->mutex); > - if (handler->n_upcalls < MAX_QUEUE_LENGTH) { > - list_push_back(&handler->upcalls, &upcall->list_node); > - handler->n_upcalls++; > - xpthread_cond_signal(&handler->wake_cond); > - ovs_mutex_unlock(&handler->mutex); > - if (!VLOG_DROP_DBG(&rl)) { > - struct ds ds = DS_EMPTY_INITIALIZER; > - > - odp_flow_key_format(upcall->dpif_upcall.key, > - upcall->dpif_upcall.key_len, > - &ds); > - VLOG_DBG("dispatcher: miss enqueue (%s)", ds_cstr(&ds)); > - ds_destroy(&ds); > - } > - } else { > - ovs_mutex_unlock(&handler->mutex); > - COVERAGE_INC(miss_queue_overflow); > - upcall_destroy(upcall); > - } > + hash = mhash_finish(hash, n_bytes); > + > + handler = &udpif->handlers[hash % udpif->n_handlers]; > + > + ovs_mutex_lock(&handler->mutex); > + if (handler->n_upcalls < MAX_QUEUE_LENGTH) { > + list_push_back(&handler->upcalls, &upcall->list_node); > + handler->n_upcalls++; > + xpthread_cond_signal(&handler->wake_cond); > + ovs_mutex_unlock(&handler->mutex); > + if (!VLOG_DROP_DBG(&rl)) { > + struct ds ds = DS_EMPTY_INITIALIZER; > + > + odp_flow_key_format(upcall->dpif_upcall.key, > + upcall->dpif_upcall.key_len, > + &ds); > + VLOG_DBG("dispatcher: miss enqueue (%s)", ds_cstr(&ds)); > + ds_destroy(&ds); > + } > + } else { > + ovs_mutex_unlock(&handler->mutex); > + COVERAGE_INC(miss_queue_overflow); > + upcall_destroy(upcall); > + } > } else { > ovs_mutex_lock(&udpif->upcall_mutex); > if (udpif->n_upcalls < MAX_QUEUE_LENGTH) { > -- > 1.7.10.4 > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
