diff options
| author | Neil Brown <neilb@suse.de> | 2008-07-11 21:57:40 +1000 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2008-07-11 21:57:40 +1000 |
| commit | 0306d5efbf897c7d410fd30b89fc7d97372aa501 (patch) | |
| tree | 668811bca39ca7c1585da88d52ec2f0a43216c0e /net/xfrm/xfrm_user.c | |
| parent | f9f278fefdbbbf198bb4111b3fba47d9043dae59 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'net/xfrm/xfrm_user.c')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index b976d9ed10e..04c41504f84 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -277,9 +277,8 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info * memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr)); x->props.flags = p->flags; - if (!x->sel.family) + if (!x->sel.family && !(p->flags & XFRM_STATE_AF_UNSPEC)) x->sel.family = p->family; - } /* |