On Wed, Mar 4, 2015 at 1:59 PM, Andy Zhou <az...@nicira.com> wrote:
> It probably needs to fold in the following changes. Without them,
> there are compiler warnings.
>
> With those changes,
> Acked-by: Andy Zhou <az...@nicira.com>
>
>
> diff --git a/datapath/actions.c b/datapath/actions.c
> index 66660d9..296ab79 100644
> --- a/datapath/actions.c
> +++ b/datapath/actions.c
> @@ -449,7 +449,6 @@ static int sample(struct datapath *dp, struct sk_buff
> *skb,
> {
> const struct nlattr *acts_list = NULL;
> const struct nlattr *a;
> - struct sk_buff *sample_skb;
> int rem;
>
> for (a = nla_data(attr), rem = nla_len(attr); rem > 0;
> @@ -486,7 +485,7 @@ static int sample(struct datapath *dp, struct sk_buff
> *skb,
> /* Skip the sample action when out of memory. */
> return 0;
>
> - return do_execute_actions(dp, sample_skb, a, rem);
> + return do_execute_actions(dp, skb, a, rem);
> }
>
> static void execute_hash(struct sk_buff *skb, const struct nlattr *attr)
>
I fixed it and pushed to branch-2.3
Thanks.
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
