[PATCH] netfilter: undefined reference to 'nf_conntrack_tstamp_*'

[PATCH] netfilter: undefined reference to 'nf_conntrack_tstamp_*'

[John Fastabend]

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 'selects' notation to Kconfig to include NF_CONNTRACK_TIMESTAMP
this resolves all the config files I tested.

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
CC: Pablo Neira Ayuso <pablo@netfilter.org>
---

 net/netfilter/Kconfig |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index faf7412..2079911 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -27,6 +27,7 @@ config NETFILTER_NETLINK_LOG
 config NF_CONNTRACK
 	tristate "Netfilter connection tracking support"
 	default m if NETFILTER_ADVANCED=n
+	select NF_CONNTRACK_TIMESTAMP
 	help
 	  Connection tracking keeps a record of what packets have passed
 	  through your machine, in order to figure out how they are related
@@ -87,7 +88,7 @@ config NF_CONNTRACK_EVENTS
 
 config NF_CONNTRACK_TIMESTAMP
 	bool  'Connection tracking timestamping'
-	depends on NETFILTER_ADVANCED
+	default m if NETFILTER_ADVANCED
 	help
 	  This option enables support for connection tracking timestamping.
 	  This allows you to store the flow start-time and to obtain

Re: [PATCH] netfilter: undefined reference to 'nf_conntrack_tstamp_*'

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

Am 20.01.2011 20:16, schrieb John Fastabend:
> 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 'selects' notation to Kconfig to include NF_CONNTRACK_TIMESTAMP
> this resolves all the config files I tested.

That's not the correct fix, NF_CONNTRACK_TIMESTAMP is supposed
to be option. Please try whether this patch fixes the problem.


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1418 bytes --]

commit 2f1e3176723d74ea2dd975e5be0ef6bb4fed2e2e
Author: Patrick McHardy <kaber@trash.net>
Date:   Thu Jan 20 20:46:52 2011 +0100

    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 <john.r.fastabend@intel.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/net/netfilter/nf_conntrack_timestamp.h b/include/net/netfilter/nf_conntrack_timestamp.h
index f17dcb6..fc9c82b 100644
--- a/include/net/netfilter/nf_conntrack_timestamp.h
+++ b/include/net/netfilter/nf_conntrack_timestamp.h
@@ -47,7 +47,19 @@ static inline void nf_ct_set_tstamp(struct net *net, bool enable)
 	net->ct.sysctl_tstamp = enable;
 }
 
+#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
 extern int nf_conntrack_tstamp_init(struct net *net);
 extern void nf_conntrack_tstamp_fini(struct net *net);
+#else
+static inline int nf_conntrack_tstamp_init(struct net *net)
+{
+	return 0;
+}
+
+static inline void nf_conntrack_tstamp_fini(struct net *net)
+{
+	return;
+}
+#endif /* CONFIG_NF_CONNTRACK_TIMESTAMP */
 
 #endif /* _NF_CONNTRACK_TSTAMP_H */

Re: [PATCH] netfilter: undefined reference to 'nf_conntrack_tstamp_*'

[John Fastabend]

On 1/20/2011 11:52 AM, Patrick McHardy wrote:
> Am 20.01.2011 20:16, schrieb John Fastabend:
>> 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 'selects' notation to Kconfig to include NF_CONNTRACK_TIMESTAMP
>> this resolves all the config files I tested.
> 
> That's not the correct fix, NF_CONNTRACK_TIMESTAMP is supposed
> to be option. Please try whether this patch fixes the problem.
> 

You patch fixes this thanks!

Re: [PATCH] netfilter: undefined reference to 'nf_conntrack_tstamp_*'

[Patrick McHardy]

Am 20.01.2011 21:05, schrieb John Fastabend:
> On 1/20/2011 11:52 AM, Patrick McHardy wrote:
>> Am 20.01.2011 20:16, schrieb John Fastabend:
>>> 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 'selects' notation to Kconfig to include NF_CONNTRACK_TIMESTAMP
>>> this resolves all the config files I tested.
>>
>> That's not the correct fix, NF_CONNTRACK_TIMESTAMP is supposed
>> to be option. Please try whether this patch fixes the problem.
>>
> 
> You patch fixes this thanks!

Thanks John!