diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-17 23:08:58 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-17 23:08:58 +0100 |
| commit | 80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch) | |
| tree | 364017b2c001939bbb645dcc20d565c1f71b13a8 /include/net/netns/conntrack.h | |
| parent | OMAP4: MCPDM: Register McPDM platform device (diff) | |
| parent | omap: Remove DEBUG_FS dependency for mux name checking (diff) | |
| download | linux-80c20d543d142ee54ec85259b77aaf0b83c32db5.tar.xz linux-80c20d543d142ee54ec85259b77aaf0b83c32db5.zip | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'include/net/netns/conntrack.h')
| -rw-r--r-- | include/net/netns/conntrack.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h index ba1ba0c5efd1..63d449807d9b 100644 --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h @@ -11,6 +11,8 @@ struct nf_conntrack_ecache; struct netns_ct { atomic_t count; unsigned int expect_count; + unsigned int htable_size; + struct kmem_cache *nf_conntrack_cachep; struct hlist_nulls_head *hash; struct hlist_head *expect_hash; struct hlist_nulls_head unconfirmed; @@ -28,5 +30,6 @@ struct netns_ct { #endif int hash_vmalloc; int expect_vmalloc; + char *slabname; }; #endif |