aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv6/route.c3
-rw-r--r--net/ipv6/tcp_ipv6.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 6264ec3bb154..b46ad53044ba 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2489,8 +2489,9 @@ ctl_table ipv6_route_table[] = {
2489 2489
2490void __init ip6_route_init(void) 2490void __init ip6_route_init(void)
2491{ 2491{
2492#ifdef CONFIG_PROC_FS
2492 struct proc_dir_entry *p; 2493 struct proc_dir_entry *p;
2493 2494#endif
2494 ip6_dst_ops.kmem_cachep = 2495 ip6_dst_ops.kmem_cachep =
2495 kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0, 2496 kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0,
2496 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); 2497 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 2b668a6ae698..e2f25ea43b68 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1947,6 +1947,7 @@ static int tcp_v6_destroy_sock(struct sock *sk)
1947 return inet6_destroy_sock(sk); 1947 return inet6_destroy_sock(sk);
1948} 1948}
1949 1949
1950#ifdef CONFIG_PROC_FS
1950/* Proc filesystem TCPv6 sock list dumping. */ 1951/* Proc filesystem TCPv6 sock list dumping. */
1951static void get_openreq6(struct seq_file *seq, 1952static void get_openreq6(struct seq_file *seq,
1952 struct sock *sk, struct request_sock *req, int i, int uid) 1953 struct sock *sk, struct request_sock *req, int i, int uid)
@@ -2063,7 +2064,6 @@ static void get_timewait6_sock(struct seq_file *seq,
2063 atomic_read(&tw->tw_refcnt), tw); 2064 atomic_read(&tw->tw_refcnt), tw);
2064} 2065}
2065 2066
2066#ifdef CONFIG_PROC_FS
2067static int tcp6_seq_show(struct seq_file *seq, void *v) 2067static int tcp6_seq_show(struct seq_file *seq, void *v)
2068{ 2068{
2069 struct tcp_iter_state *st; 2069 struct tcp_iter_state *st;