ip xfrm policy: allow different tmpl family

Allow tmpl IP addresses to have a different family than
selector addresses.  This is useful in conjunction with
XFRM_STATE_AF_UNSPEC.

Signed-off-by: Alex Badea <abadea@ixiacom.com>

diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c
index 11116e5fef16c1be9ffc39375e6cd39f18795d52..27884773fc1aed14a004e66d4ec26ffe5de83720 100644 (file)
--- a/ip/xfrm_policy.c
+++ b/ip/xfrm_policy.c
@@ -201,10 +201,10 @@ static int xfrm_tmpl_parse(struct xfrm_user_tmpl *tmpl,
                                break;
                        }
                        idp = *argv;
+                       preferred_family = AF_UNSPEC;
                        xfrm_id_parse(&tmpl->saddr, &tmpl->id, &tmpl->family,
                                      0, &argc, &argv);
-                       if (preferred_family == AF_UNSPEC)
-                               preferred_family = tmpl->family;
+                       preferred_family = tmpl->family;
                }
 
                if (!NEXT_ARG_OK())