Skip to content

L
linux-davinci
Commit 81b302a3 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki
Browse files
Options

key: Use xfrm_addr_cmp() where appropriate. 

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
parent 5f95ac91
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 8 deletions
net/key/af_key.c
View file @ 81b302a3
...@@ -767,14 +767,7 @@ static struct sk_buff *__pfkey_xfrm_state2msg(struct xfrm_state *x, ...@@ -767,14 +767,7 @@ static struct sk_buff *__pfkey_xfrm_state2msg(struct xfrm_state *x,
} }
/* identity & sensitivity */ /* identity & sensitivity */
if (xfrm_addr_cmp(&x->sel.saddr, &x->props.saddr, x->props.family))
if ((x->props.family == AF_INET &&
x->sel.saddr.a4 != x->props.saddr.a4)
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
|| (x->props.family == AF_INET6 &&
memcmp (x->sel.saddr.a6, x->props.saddr.a6, sizeof (struct in6_addr)))
#endif
)
size += sizeof(struct sadb_address) + sockaddr_size; size += sizeof(struct sadb_address) + sockaddr_size;
if (add_keys) { if (add_keys) {
......
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