Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[~andy/linux] / net / xfrm / xfrm_user.c

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index eb872b2e366e1209993efe470bed7f614a299098..fbd9e6cd0fd7a1297d99b48c37cc6de8ce938bbf 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1112,7 +1112,7 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh,
        mark = xfrm_mark_get(attrs, &m);
        if (p->info.seq) {
                x = xfrm_find_acq_byseq(net, mark, p->info.seq);
-               if (x && xfrm_addr_cmp(&x->id.daddr, daddr, family)) {
+               if (x && !xfrm_addr_equal(&x->id.daddr, daddr, family)) {
                        xfrm_state_put(x);
                        x = NULL;
                }