tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[NETFILTER]: ctnetlink: fix compile failure with NF_CONNTRACK_MARK=n

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

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Patrick McHardy and committed by
David S. Miller 40e0cb00 e47fddf2

+4
+2
net/ipv4/netfilter/ip_conntrack_netlink.c
··· 374 374 && ctnetlink_dump_helpinfo(skb, ct) < 0) 375 375 goto nfattr_failure; 376 376 377 + #ifdef CONFIG_IP_NF_CONNTRACK_MARK 377 378 if ((events & IPCT_MARK || ct->mark) 378 379 && ctnetlink_dump_mark(skb, ct) < 0) 379 380 goto nfattr_failure; 381 + #endif 380 382 381 383 if (events & IPCT_COUNTER_FILLING && 382 384 (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||
+2
net/netfilter/nf_conntrack_netlink.c
··· 389 389 && ctnetlink_dump_helpinfo(skb, ct) < 0) 390 390 goto nfattr_failure; 391 391 392 + #ifdef CONFIG_NF_CONNTRACK_MARK 392 393 if ((events & IPCT_MARK || ct->mark) 393 394 && ctnetlink_dump_mark(skb, ct) < 0) 394 395 goto nfattr_failure; 396 + #endif 395 397 396 398 if (events & IPCT_COUNTER_FILLING && 397 399 (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||