aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-05-11 08:40:51 -0400
committerPatrick McHardy <kaber@trash.net>2010-05-11 08:40:51 -0400
commitf30a77842129b5656360cc1f5db48a3fcfb64528 (patch)
tree3a01eac73fd0e86d3c7a976ab6bccca9878cd35c /include
parentb5aa30b19121de49021fba57aa1f6e4c787fcf67 (diff)
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 {
182#define VIFF_STATIC 0x8000 182#define VIFF_STATIC 0x8000
183 183
184struct mfc6_cache { 184struct mfc6_cache {
185 struct mfc6_cache *next; /* Next entry on cache line */ 185 struct list_head list;
186 struct in6_addr mf6c_mcastgrp; /* Group the entry belongs to */ 186 struct in6_addr mf6c_mcastgrp; /* Group the entry belongs to */
187 struct in6_addr mf6c_origin; /* Source of packet */ 187 struct in6_addr mf6c_origin; /* Source of packet */
188 mifi_t mf6c_parent; /* Source interface */ 188 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 {
61#ifdef CONFIG_IPV6_MROUTE 61#ifdef CONFIG_IPV6_MROUTE
62 struct sock *mroute6_sk; 62 struct sock *mroute6_sk;
63 struct timer_list ipmr_expire_timer; 63 struct timer_list ipmr_expire_timer;
64 struct mfc6_cache *mfc6_unres_queue; 64 struct list_head mfc6_unres_queue;
65 struct mfc6_cache **mfc6_cache_array; 65 struct list_head *mfc6_cache_array;
66 struct mif_device *vif6_table; 66 struct mif_device *vif6_table;
67 int maxvif; 67 int maxvif;
68 atomic_t cache_resolve_queue_len; 68 atomic_t cache_resolve_queue_len;