]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: nf_conntrack: don't always initialize ct->proto
authorChangli Gao <xiaosuo@gmail.com>
Fri, 12 Nov 2010 16:33:17 +0000 (17:33 +0100)
committerPatrick McHardy <kaber@trash.net>
Fri, 12 Nov 2010 16:33:17 +0000 (17:33 +0100)
commitfeff421f70de883f1f61142fd51e970ca4ddf0d1
treef7cff583883389616369687a4658c0a79409f0fd
parent61a116f9bc1f48d158df6ae02ebd2f4dd9ce95c0
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>
include/net/netfilter/nf_conntrack.h
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_proto_dccp.c
net/netfilter/nf_conntrack_proto_sctp.c
net/netfilter/nf_conntrack_proto_tcp.c