[ovs-dev] [PATCH v4 17/17] conntrack: Add 'dl_type' parameter to conntrack_execute().

[Joe Stringer]

On 10 June 2016 at 15:47, Daniele Di Proietto <diproiettod at vmware.com> wrote:
> Now that dpif_execute has a 'flow' member, it's pretty easy to access a
> the flow (or the matching megaflow) in dp_execute_cb().
>
> This means that's not necessary anymore for the connection tracker to
> reextract 'dl_type' from the packet, it can be passed as a parameter.
>
> This change means that we have to complicate sightly test-conntrack to
> group the packets by dl_type before passing them to the connection
> tracker.
>
> Signed-off-by: Daniele Di Proietto <diproiettod at vmware.com>

Minor comment below.

Acked-by: Joe Stringer <joe at ovn.org>

> @@ -148,6 +151,44 @@ test_benchmark(struct ovs_cmdl_context *ctx)
>  }
>
>  static void
> +pcap_batch_execute_conntrack(struct conntrack *ct,
> +                             struct dp_packet_batch *pkt_batch)
> +{
> +    size_t i;
> +    struct dp_packet_batch new_batch;
> +    ovs_be16 dl_type = htons(0);
> +
> +    dp_packet_batch_init(&new_batch);
> +
> +    /* pkt_batch contains packets with different 'dl_type'. We have to
> +     * call conntrack_execute() on packets with the same 'dl_type'. */

Whitespace.