Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
0d322099
Commit
0d322099
authored
Nov 13, 2002
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[XFRM]: Add family member to state/policy structs.
parent
1b159766
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
include/net/xfrm.h
include/net/xfrm.h
+2
-0
net/ipv4/xfrm_user.c
net/ipv4/xfrm_user.c
+4
-2
No files found.
include/net/xfrm.h
View file @
0d322099
...
...
@@ -96,6 +96,7 @@ struct xfrm_state
u8
replay_window
;
u8
aalgo
,
ealgo
,
calgo
;
u16
reqid
;
u16
family
;
xfrm_address_t
saddr
;
int
header_len
;
int
trailer_len
;
...
...
@@ -201,6 +202,7 @@ struct xfrm_policy
struct
xfrm_lifetime_cfg
lft
;
struct
xfrm_lifetime_cur
curlft
;
struct
dst_entry
*
bundles
;
__u16
family
;
__u8
action
;
__u8
flags
;
__u8
dead
;
...
...
net/ipv4/xfrm_user.c
View file @
0d322099
...
...
@@ -146,6 +146,7 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
x
->
props
.
mode
=
p
->
mode
;
x
->
props
.
replay_window
=
p
->
replay_window
;
x
->
props
.
reqid
=
p
->
reqid
;
x
->
props
.
family
=
p
->
family
;
x
->
props
.
saddr
=
x
->
sel
.
saddr
;
}
...
...
@@ -242,6 +243,7 @@ static void copy_to_user_state(struct xfrm_state *x, struct xfrm_usersa_info *p)
p
->
mode
=
x
->
props
.
mode
;
p
->
replay_window
=
x
->
props
.
replay_window
;
p
->
reqid
=
x
->
props
.
reqid
;
p
->
family
=
x
->
props
.
family
;
p
->
seq
=
x
->
km
.
seq
;
}
...
...
@@ -508,7 +510,7 @@ static void copy_from_user_policy(struct xfrm_policy *xp, struct xfrm_userpolicy
memcpy
(
&
xp
->
lft
,
&
p
->
lft
,
sizeof
(
xp
->
lft
));
xp
->
action
=
p
->
action
;
xp
->
flags
=
p
->
flags
;
/* XXX xp->family = p->family; */
xp
->
family
=
p
->
family
;
/* XXX xp->share = p->share; */
}
...
...
@@ -519,7 +521,7 @@ static void copy_to_user_policy(struct xfrm_policy *xp, struct xfrm_userpolicy_i
memcpy
(
&
p
->
curlft
,
&
xp
->
curlft
,
sizeof
(
p
->
curlft
));
p
->
priority
=
xp
->
priority
;
p
->
index
=
xp
->
index
;
p
->
family
=
AF_INET
;
/* XXX xp->family */
p
->
family
=
xp
->
family
;
p
->
dir
=
dir
;
p
->
action
=
xp
->
action
;
p
->
flags
=
xp
->
flags
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment