* [PATCH] 2.6.20-rc6-git2: error: 'struct nf_conn' has no member named 'mark'
@ 2007-01-31 10:33 Max Kellermann
2007-02-02 13:38 ` Patrick McHardy
0 siblings, 1 reply; 2+ messages in thread
From: Max Kellermann @ 2007-01-31 10:33 UTC (permalink / raw)
To: netfilter-devel
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
Hi,
on 2.6.20-rc6-git2, compilation fails when CONFIG_NF_CONNTRACK_MARK is
not enabled:
CC net/netfilter/nf_conntrack_netlink.o
net/netfilter/nf_conntrack_netlink.c: In function
'ctnetlink_conntrack_event':
net/netfilter/nf_conntrack_netlink.c:392: error: 'struct nf_conn' has
no member named 'mark'
make[3]: *** [net/netfilter/nf_conntrack_netlink.o] Error 1
My patch adds the proper #ifdef.
Max
[-- Attachment #2: fix_nf_conn_mark_without_NF_CONNTRACK_MARK.patch --]
[-- Type: text/x-diff, Size: 523 bytes --]
--- net/netfilter/nf_conntrack_netlink.c.orig 2007-01-31 11:30:29.257592604 +0100
+++ net/netfilter/nf_conntrack_netlink.c 2007-01-31 11:30:49.226730581 +0100
@@ -389,9 +389,11 @@
&& ctnetlink_dump_helpinfo(skb, ct) < 0)
goto nfattr_failure;
+#ifdef CONFIG_NF_CONNTRACK_MARK
if ((events & IPCT_MARK || ct->mark)
&& ctnetlink_dump_mark(skb, ct) < 0)
goto nfattr_failure;
+#endif
if (events & IPCT_COUNTER_FILLING &&
(ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] 2.6.20-rc6-git2: error: 'struct nf_conn' has no member named 'mark'
2007-01-31 10:33 [PATCH] 2.6.20-rc6-git2: error: 'struct nf_conn' has no member named 'mark' Max Kellermann
@ 2007-02-02 13:38 ` Patrick McHardy
0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2007-02-02 13:38 UTC (permalink / raw)
To: Max Kellermann; +Cc: netfilter-devel
Max Kellermann wrote:
> Hi,
>
> on 2.6.20-rc6-git2, compilation fails when CONFIG_NF_CONNTRACK_MARK is
> not enabled:
>
> CC net/netfilter/nf_conntrack_netlink.o
> net/netfilter/nf_conntrack_netlink.c: In function
> 'ctnetlink_conntrack_event':
> net/netfilter/nf_conntrack_netlink.c:392: error: 'struct nf_conn' has
> no member named 'mark'
> make[3]: *** [net/netfilter/nf_conntrack_netlink.o] Error 1
>
> My patch adds the proper #ifdef.
Applied and fixed ip_conntrack_netlink as well, thanks.
But please remember to sign off your patches.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-02-02 13:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-31 10:33 [PATCH] 2.6.20-rc6-git2: error: 'struct nf_conn' has no member named 'mark' Max Kellermann
2007-02-02 13:38 ` Patrick McHardy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).