diff options
| author | Thomas Graf <tgraf@suug.ch> | 2015-01-15 03:53:57 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-15 01:11:41 -0500 |
| commit | d91641d9b5047b0a0a4d223a0b87306e6dff8c02 (patch) | |
| tree | 71be4ee76366751f04786fdc3c4409e84d7ff8bc /net/openvswitch/flow.c | |
| parent | ac5132d1a03fe1ebbefb2382b36e829dff056283 (diff) | |
| download | talos-obmc-linux-d91641d9b5047b0a0a4d223a0b87306e6dff8c02.tar.gz talos-obmc-linux-d91641d9b5047b0a0a4d223a0b87306e6dff8c02.zip | |
openvswitch: Rename GENEVE_TUN_OPTS() to TUN_METADATA_OPTS()
Also factors out Geneve validation code into a new separate function
validate_and_copy_geneve_opts().
A subsequent patch will introduce VXLAN options. Rename the existing
GENEVE_TUN_OPTS() to reflect its extended purpose of carrying generic
tunnel metadata options.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow.c')
| -rw-r--r-- | net/openvswitch/flow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index df334fe43d7f..e2c348b8baca 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -691,7 +691,7 @@ int ovs_flow_key_extract(const struct ovs_tunnel_info *tun_info, BUILD_BUG_ON((1 << (sizeof(tun_info->options_len) * 8)) - 1 > sizeof(key->tun_opts)); - memcpy(GENEVE_OPTS(key, tun_info->options_len), + memcpy(TUN_METADATA_OPTS(key, tun_info->options_len), tun_info->options, tun_info->options_len); key->tun_opts_len = tun_info->options_len; } else { |
