diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/fib_hash.c | 4 | ||||
-rw-r--r-- | net/ipv4/fib_trie.c | 2 | ||||
-rw-r--r-- | net/ipv4/inetpeer.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipmr.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_conn.c | 2 | ||||
-rw-r--r-- | net/ipv4/route.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index 07e843a47dde..9ad1d9ff9ce7 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c | |||
@@ -771,13 +771,13 @@ struct fib_table * __init fib_hash_init(u32 id) | |||
771 | fn_hash_kmem = kmem_cache_create("ip_fib_hash", | 771 | fn_hash_kmem = kmem_cache_create("ip_fib_hash", |
772 | sizeof(struct fib_node), | 772 | sizeof(struct fib_node), |
773 | 0, SLAB_HWCACHE_ALIGN, | 773 | 0, SLAB_HWCACHE_ALIGN, |
774 | NULL, NULL); | 774 | NULL); |
775 | 775 | ||
776 | if (fn_alias_kmem == NULL) | 776 | if (fn_alias_kmem == NULL) |
777 | fn_alias_kmem = kmem_cache_create("ip_fib_alias", | 777 | fn_alias_kmem = kmem_cache_create("ip_fib_alias", |
778 | sizeof(struct fib_alias), | 778 | sizeof(struct fib_alias), |
779 | 0, SLAB_HWCACHE_ALIGN, | 779 | 0, SLAB_HWCACHE_ALIGN, |
780 | NULL, NULL); | 780 | NULL); |
781 | 781 | ||
782 | tb = kmalloc(sizeof(struct fib_table) + sizeof(struct fn_hash), | 782 | tb = kmalloc(sizeof(struct fib_table) + sizeof(struct fn_hash), |
783 | GFP_KERNEL); | 783 | GFP_KERNEL); |
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 30e332ade61b..9ca786a6fd3c 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
@@ -1970,7 +1970,7 @@ struct fib_table * __init fib_hash_init(u32 id) | |||
1970 | fn_alias_kmem = kmem_cache_create("ip_fib_alias", | 1970 | fn_alias_kmem = kmem_cache_create("ip_fib_alias", |
1971 | sizeof(struct fib_alias), | 1971 | sizeof(struct fib_alias), |
1972 | 0, SLAB_HWCACHE_ALIGN, | 1972 | 0, SLAB_HWCACHE_ALIGN, |
1973 | NULL, NULL); | 1973 | NULL); |
1974 | 1974 | ||
1975 | tb = kmalloc(sizeof(struct fib_table) + sizeof(struct trie), | 1975 | tb = kmalloc(sizeof(struct fib_table) + sizeof(struct trie), |
1976 | GFP_KERNEL); | 1976 | GFP_KERNEL); |
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index 2f44e6128068..6cbce96a54ce 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c | |||
@@ -123,7 +123,7 @@ void __init inet_initpeers(void) | |||
123 | peer_cachep = kmem_cache_create("inet_peer_cache", | 123 | peer_cachep = kmem_cache_create("inet_peer_cache", |
124 | sizeof(struct inet_peer), | 124 | sizeof(struct inet_peer), |
125 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, | 125 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
126 | NULL, NULL); | 126 | NULL); |
127 | 127 | ||
128 | /* All the timers, started at system startup tend | 128 | /* All the timers, started at system startup tend |
129 | to synchronize. Perturb it a bit. | 129 | to synchronize. Perturb it a bit. |
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index d96582acdf69..7003cc1b7fe2 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1917,7 +1917,7 @@ void __init ip_mr_init(void) | |||
1917 | mrt_cachep = kmem_cache_create("ip_mrt_cache", | 1917 | mrt_cachep = kmem_cache_create("ip_mrt_cache", |
1918 | sizeof(struct mfc_cache), | 1918 | sizeof(struct mfc_cache), |
1919 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, | 1919 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
1920 | NULL, NULL); | 1920 | NULL); |
1921 | init_timer(&ipmr_expire_timer); | 1921 | init_timer(&ipmr_expire_timer); |
1922 | ipmr_expire_timer.function=ipmr_expire_process; | 1922 | ipmr_expire_timer.function=ipmr_expire_process; |
1923 | register_netdevice_notifier(&ip_mr_notifier); | 1923 | register_netdevice_notifier(&ip_mr_notifier); |
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c index 3b446b1a6b9c..d612a6a5d957 100644 --- a/net/ipv4/ipvs/ip_vs_conn.c +++ b/net/ipv4/ipvs/ip_vs_conn.c | |||
@@ -901,7 +901,7 @@ int ip_vs_conn_init(void) | |||
901 | /* Allocate ip_vs_conn slab cache */ | 901 | /* Allocate ip_vs_conn slab cache */ |
902 | ip_vs_conn_cachep = kmem_cache_create("ip_vs_conn", | 902 | ip_vs_conn_cachep = kmem_cache_create("ip_vs_conn", |
903 | sizeof(struct ip_vs_conn), 0, | 903 | sizeof(struct ip_vs_conn), 0, |
904 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 904 | SLAB_HWCACHE_ALIGN, NULL); |
905 | if (!ip_vs_conn_cachep) { | 905 | if (!ip_vs_conn_cachep) { |
906 | vfree(ip_vs_conn_tab); | 906 | vfree(ip_vs_conn_tab); |
907 | return -ENOMEM; | 907 | return -ENOMEM; |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 88fa648d7ba3..df42b7fb3268 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -2967,7 +2967,7 @@ int __init ip_rt_init(void) | |||
2967 | 2967 | ||
2968 | ipv4_dst_ops.kmem_cachep = | 2968 | ipv4_dst_ops.kmem_cachep = |
2969 | kmem_cache_create("ip_dst_cache", sizeof(struct rtable), 0, | 2969 | kmem_cache_create("ip_dst_cache", sizeof(struct rtable), 0, |
2970 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); | 2970 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); |
2971 | 2971 | ||
2972 | ipv4_dst_blackhole_ops.kmem_cachep = ipv4_dst_ops.kmem_cachep; | 2972 | ipv4_dst_blackhole_ops.kmem_cachep = ipv4_dst_ops.kmem_cachep; |
2973 | 2973 | ||
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 987b94403be5..da4c0b6ab79a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -2430,7 +2430,7 @@ void __init tcp_init(void) | |||
2430 | tcp_hashinfo.bind_bucket_cachep = | 2430 | tcp_hashinfo.bind_bucket_cachep = |
2431 | kmem_cache_create("tcp_bind_bucket", | 2431 | kmem_cache_create("tcp_bind_bucket", |
2432 | sizeof(struct inet_bind_bucket), 0, | 2432 | sizeof(struct inet_bind_bucket), 0, |
2433 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); | 2433 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); |
2434 | 2434 | ||
2435 | /* Size and allocate the main established and bind bucket | 2435 | /* Size and allocate the main established and bind bucket |
2436 | * hash tables. | 2436 | * hash tables. |