aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netns
diff options
context:
space:
mode:
authorBenjamin Thery <benjamin.thery@bull.net>2008-12-10 19:27:21 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-10 19:27:21 -0500
commit4045e57c19bee150370390545ee8a933b3f7a18d (patch)
treea4744efeed6819eff5acd9c13ca0fafe71df144d /include/net/netns
parent4a6258a0e33d042e4c84d9dec25d45ddb40a70b3 (diff)
netns: ip6mr: declare counter cache_resolve_queue_len per-namespace
Preliminary work to make IPv6 multicast forwarding netns-aware. Declare variable cache_resolve_queue_len per-namespace: moves it into struct netns_ipv6. This variable counts the number of unresolved cache entries queued in the list mfc_unres_queue. This list is kept global to all netns as the number of entries per namespace is limited to 10 (hardcoded in routine ip6mr_cache_unresolved). Entries belonging to different namespaces in mfc_unres_queue will be identified by matching the mfc_net member introduced previously in struct mfc6_cache. Keeping this list global to all netns, also allows us to keep a single timer (ipmr_expire_timer) to handle their expiration. In some places cache_resolve_queue_len value was tested for arming or deleting the timer. These tests were equivalent to testing mfc_unres_queue value instead and are replaced in this patch. At the moment, cache_resolve_queue_len is only referenced in init_net. Signed-off-by: Benjamin Thery <benjamin.thery@bull.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netns')
-rw-r--r--include/net/netns/ipv6.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 14c1bbe68a85..30572f3f9781 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -60,6 +60,7 @@ struct netns_ipv6 {
60 struct mfc6_cache **mfc6_cache_array; 60 struct mfc6_cache **mfc6_cache_array;
61 struct mif_device *vif6_table; 61 struct mif_device *vif6_table;
62 int maxvif; 62 int maxvif;
63 atomic_t cache_resolve_queue_len;
63#endif 64#endif
64}; 65};
65#endif 66#endif