summaryrefslogtreecommitdiff
path: root/include/linux/mroute.h
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-04-13 09:03:20 +0400
committerDavid S. Miller <davem@davemloft.net>2010-04-14 01:49:33 +0400
commitd658f8a0e63b6476148162aa7a3ffffc58dcad52 (patch)
tree25087c18eb91bbe040cf5c9b5e1710d35e37328f /include/linux/mroute.h
parente258beb22f4d3ea3dc88586ffc9c990d0eb03380 (diff)
downloadlinux-d658f8a0e63b6476148162aa7a3ffffc58dcad52.tar.xz
ipv4: ipmr: remove net pointer from struct mfc_cache
Now that cache entries in unres_queue don't need to be distinguished by their network namespace pointer anymore, we can remove it from struct mfc_cache add pass the namespace as function argument to the functions that need it. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mroute.h')
-rw-r--r--include/linux/mroute.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index c5f3d53548e2..de7780a6dd32 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -192,9 +192,6 @@ struct vif_device {
struct mfc_cache {
struct mfc_cache *next; /* Next entry on cache line */
-#ifdef CONFIG_NET_NS
- struct net *mfc_net;
-#endif
__be32 mfc_mcastgrp; /* Group the entry belongs to */
__be32 mfc_origin; /* Source of packet */
vifi_t mfc_parent; /* Source interface */
@@ -217,18 +214,6 @@ struct mfc_cache {
} mfc_un;
};
-static inline
-struct net *mfc_net(const struct mfc_cache *mfc)
-{
- return read_pnet(&mfc->mfc_net);
-}
-
-static inline
-void mfc_net_set(struct mfc_cache *mfc, struct net *net)
-{
- write_pnet(&mfc->mfc_net, hold_net(net));
-}
-
#define MFC_STATIC 1
#define MFC_NOTIFY 2