Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88258
b: refs/heads/master
c: bcf0dda
h: refs/heads/master
v: v3
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Apr 9, 2008
1 parent 80b7a93 commit 31d25f3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 21f644f3eabde637f255f75ad05d0821a7a36b7f
refs/heads/master: bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72
2 changes: 1 addition & 1 deletion trunk/net/xfrm/xfrm_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ 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->props.mode == XFRM_MODE_TRANSPORT)
if (!x->sel.family)
x->sel.family = p->family;

}
Expand Down

0 comments on commit 31d25f3

Please sign in to comment.