On Fri, Sep 13, 2013 at 03:07:12PM -0700, Jesse Gross wrote:

On Mon, Sep 9, 2013 at 12:20 AM, Simon Horman [off-list ref] wrote:

quoted

diff --git a/datapath/actions.c b/datapath/actions.c
index 30ea1d2..6741d81 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c

@@ -105,22 +105,29 @@ static int pop_vlan(struct sk_buff *skb)
        return 0;
 }

-static int push_vlan(struct sk_buff *skb, const struct ovs_action_push_vlan *vlan)
+/* push down current VLAN tag */
+static struct sk_buff *put_vlan(struct sk_buff *skb)

This never changes the skb, right? Can we simplify things and just
return an error code?

Yes. I'm not sure what I was thinking when I chose not to do that
but I will change things around as you suggest.