IB/core: Add support for "send with invalidate" work requests

[karo-tx-linux.git] / net / xfrm / xfrm_user.c

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 78338079b7f579d07ad4267ae782a1bfea2613e2..019d21de19b3222b8983fa65537e909715eb63e3 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -288,12 +288,9 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
        memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
        x->props.flags = p->flags;
 
-       /*
-        * Set inner address family if the KM left it as zero.
-        * See comment in validate_tmpl.
-        */
        if (!x->sel.family)
                x->sel.family = p->family;
+
 }
 
 /*
@@ -1105,6 +1102,7 @@ static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p,
        return xp;
  error:
        *errp = err;
+       xp->dead = 1;
        xfrm_policy_destroy(xp);
        return NULL;
 }