[PATCH] 2.6.20-rc6-git2: error: 'struct nf_conn' has no member named 'mark'

[Patrick McHardy]

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.