From: Patrick McHardy Date: Thu, 20 Jan 2011 19:46:52 +0000 (+0100) Subject: netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=n X-Git-Tag: v2.6.39-rc1~468^2~506 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f1e3176723d74ea2dd975e5be0ef6bb4fed2e2e;p=pandora-kernel.git netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=n net/built-in.o: In function `nf_conntrack_init_net': net/netfilter/nf_conntrack_core.c:1521: undefined reference to `nf_conntrack_tstamp_init' net/netfilter/nf_conntrack_core.c:1531: undefined reference to `nf_conntrack_tstamp_fini' Add dummy inline functions for the =n case to fix this. Reported-by: John Fastabend Signed-off-by: Patrick McHardy --- Reading git-diff-tree failed