2.6.20-rc6-git2: error: 'struct nf_conn' has no member named 'mark'
PATCH 1/1 2.6.20-rc6-git2: error: 'struct nf_conn' has no member named 'mark'
Hi,
on 2.6.20-rc6-git2, compilation fails when CONFIG_NF_CONNTRACK_MARK is not enabled:
CC net/netfilter/nf_conntrack_netlink.onet/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
netfilter/nf_conntrack_netlink.c renamed from netfilter/nf_conntrack_netlink.c.orig +2 -0
@@ -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 ||
Quoted 5 lines · Max Kellermann
Hi,
on 2.6.20-rc6-git2, compilation fails when
CONFIG_NF_CONNTRACK_MARKis not enabled:
Quoted 8 lines
CC
net/netfilter/nf_conntrack_netlink.onet/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_conntrack_event':net/netfilter/nf_conntrack_netlink.c:392: error: 'structnf_conn' has no member named 'mark'
make[3]: *** [net/netfilter/nf_conntrack_netlink.o] Error 1My patch adds the proper #ifdef.
Applied and fixed ip_conntrack_netlink as well, thanks. But please remember to sign off your patches.