Commit 0eb8eb2f authored by Xin Long's avatar Xin Long Committed by David S. Miller

lwtunnel: add options process for cmp_encap

When comparing two tun_info, dst_cache member should have been skipped,
as dst_cache is a per cpu pointer and they are always different values
even in two tun_info with the same keys.

So this patch is to skip dst_cache member and compare the key, mode and
options_len only. For the future opts setting support, also to compare
options.

Fixes: 2d798499 ("lwtunnel: ip tunnel: fix multiple routes with different encap")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f52f11ec
...@@ -315,8 +315,14 @@ static int ip_tun_encap_nlsize(struct lwtunnel_state *lwtstate) ...@@ -315,8 +315,14 @@ static int ip_tun_encap_nlsize(struct lwtunnel_state *lwtstate)
static int ip_tun_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b) static int ip_tun_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b)
{ {
return memcmp(lwt_tun_info(a), lwt_tun_info(b), struct ip_tunnel_info *info_a = lwt_tun_info(a);
sizeof(struct ip_tunnel_info)); struct ip_tunnel_info *info_b = lwt_tun_info(b);
return memcmp(info_a, info_b, sizeof(info_a->key)) ||
info_a->mode != info_b->mode ||
info_a->options_len != info_b->options_len ||
memcmp(ip_tunnel_info_opts(info_a),
ip_tunnel_info_opts(info_b), info_a->options_len);
} }
static const struct lwtunnel_encap_ops ip_tun_lwt_ops = { static const struct lwtunnel_encap_ops ip_tun_lwt_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment