[ovs-dev] [PATCH branch-2.3] dpif-netdev: Initialize upcall->packet when queuing to userspace.

Pravin Shelar pshelar at nicira.com
Mon Aug 4 22:46:39 UTC 2014


On Mon, Aug 4, 2014 at 12:16 PM, Ben Pfaff <blp at nicira.com> wrote:
> Only the data and size members were being initialized, but all of them
> should be.
>
> This is inspired by commit b6f4590fa036 (dpif-netdev: Initialize
> upcall->packet when queuing to userspace.) from master.  The background is
> not exactly the same as on master (the commit that it references is not
> on branch-2.3).
>
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> CC: Pravin Shelar <pshelar at nicira.com>

LGTM
Acked-by: Pravin B Shelar <pshelar at nicira.com>

> ---
>  lib/dpif-netdev.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
> index fb35306..69e15d7 100644
> --- a/lib/dpif-netdev.c
> +++ b/lib/dpif-netdev.c
> @@ -2077,6 +2077,7 @@ dp_netdev_output_userspace(struct dp_netdev *dp, struct ofpbuf *packet,
>          struct ofpbuf *buf = &u->buf;
>          size_t buf_size;
>          struct flow flow;
> +        void *data;
>
>          upcall->type = type;
>
> @@ -2100,8 +2101,8 @@ dp_netdev_output_userspace(struct dp_netdev *dp, struct ofpbuf *packet,
>                                            NLA_ALIGN(userdata->nla_len));
>          }
>
> -        ofpbuf_set_data(&upcall->packet,
> -                        ofpbuf_put(buf, ofpbuf_data(packet), ofpbuf_size(packet)));
> +        data = ofpbuf_put(buf, ofpbuf_data(packet), ofpbuf_size(packet));
> +        ofpbuf_use_stub(&upcall->packet, data, ofpbuf_size(packet));
>          ofpbuf_set_size(&upcall->packet, ofpbuf_size(packet));
>
>          seq_change(q->seq);
> --
> 1.7.10.4
>



More information about the dev mailing list