diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-05-11 14:40:50 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-05-11 14:40:50 +0200 |
| commit | b5aa30b19121de49021fba57aa1f6e4c787fcf67 (patch) | |
| tree | dbbf01015bda08d52750f37a797d49c7db1990a9 /include/linux/mroute6.h | |
| parent | c476efbcde5ba58b81ac752f4a894d6db8e17d94 (diff) | |
| download | kernel_samsung_smdk4412-b5aa30b19121de49021fba57aa1f6e4c787fcf67.zip kernel_samsung_smdk4412-b5aa30b19121de49021fba57aa1f6e4c787fcf67.tar.gz kernel_samsung_smdk4412-b5aa30b19121de49021fba57aa1f6e4c787fcf67.tar.bz2 | |
ipv6: ip6mr: remove net pointer from struct mfc6_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 mfc6_cache
add pass the namespace as function argument to the functions that need it.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/mroute6.h')
| -rw-r--r-- | include/linux/mroute6.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h index 2caa1a8..04e2e54 100644 --- a/include/linux/mroute6.h +++ b/include/linux/mroute6.h @@ -183,9 +183,6 @@ struct mif_device { struct mfc6_cache { struct mfc6_cache *next; /* Next entry on cache line */ -#ifdef CONFIG_NET_NS - struct net *mfc6_net; -#endif struct in6_addr mf6c_mcastgrp; /* Group the entry belongs to */ struct in6_addr mf6c_origin; /* Source of packet */ mifi_t mf6c_parent; /* Source interface */ @@ -208,18 +205,6 @@ struct mfc6_cache { } mfc_un; }; -static inline -struct net *mfc6_net(const struct mfc6_cache *mfc) -{ - return read_pnet(&mfc->mfc6_net); -} - -static inline -void mfc6_net_set(struct mfc6_cache *mfc, struct net *net) -{ - write_pnet(&mfc->mfc6_net, hold_net(net)); -} - #define MFC_STATIC 1 #define MFC_NOTIFY 2 |