aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-25 20:51:01 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-25 20:51:01 -0500
commitdb983c1144884cab10d6397532f4bf05eb0c01d2 (patch)
treeebb86abdaeb916191424407881d52635019502cf /net/xfrm
parent7067802e262457a9737521e5669b622028b2283a (diff)
netns xfrm: KM reporting in netns
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_state.c4
-rw-r--r--net/xfrm/xfrm_user.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 21db37ab0a2f..d594b5af5f6b 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1833,7 +1833,7 @@ int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
1833EXPORT_SYMBOL(km_migrate); 1833EXPORT_SYMBOL(km_migrate);
1834#endif 1834#endif
1835 1835
1836int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr) 1836int km_report(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr)
1837{ 1837{
1838 int err = -EINVAL; 1838 int err = -EINVAL;
1839 int ret; 1839 int ret;
@@ -1842,7 +1842,7 @@ int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr)
1842 read_lock(&xfrm_km_lock); 1842 read_lock(&xfrm_km_lock);
1843 list_for_each_entry(km, &xfrm_km_list, list) { 1843 list_for_each_entry(km, &xfrm_km_list, list) {
1844 if (km->report) { 1844 if (km->report) {
1845 ret = km->report(proto, sel, addr); 1845 ret = km->report(net, proto, sel, addr);
1846 if (!ret) 1846 if (!ret)
1847 err = ret; 1847 err = ret;
1848 } 1848 }
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 3e32ec2ea1ad..b7240d5b77ad 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2520,10 +2520,9 @@ nla_put_failure:
2520 return -EMSGSIZE; 2520 return -EMSGSIZE;
2521} 2521}
2522 2522
2523static int xfrm_send_report(u8 proto, struct xfrm_selector *sel, 2523static int xfrm_send_report(struct net *net, u8 proto,
2524 xfrm_address_t *addr) 2524 struct xfrm_selector *sel, xfrm_address_t *addr)
2525{ 2525{
2526 struct net *net = &init_net;
2527 struct sk_buff *skb; 2526 struct sk_buff *skb;
2528 2527
2529 skb = nlmsg_new(xfrm_report_msgsize(), GFP_ATOMIC); 2528 skb = nlmsg_new(xfrm_report_msgsize(), GFP_ATOMIC);