On Sun, Dec 08, 2013 at 06:45:22PM -0800, Ethan Jackson wrote:
> They don't really make sense in a multithreaded architecture.  Once
> flow miss batches are dispatched with, they will be extra useless.
> 
> Signed-off-by: Ethan Jackson <et...@nicira.com>

I had to resolve a few conflicts due to changes on master.  In my tree,
I see the following in run() in ofproto-dpif.c now:

    /* Do not perform any periodic activity below required by 'ofproto' while
     * waiting for flow restore to complete. */
    if (ofproto_get_flow_restore_wait()) {
        return 0;
    }

    /* Do not perform any periodic activity required by 'ofproto' while
     * waiting for flow restore to complete. */
    if (!ofproto_get_flow_restore_wait()) {
        struct ofproto_packet_in *pin, *next_pin;

which seems awfully repetitive, but perhaps that's not actually that way
in your copy.

Acked-by: Ben Pfaff <b...@nicira.com>

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to