diff options
| author | James Morris <jmorris@namei.org> | 2009-03-28 14:57:13 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-28 14:57:13 +1100 |
| commit | bb798169d1bb860b07192cf9c75937fadc8610b4 (patch) | |
| tree | fa67f14406a1e79897e6f29e59fed7c02ec31c30 /include/net/netns/ipv4.h | |
| parent | a106cbfd1f3703402fc2d95d97e7a054102250f0 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'include/net/netns/ipv4.h')
| -rw-r--r-- | include/net/netns/ipv4.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 977f482d97a9..2eb3814d6258 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -54,5 +54,18 @@ struct netns_ipv4 { struct timer_list rt_secret_timer; atomic_t rt_genid; + +#ifdef CONFIG_IP_MROUTE + struct sock *mroute_sk; + struct mfc_cache **mfc_cache_array; + struct vif_device *vif_table; + int maxvif; + atomic_t cache_resolve_queue_len; + int mroute_do_assert; + int mroute_do_pim; +#if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2) + int mroute_reg_vif_num; +#endif +#endif }; #endif |