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

netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6

This fixes the following linking error:

xt_LOG.c:(.text+0x789b1): undefined reference to `ip6t_ext_hdr'

ifdefs have to use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6.

Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Pablo Neira Ayuso a0f65a26 5676cc7b

+6 -6
+6 -6
net/netfilter/xt_LOG.c
··· 480 480 sb_close(m); 481 481 } 482 482 483 - #if IS_ENABLED(CONFIG_IPV6) 483 + #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) 484 484 /* One level of recursion won't kill us */ 485 485 static void dump_ipv6_packet(struct sbuff *m, 486 486 const struct nf_loginfo *info, ··· 824 824 if (par->family == NFPROTO_IPV4) 825 825 ipt_log_packet(NFPROTO_IPV4, par->hooknum, skb, par->in, 826 826 par->out, &li, loginfo->prefix); 827 - #if IS_ENABLED(CONFIG_IPV6) 827 + #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) 828 828 else if (par->family == NFPROTO_IPV6) 829 829 ip6t_log_packet(NFPROTO_IPV6, par->hooknum, skb, par->in, 830 830 par->out, &li, loginfo->prefix); ··· 864 864 .checkentry = log_tg_check, 865 865 .me = THIS_MODULE, 866 866 }, 867 - #if IS_ENABLED(CONFIG_IPV6) 867 + #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) 868 868 { 869 869 .name = "LOG", 870 870 .family = NFPROTO_IPV6, ··· 882 882 .me = THIS_MODULE, 883 883 }; 884 884 885 - #if IS_ENABLED(CONFIG_IPV6) 885 + #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) 886 886 static struct nf_logger ip6t_log_logger __read_mostly = { 887 887 .name = "ip6t_LOG", 888 888 .logfn = &ip6t_log_packet, ··· 899 899 return ret; 900 900 901 901 nf_log_register(NFPROTO_IPV4, &ipt_log_logger); 902 - #if IS_ENABLED(CONFIG_IPV6) 902 + #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) 903 903 nf_log_register(NFPROTO_IPV6, &ip6t_log_logger); 904 904 #endif 905 905 return 0; ··· 908 908 static void __exit log_tg_exit(void) 909 909 { 910 910 nf_log_unregister(&ipt_log_logger); 911 - #if IS_ENABLED(CONFIG_IPV6) 911 + #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) 912 912 nf_log_unregister(&ip6t_log_logger); 913 913 #endif 914 914 xt_unregister_targets(log_tg_regs, ARRAY_SIZE(log_tg_regs));