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 /net/netfilter/nf_conntrack_netlink.c | |
| parent | c753796769e4fb0cd813b6e5801b3c01f4681d4f (diff) | |
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 'net/netfilter/nf_conntrack_netlink.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index b729ace1dcc1..7f59be82449f 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -1375,6 +1375,7 @@ ctnetlink_create_conntrack(struct net *net, u16 zone, } #endif + memset(&ct->proto, 0, sizeof(ct->proto)); if (cda[CTA_PROTOINFO]) { err = ctnetlink_change_protoinfo(ct, cda); if (err < 0) |