ip-tunnel: Use API to access tunnel metadata options.

Currently tun-info options pointer is used in few cases to
pass options around. But tunnel options can be accessed using
ip_tunnel_info_opts() API without using the pointer. Following
patch removes the redundant pointer and consistently make use
of API.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Reviewed-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 3 deletions

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index bed8d09230cd..c8db44ab2ee7 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -702,12 +702,13 @@ int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info,
                         return -EINVAL;
                 memcpy(&key->tun_key, &tun_info->key, sizeof(key->tun_key));
 
-                if (tun_info->options) {
+                if (tun_info->options_len) {
                         BUILD_BUG_ON((1 << (sizeof(tun_info->options_len) *
                                                    8)) - 1
                                         > sizeof(key->tun_opts));
-                        memcpy(TUN_METADATA_OPTS(key, tun_info->options_len),
-                               tun_info->options, tun_info->options_len);
+
+                        ip_tunnel_info_opts_get(TUN_METADATA_OPTS(key, tun_info->options_len),
+                                                tun_info);
                         key->tun_opts_len = tun_info->options_len;
                 } else {
                         key->tun_opts_len = 0;