summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBenjamin Thery <benjamin.thery@bull.net>2009-01-22 04:56:23 +0000
committerDavid S. Miller <davem@davemloft.net>2009-01-22 13:57:41 -0800
commit4feb88e5c694bfe414cbc3ce0e383f7f7038f90b (patch)
tree418140ffc541223205b921b9995b981a5cfbc2dd /include
parentf6bb451476be53d456e73bcfd82356afd680bbb0 (diff)
downloadlwn-4feb88e5c694bfe414cbc3ce0e383f7f7038f90b.tar.gz
lwn-4feb88e5c694bfe414cbc3ce0e383f7f7038f90b.zip
netns: ipmr: enable namespace support in ipv4 multicast routing code
This last patch makes the appropriate changes to use and propagate the network namespace where needed in IPv4 multicast routing code. This consists mainly in replacing all the remaining init_net occurences with current netns pointer retrieved from sockets, net devices or mfc_caches depending on the routines' contexts. Some routines receive a new 'struct net' parameter to propagate the current netns: * vif_add/vif_delete * ipmr_new_tunnel * mroute_clean_tables * ipmr_cache_find * ipmr_cache_report * ipmr_cache_unresolved * ipmr_mfc_add/ipmr_mfc_delete * ipmr_get_route * rt_fill_info (in route.c) Signed-off-by: Benjamin Thery <benjamin.thery@bull.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mroute.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index beaf3aae8aaf..0d45b4e8d367 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -256,7 +256,8 @@ void mfc_net_set(struct mfc_cache *mfc, struct net *net)
#ifdef __KERNEL__
struct rtmsg;
-extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
+extern int ipmr_get_route(struct net *net, struct sk_buff *skb,
+ struct rtmsg *rtm, int nowait);
#endif
#endif