diff options
| author |   Pravin B Shelar <pshelar@nicira.com> | 2015-08-30 18:09:38 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-31 12:28:56 -0700 |
| commit | 4c22279848c531fc7f555d463daf3d0df963bd41 (patch) | |
| tree | 38315c4715393860962cc00a19f47fa1554b6add /net/ipv4/ip_tunnel_core.c | |
| parent | ipv4: fix 32b build (diff) | |
| download | linux-dev-4c22279848c531fc7f555d463daf3d0df963bd41.tar.xz linux-dev-4c22279848c531fc7f555d463daf3d0df963bd41.zip | |
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>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
| -rw-r--r-- | net/ipv4/ip_tunnel_core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index 0c756ade1cf7..29ed6c5a5185 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -249,7 +249,6 @@ static int ip_tun_build_state(struct net_device *dev, struct nlattr *attr, tun_info->key.tun_flags = nla_get_u16(tb[LWTUNNEL_IP_FLAGS]); tun_info->mode = IP_TUNNEL_INFO_TX; - tun_info->options = NULL; tun_info->options_len = 0; *ts = new_state; @@ -357,7 +356,6 @@ static int ip6_tun_build_state(struct net_device *dev, struct nlattr *attr, tun_info->key.tun_flags = nla_get_u16(tb[LWTUNNEL_IP6_FLAGS]); tun_info->mode = IP_TUNNEL_INFO_TX | IP_TUNNEL_INFO_IPV6; - tun_info->options = NULL; tun_info->options_len = 0; *ts = new_state; |