xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Pravin B Shelar
2015-08-30 18:09:38 -07:00
committed by David S. Miller
parent d1bfc62591
commit 4c22279848
16 changed files with 100 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/vxlan.c
View File

@@ -1271,7 +1271,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
goto drop;
info = &tun_dst->u.tun_info;
md = ip_tunnel_info_opts(info, sizeof(*md));
md = ip_tunnel_info_opts(info);
} else {
memset(md, 0, sizeof(*md));
}
@@ -1948,7 +1948,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
tos = info->key.tos;
if (info->options_len)
md = ip_tunnel_info_opts(info, sizeof(*md));
md = ip_tunnel_info_opts(info);
} else {
md->gbp = skb->mark;
}