From 0c5982fd7f209604cd8be5d41d2e8b0527a3f279 Mon Sep 17 00:00:00 2001 From: Thomas Egerer Date: Wed, 20 Mar 2013 02:18:43 -0700 Subject: [PATCH] ip xfrm state: Allow different selector family My previous commit introduced a patch to allow for states with different ip address families for selector and id. The must have somehow been a mixup of the patch I tested and the one I send, so the patch sent breaks the iproute2 build. This patch fixes this. My apologies. Signed-off-by: Thomas Egerer --- ip/xfrm_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c index 6ff5b51fd..c0cf88c2f 100644 --- a/ip/xfrm_state.c +++ b/ip/xfrm_state.c @@ -296,7 +296,7 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv) NEXT_ARG(); preferred_family = AF_UNSPEC; xfrm_selector_parse(&req.xsinfo.sel, &argc, &argv); - preferred_family = req.xsinfo.sel; + preferred_family = req.xsinfo.sel.family; } else if (strcmp(*argv, "limit") == 0) { NEXT_ARG(); xfrm_lifetime_cfg_parse(&req.xsinfo.lft, &argc, &argv); -- 2.47.2