commit 23d5b0d5510242dc9622c3c63cfed01695dd94d0
author Thomas Egerer <hakke_007@gmx.de> Sun Mar 17 00:56:01 2013 +0000
committer Stephen Hemminger <stephen@networkplumber.org> Mon Mar 18 10:23:00 2013 -0700
tree 73b6cdb9c11d6501d5e5f4efd7ce0769a82c9e01
parent 4cd20da16ffa96f3c67ef7b064ad87f6c8547824

ip xfrm state: Allow different selector family

Do not enforce the selector of a state to have the same address family
as the id. This makes it possible to configure inter family states.

Signed-off-by: Thomas Egerer <hakke_007@gmx.de>

ip/xfrm_state.c

diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index 35957bd..6ff5b51 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -294,7 +294,9 @@
 			xfrm_state_flag_parse(&req.xsinfo.flags, &argc, &argv);
 		} else if (strcmp(*argv, "sel") == 0) {
 			NEXT_ARG();
+			preferred_family = AF_UNSPEC;
 			xfrm_selector_parse(&req.xsinfo.sel, &argc, &argv);
+			preferred_family = req.xsinfo.sel;
 		} else if (strcmp(*argv, "limit") == 0) {
 			NEXT_ARG();
 			xfrm_lifetime_cfg_parse(&req.xsinfo.lft, &argc, &argv);