| Submitter | Thomas Egerer |
|---|---|
| Date | March 17, 2013, 10:56 a.m. |
| Message ID | <5145A141.8000707@gmx.de> |
| Download | mbox | patch |
| Permalink | /patch/228290/ |
| State | Accepted |
| Delegated to: | stephen hemminger |
| Headers | show |
Comments
Patch
diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c index 8ac3437..aec49d6 100644 --- a/ip/xfrm_state.c +++ b/ip/xfrm_state.c @@ -300,7 +300,9 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv) 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);
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 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)