diff options
| author |   Changli Gao <xiaosuo@gmail.com> | 2010-11-12 17:33:17 +0100 |
|---|---|---|
| committer |   Patrick McHardy <kaber@trash.net> | 2010-11-12 17:33:17 +0100 |
| commit | e5fc9e7a666e5964b60e05903b90aa832354b68c (patch) | |
| tree | f7cff583883389616369687a4658c0a79409f0fd /include/net/netfilter/nf_conntrack.h | |
| parent | ipv4: Make rt->fl.iif tests lest obscure. (diff) | |
| download | linux-dev-e5fc9e7a666e5964b60e05903b90aa832354b68c.tar.xz linux-dev-e5fc9e7a666e5964b60e05903b90aa832354b68c.zip | |
netfilter: nf_conntrack: don't always initialize ct->proto
ct->proto is big(60 bytes) due to structure ip_ct_tcp, and we don't need
to initialize the whole for all the other protocols. This patch moves
proto to the end of structure nf_conn, and pushes the initialization down
to the individual protocols.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/net/netfilter/nf_conntrack.h')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index caf17db87dbc..abfff1e8e0d0 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -116,14 +116,14 @@ struct nf_conn { u_int32_t secmark; #endif - /* Storage reserved for other modules: */ - union nf_conntrack_proto proto; - /* Extensions */ struct nf_ct_ext *ext; #ifdef CONFIG_NET_NS struct net *ct_net; #endif + + /* Storage reserved for other modules, must be the last member */ + union nf_conntrack_proto proto; }; static inline struct nf_conn * |