diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 11:07:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 11:07:15 +0100 |
| commit | e37c83c06c2690157a989df40dc99a6b61c9ea15 (patch) | |
| tree | 024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /include/net/netns/ipv4.h | |
| parent | ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
| download | kernel_samsung_tuna-e37c83c06c2690157a989df40dc99a6b61c9ea15.zip kernel_samsung_tuna-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.gz kernel_samsung_tuna-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.bz2 | |
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'include/net/netns/ipv4.h')
| -rw-r--r-- | include/net/netns/ipv4.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 2764994..d68c3f1 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -55,19 +55,14 @@ struct netns_ipv4 { int sysctl_rt_cache_rebuild_count; int current_rt_cache_rebuild_count; - 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; +#ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES + struct mr_table *mrt; +#else + struct list_head mr_tables; + struct fib_rules_ops *mr_rules_ops; #endif #endif }; |