Commit e905eabc authored Dec 18, 2015 by Simon Horman Committed by David S. Miller Dec 18, 2015

openvswitch: correct encoding of set tunnel action attributes



In a set action tunnel attributes should be encoded in a
nested action.

I noticed this because ovs-dpctl was reporting an error
when dumping flows due to the incorrect encoding of tunnel attributes
in a set action.

Fixes: fc4099f1 ("openvswitch: Fix egress tunnel info.")
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ea2465af

net/openvswitch/flow_netlink.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2434,7 +2434,10 @@ static int set_action_to_attr(const struct nlattr a, struct sk_buff skb)
		if (!start)
		return -EMSGSIZE;

		err = ovs_nla_put_tunnel_info(skb, tun_info);
		err = ip_tun_to_nlattr(skb, &tun_info->key,
		ip_tunnel_info_opts(tun_info),
		tun_info->options_len,
		ip_tunnel_info_af(tun_info));
		if (err)
		return err;
		nla_nest_end(skb, start);