aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-05-11 14:40:51 +0200
committerPatrick McHardy <kaber@trash.net>2010-05-11 14:40:51 +0200
commitf30a77842129b5656360cc1f5db48a3fcfb64528 (patch)
tree3a01eac73fd0e86d3c7a976ab6bccca9878cd35c /include
parentipv6: ip6mr: remove net pointer from struct mfc6_cache (diff)
downloadlinux-dev-f30a77842129b5656360cc1f5db48a3fcfb64528.tar.xz
linux-dev-f30a77842129b5656360cc1f5db48a3fcfb64528.zip
ipv6: ip6mr: convert struct mfc_cache to struct list_head
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mroute6.h2
-rw-r--r--include/net/netns/ipv6.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index 04e2e54d0404..94a0cb521ca9 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -182,7 +182,7 @@ struct mif_device {
#define VIFF_STATIC 0x8000
struct mfc6_cache {
- struct mfc6_cache *next; /* Next entry on cache line */
+ struct list_head list;
struct in6_addr mf6c_mcastgrp; /* Group the entry belongs to */
struct in6_addr mf6c_origin; /* Source of packet */
mifi_t mf6c_parent; /* Source interface */
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 43d842ab004e..9cb3b5f2cd75 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -61,8 +61,8 @@ struct netns_ipv6 {
#ifdef CONFIG_IPV6_MROUTE
struct sock *mroute6_sk;
struct timer_list ipmr_expire_timer;
- struct mfc6_cache *mfc6_unres_queue;
- struct mfc6_cache **mfc6_cache_array;
+ struct list_head mfc6_unres_queue;
+ struct list_head *mfc6_cache_array;
struct mif_device *vif6_table;
int maxvif;
atomic_t cache_resolve_queue_len;