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
9cab9a80
Commit
9cab9a80
authored
Mar 21, 2004
by
Hideaki Yoshifuji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[XFRM] remove unused argument for (*find_bundle)().
parent
27fbbc57
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
include/net/xfrm.h
include/net/xfrm.h
+1
-1
net/ipv4/xfrm4_policy.c
net/ipv4/xfrm4_policy.c
+1
-1
net/ipv6/xfrm6_policy.c
net/ipv6/xfrm6_policy.c
+1
-1
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_policy.c
+3
-3
No files found.
include/net/xfrm.h
View file @
9cab9a80
...
@@ -166,7 +166,7 @@ struct xfrm_policy_afinfo {
...
@@ -166,7 +166,7 @@ struct xfrm_policy_afinfo {
struct
dst_ops
*
dst_ops
;
struct
dst_ops
*
dst_ops
;
void
(
*
garbage_collect
)(
void
);
void
(
*
garbage_collect
)(
void
);
int
(
*
dst_lookup
)(
struct
xfrm_dst
**
dst
,
struct
flowi
*
fl
);
int
(
*
dst_lookup
)(
struct
xfrm_dst
**
dst
,
struct
flowi
*
fl
);
struct
dst_entry
*
(
*
find_bundle
)(
struct
flowi
*
fl
,
struct
rtable
*
rt
,
struct
xfrm_policy
*
policy
);
struct
dst_entry
*
(
*
find_bundle
)(
struct
flowi
*
fl
,
struct
xfrm_policy
*
policy
);
int
(
*
bundle_create
)(
struct
xfrm_policy
*
policy
,
int
(
*
bundle_create
)(
struct
xfrm_policy
*
policy
,
struct
xfrm_state
**
xfrm
,
struct
xfrm_state
**
xfrm
,
int
nx
,
int
nx
,
...
...
net/ipv4/xfrm4_policy.c
View file @
9cab9a80
...
@@ -43,7 +43,7 @@ static int __xfrm4_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl)
...
@@ -43,7 +43,7 @@ static int __xfrm4_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl)
}
}
static
struct
dst_entry
*
static
struct
dst_entry
*
__xfrm4_find_bundle
(
struct
flowi
*
fl
,
struct
rtable
*
rt
,
struct
xfrm_policy
*
policy
)
__xfrm4_find_bundle
(
struct
flowi
*
fl
,
struct
xfrm_policy
*
policy
)
{
{
struct
dst_entry
*
dst
;
struct
dst_entry
*
dst
;
...
...
net/ipv6/xfrm6_policy.c
View file @
9cab9a80
...
@@ -52,7 +52,7 @@ static int __xfrm6_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl)
...
@@ -52,7 +52,7 @@ static int __xfrm6_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl)
}
}
static
struct
dst_entry
*
static
struct
dst_entry
*
__xfrm6_find_bundle
(
struct
flowi
*
fl
,
struct
rtable
*
rt
,
struct
xfrm_policy
*
policy
)
__xfrm6_find_bundle
(
struct
flowi
*
fl
,
struct
xfrm_policy
*
policy
)
{
{
struct
dst_entry
*
dst
;
struct
dst_entry
*
dst
;
...
...
net/xfrm/xfrm_policy.c
View file @
9cab9a80
...
@@ -646,13 +646,13 @@ xfrm_tmpl_resolve(struct xfrm_policy *policy, struct flowi *fl,
...
@@ -646,13 +646,13 @@ xfrm_tmpl_resolve(struct xfrm_policy *policy, struct flowi *fl,
*/
*/
static
struct
dst_entry
*
static
struct
dst_entry
*
xfrm_find_bundle
(
struct
flowi
*
fl
,
struct
rtable
*
rt
,
struct
xfrm_policy
*
policy
,
unsigned
short
family
)
xfrm_find_bundle
(
struct
flowi
*
fl
,
struct
xfrm_policy
*
policy
,
unsigned
short
family
)
{
{
struct
dst_entry
*
x
;
struct
dst_entry
*
x
;
struct
xfrm_policy_afinfo
*
afinfo
=
xfrm_policy_get_afinfo
(
family
);
struct
xfrm_policy_afinfo
*
afinfo
=
xfrm_policy_get_afinfo
(
family
);
if
(
unlikely
(
afinfo
==
NULL
))
if
(
unlikely
(
afinfo
==
NULL
))
return
ERR_PTR
(
-
EINVAL
);
return
ERR_PTR
(
-
EINVAL
);
x
=
afinfo
->
find_bundle
(
fl
,
rt
,
policy
);
x
=
afinfo
->
find_bundle
(
fl
,
policy
);
xfrm_policy_put_afinfo
(
afinfo
);
xfrm_policy_put_afinfo
(
afinfo
);
return
x
;
return
x
;
}
}
...
@@ -762,7 +762,7 @@ int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
...
@@ -762,7 +762,7 @@ int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
* LATER: help from flow cache. It is optional, this
* LATER: help from flow cache. It is optional, this
* is required only for output policy.
* is required only for output policy.
*/
*/
dst
=
xfrm_find_bundle
(
fl
,
rt
,
policy
,
family
);
dst
=
xfrm_find_bundle
(
fl
,
policy
,
family
);
if
(
IS_ERR
(
dst
))
{
if
(
IS_ERR
(
dst
))
{
xfrm_pol_put
(
policy
);
xfrm_pol_put
(
policy
);
return
PTR_ERR
(
dst
);
return
PTR_ERR
(
dst
);
...
...
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