diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-27 20:17:38 +0200 |
|---|---|---|
| committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-06-11 19:38:17 +0200 |
| commit | 81b302a321a0d99ff172b8cb2a8de17bff2f9499 (patch) | |
| tree | 4b12e8a36c801b1f14c45730a03bc40b40865996 /net/key | |
| parent | key: Share common code path to extract address from sockaddr{}. (diff) | |
| download | linux-81b302a321a0d99ff172b8cb2a8de17bff2f9499.tar.xz linux-81b302a321a0d99ff172b8cb2a8de17bff2f9499.zip | |
key: Use xfrm_addr_cmp() where appropriate.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net/key')
| -rw-r--r-- | net/key/af_key.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 771bd61d6303..841af9f2d5e0 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -767,14 +767,7 @@ static struct sk_buff *__pfkey_xfrm_state2msg(struct xfrm_state *x, } /* identity & sensitivity */ - - 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 - ) + if (xfrm_addr_cmp(&x->sel.saddr, &x->props.saddr, x->props.family)) size += sizeof(struct sadb_address) + sockaddr_size; if (add_keys) { |