OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Pablo Neira Ayuso 2012-03-10 12:15:15 +01:00
parent 5676cc7bfe
commit a0f65a267d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/netfilter/xt_LOG.c
View File

@ -480,7 +480,7 @@ ipt_log_packet(u_int8_t pf,
sb_close(m); sb_close(m);
} }
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
/* One level of recursion won't kill us */ /* One level of recursion won't kill us */
static void dump_ipv6_packet(struct sbuff *m, static void dump_ipv6_packet(struct sbuff *m,
const struct nf_loginfo *info, const struct nf_loginfo *info,
@ -824,7 +824,7 @@ log_tg(struct sk_buff *skb, const struct xt_action_param *par)
if (par->family == NFPROTO_IPV4) if (par->family == NFPROTO_IPV4)
ipt_log_packet(NFPROTO_IPV4, par->hooknum, skb, par->in, ipt_log_packet(NFPROTO_IPV4, par->hooknum, skb, par->in,
par->out, &li, loginfo->prefix); par->out, &li, loginfo->prefix);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
else if (par->family == NFPROTO_IPV6) else if (par->family == NFPROTO_IPV6)
ip6t_log_packet(NFPROTO_IPV6, par->hooknum, skb, par->in, ip6t_log_packet(NFPROTO_IPV6, par->hooknum, skb, par->in,
par->out, &li, loginfo->prefix); par->out, &li, loginfo->prefix);
@ -864,7 +864,7 @@ static struct xt_target log_tg_regs[] __read_mostly = {
.checkentry = log_tg_check, .checkentry = log_tg_check,
.me = THIS_MODULE, .me = THIS_MODULE,
}, },
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
{ {
.name = "LOG", .name = "LOG",
.family = NFPROTO_IPV6, .family = NFPROTO_IPV6,
@ -882,7 +882,7 @@ static struct nf_logger ipt_log_logger __read_mostly = {
.me = THIS_MODULE, .me = THIS_MODULE,
}; };
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
static struct nf_logger ip6t_log_logger __read_mostly = { static struct nf_logger ip6t_log_logger __read_mostly = {
.name = "ip6t_LOG", .name = "ip6t_LOG",
.logfn = &ip6t_log_packet, .logfn = &ip6t_log_packet,
@ -899,7 +899,7 @@ static int __init log_tg_init(void)
return ret; return ret;
nf_log_register(NFPROTO_IPV4, &ipt_log_logger); nf_log_register(NFPROTO_IPV4, &ipt_log_logger);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
nf_log_register(NFPROTO_IPV6, &ip6t_log_logger); nf_log_register(NFPROTO_IPV6, &ip6t_log_logger);
#endif #endif
return 0; return 0;
@ -908,7 +908,7 @@ static int __init log_tg_init(void)
static void __exit log_tg_exit(void) static void __exit log_tg_exit(void)
{ {
nf_log_unregister(&ipt_log_logger); nf_log_unregister(&ipt_log_logger);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
nf_log_unregister(&ip6t_log_logger); nf_log_unregister(&ip6t_log_logger);
#endif #endif
xt_unregister_targets(log_tg_regs, ARRAY_SIZE(log_tg_regs)); xt_unregister_targets(log_tg_regs, ARRAY_SIZE(log_tg_regs));