vxlan: fix missing options_len update on RX with collect metadata
authorDaniel Borkmann <daniel@iogearbox.net>
Wed, 2 Mar 2016 01:32:08 +0000 (02:32 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Mar 2016 22:10:31 +0000 (17:10 -0500)
commit4024fcf70556311521e7b6cf79fa50e16f31013a
treef259b09b3a9da9d1ac26da99a1daf1eb3441c4da
parent42a67c9b0c0853f6a1159bd54ed0ba50df9f9ad8
vxlan: fix missing options_len update on RX with collect metadata

When signalling to metadata consumers that the metadata_dst entry
carries additional GBP extension data for vxlan (TUNNEL_VXLAN_OPT),
the dst's vxlan_metadata information is populated, but options_len
is left to zero. F.e. in ovs, ovs_flow_key_extract() checks for
options_len before extracting the data through ip_tunnel_info_opts_get().

Geneve uses ip_tunnel_info_opts_set() helper in receive path, which
sets options_len internally, vxlan however uses ip_tunnel_info_opts(),
so when filling vxlan_metadata, we do need to update options_len.

Fixes: 4c22279848c5 ("ip-tunnel: Use API to access tunnel metadata options.")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vxlan.c