diff options
| author |   Simon Horman <simon.horman@netronome.com> | 2015-12-18 19:43:15 +0900 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-18 16:35:35 -0500 |
| commit | e905eabc90a5b787d8708df164543ee295bea5f2 (patch) | |
| tree | 1c6499a6ea057f27127ea88d238f4e94bb285544 /net | |
| parent | bnx2x: Prevent FW assertion when using Vxlan (diff) | |
| download | linux-dev-e905eabc90a5b787d8708df164543ee295bea5f2.tar.xz linux-dev-e905eabc90a5b787d8708df164543ee295bea5f2.zip | |
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: fc4099f17240 ("openvswitch: Fix egress tunnel info.")
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/flow_netlink.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index 907d6fd28ede..d1bd4a45ca2d 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -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); |