leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IPSEC]: Add netlink interface for the encapsulation family.

Browse Source 
Signed-off-by: Miika Komu <miika@iki.fi>
Signed-off-by: Diego Beltrami <Diego.Beltrami@hiit.fi>
Signed-off-by: Kazunori Miyazawa <miyazawa@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Miika Komu 2006-11-30 16:40:51 -08:00 committed by David S. Miller
parent 76b3f055f3
commit 8511d01d7c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/xfrm/xfrm_user.c
View File

@ -858,6 +858,7 @@ static void copy_templates(struct xfrm_policy *xp, struct xfrm_user_tmpl *ut,
int i; int i;
xp->xfrm_nr = nr; xp->xfrm_nr = nr;
xp->family = ut->family;
for (i = 0; i < nr; i++, ut++) { for (i = 0; i < nr; i++, ut++) {
struct xfrm_tmpl *t = &xp->xfrm_vec[i]; struct xfrm_tmpl *t = &xp->xfrm_vec[i];
@ -871,6 +872,7 @@ static void copy_templates(struct xfrm_policy *xp, struct xfrm_user_tmpl *ut,
t->aalgos = ut->aalgos; t->aalgos = ut->aalgos;
t->ealgos = ut->ealgos; t->ealgos = ut->ealgos;
t->calgos = ut->calgos; t->calgos = ut->calgos;
t->encap_family = ut->family;
} }
} }
@ -1024,7 +1026,7 @@ static int copy_to_user_tmpl(struct xfrm_policy *xp, struct sk_buff *skb)
struct xfrm_tmpl *kp = &xp->xfrm_vec[i]; struct xfrm_tmpl *kp = &xp->xfrm_vec[i];
memcpy(&up->id, &kp->id, sizeof(up->id)); memcpy(&up->id, &kp->id, sizeof(up->id));
up->family = xp->family; up->family = kp->encap_family;
memcpy(&up->saddr, &kp->saddr, sizeof(up->saddr)); memcpy(&up->saddr, &kp->saddr, sizeof(up->saddr));
up->reqid = kp->reqid; up->reqid = kp->reqid;
up->mode = kp->mode; up->mode = kp->mode;