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

netns xfrm: state walking in netns

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan 2008-11-25 17:32:14 -08:00 committed by David S. Miller
parent 5447c5e401
commit 284fa7da30
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/xfrm.h
View File

@ -1307,7 +1307,7 @@ extern int xfrm_proc_init(void);
#endif #endif
extern void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto); extern void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto);
extern int xfrm_state_walk(struct xfrm_state_walk *walk, extern int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,
int (*func)(struct xfrm_state *, int, void*), void *); int (*func)(struct xfrm_state *, int, void*), void *);
extern void xfrm_state_walk_done(struct xfrm_state_walk *walk); extern void xfrm_state_walk_done(struct xfrm_state_walk *walk);
extern struct xfrm_state *xfrm_state_alloc(struct net *net); extern struct xfrm_state *xfrm_state_alloc(struct net *net);

2
net/key/af_key.c
View File

@ -1776,7 +1776,7 @@ static int dump_sa(struct xfrm_state *x, int count, void *ptr)
static int pfkey_dump_sa(struct pfkey_sock *pfk) static int pfkey_dump_sa(struct pfkey_sock *pfk)
{ {
return xfrm_state_walk(&pfk->dump.u.state, dump_sa, (void *) pfk); return xfrm_state_walk(&init_net, &pfk->dump.u.state, dump_sa, (void *) pfk);
} }
static void pfkey_dump_sa_done(struct pfkey_sock *pfk) static void pfkey_dump_sa_done(struct pfkey_sock *pfk)

6
net/xfrm/xfrm_state.c
View File

@ -1544,7 +1544,7 @@ unlock:
} }
EXPORT_SYMBOL(xfrm_alloc_spi); EXPORT_SYMBOL(xfrm_alloc_spi);
int xfrm_state_walk(struct xfrm_state_walk *walk, int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,
int (*func)(struct xfrm_state *, int, void*), int (*func)(struct xfrm_state *, int, void*),
void *data) void *data)
{ {
@ -1557,10 +1557,10 @@ int xfrm_state_walk(struct xfrm_state_walk *walk,
spin_lock_bh(&xfrm_state_lock); spin_lock_bh(&xfrm_state_lock);
if (list_empty(&walk->all)) if (list_empty(&walk->all))
x = list_first_entry(&init_net.xfrm.state_all, struct xfrm_state_walk, all); x = list_first_entry(&net->xfrm.state_all, struct xfrm_state_walk, all);
else else
x = list_entry(&walk->all, struct xfrm_state_walk, all); x = list_entry(&walk->all, struct xfrm_state_walk, all);
list_for_each_entry_from(x, &init_net.xfrm.state_all, all) { list_for_each_entry_from(x, &net->xfrm.state_all, all) {
if (x->state == XFRM_STATE_DEAD) if (x->state == XFRM_STATE_DEAD)
continue; continue;
state = container_of(x, struct xfrm_state, km); state = container_of(x, struct xfrm_state, km);

2
net/xfrm/xfrm_user.c
View File

@ -631,7 +631,7 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
xfrm_state_walk_init(walk, 0); xfrm_state_walk_init(walk, 0);
} }
(void) xfrm_state_walk(walk, dump_one_state, &info); (void) xfrm_state_walk(&init_net, walk, dump_one_state, &info);
return skb->len; return skb->len;
} }