[netfilter-cvslog] r3712 - trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-02-15 04:42:08 +0100 (Tue, 15 Feb 2005)
New Revision: 3712

Modified:
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
Log:
[NETFILTER]: Don't cacheline align slab allocs

Anton points out that cacheline aligning conntrack entries is a wank.
He's right: there's lots of them, and they're currently ~200 bytes.

Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: David S. Miller <davem at davemloft.net>


Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c	2005-02-15 03:41:02 UTC (rev 3711)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c	2005-02-15 03:42:08 UTC (rev 3712)
@@ -256,7 +256,7 @@
 		goto out_free_name;
 	}
 
-	cachep = kmem_cache_create(cache_name, size, 0, SLAB_HWCACHE_ALIGN,
+	cachep = kmem_cache_create(cache_name, size, 0, 0,
 				   NULL, NULL);
 	if (!cachep) {
 		printk("nf_conntrack_register_cache: Can't create slab cache "
@@ -1383,7 +1383,7 @@
 
 	nf_conntrack_expect_cachep = kmem_cache_create("nf_conntrack_expect",
 					sizeof(struct nf_conntrack_expect),
-					0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+					0, 0, NULL, NULL);
 	if (!nf_conntrack_expect_cachep) {
 		printk(KERN_ERR "Unable to create nf_expect slab cache\n");
 		goto err_free_conntrack_slab;