From e836e3b86c41147ace0cbee04fd45a425088b331 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Mon, 28 Apr 2008 03:17:38 +0900 Subject: [PATCH] --- yaml --- r: 102867 b: refs/heads/master c: 81b302a321a0d99ff172b8cb2a8de17bff2f9499 h: refs/heads/master i: 102865: 96ac97fae57fe6906d1f8a7256d3a8bf56c28346 102863: 6666f1ea66059e89ad787810cc0f3aabdee5746c v: v3 --- [refs] | 2 +- trunk/net/key/af_key.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index cda691b3606e..9148eca6e1af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f95ac9111f75aa240dc3bcabffc0f047f13cb64 +refs/heads/master: 81b302a321a0d99ff172b8cb2a8de17bff2f9499 diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c index 771bd61d6303..841af9f2d5e0 100644 --- a/trunk/net/key/af_key.c +++ b/trunk/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) {