diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 23:30:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 23:30:45 -0700 |
| commit | bf47f4b0babe287f250dd720b41ecad9b8f7ac9b (patch) | |
| tree | 0829ef3bff455f98155b5cb0e91b71db36de3510 /include/net | |
| parent | 0b9715e64f7d46a9620d4d5042a5e28f5595ed54 (diff) | |
| parent | 5b285cac3570a935aaa28312c1ea28f9e01c5452 (diff) | |
| download | kernel_samsung_tuna-bf47f4b0babe287f250dd720b41ecad9b8f7ac9b.zip kernel_samsung_tuna-bf47f4b0babe287f250dd720b41ecad9b8f7ac9b.tar.gz kernel_samsung_tuna-bf47f4b0babe287f250dd720b41ecad9b8f7ac9b.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netns/ipv6.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 1f11ebc..81abfcb 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -59,15 +59,11 @@ struct netns_ipv6 { struct sock *tcp_sk; struct sock *igmp_sk; #ifdef CONFIG_IPV6_MROUTE - struct sock *mroute6_sk; - struct mfc6_cache **mfc6_cache_array; - struct mif_device *vif6_table; - int maxvif; - atomic_t cache_resolve_queue_len; - int mroute_do_assert; - int mroute_do_pim; -#ifdef CONFIG_IPV6_PIMSM_V2 - int mroute_reg_vif_num; +#ifndef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES + struct mr6_table *mrt6; +#else + struct list_head mr6_tables; + struct fib_rules_ops *mr6_rules_ops; #endif #endif }; |