From: Kazunori MIYAZAWA Date: Tue, 13 Feb 2007 20:57:16 +0000 (-0800) Subject: [IPSEC]: Fix the address family to refer encap_family X-Git-Tag: v2.6.21-rc1~273^2~2^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=928ba4169dc1d82c83105831f5ddb5472379b440;p=~emulex%2Finfiniband.git [IPSEC]: Fix the address family to refer encap_family Fix the address family to refer encap_family when comparing with a kernel generated xfrm_state Signed-off-by: Kazunori MIYAZAWA Signed-off-by: David S. Miller --- diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index c394b413f65..946b715db5e 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1550,7 +1550,7 @@ xfrm_state_ok(struct xfrm_tmpl *tmpl, struct xfrm_state *x, unsigned short family) { if (xfrm_state_kern(x)) - return tmpl->optional && !xfrm_state_addr_cmp(tmpl, x, family); + return tmpl->optional && !xfrm_state_addr_cmp(tmpl, x, tmpl->encap_family); return x->id.proto == tmpl->id.proto && (x->id.spi == tmpl->id.spi || !tmpl->id.spi) && (x->props.reqid == tmpl->reqid || !tmpl->reqid) &&