--- ./net/ipv6/netfilter/ip6t_LOG.c.bad Mon Feb 7 00:30:02 2005 +++ ./net/ipv6/netfilter/ip6t_LOG.c Mon Feb 7 02:52:01 2005 @@ -437,6 +437,7 @@ return IP6T_CONTINUE; } +#ifdef NF_LOG_IPV6_HAS_BEEN_REPAIRED static void ip6_log_packet_fn(struct sk_buff **pskb, unsigned int hooknum, @@ -470,6 +471,7 @@ printk("\n"); spin_unlock_bh(&log_lock); } +#endif static int ip6t_log_checkentry(const char *tablename, const struct ip6t_entry *e, @@ -502,21 +504,27 @@ static struct ip6t_target ip6t_log_reg = { { NULL, NULL }, "LOG", ip6t_log_target, ip6t_log_checkentry, NULL, THIS_MODULE }; +#ifdef NF_LOG_IPV6_HAS_BEEN_REPAIRED static struct nf_logging_t ip6_logging_fn = { ip6_log_packet_fn, ip6_log_fn }; +#endif static int __init init(void) { if (ip6t_register_target(&ip6t_log_reg)) return -EINVAL; +#ifdef NF_LOG_IPV6_HAS_BEEN_REPAIRED nf_ip6_log_register(&ip6_logging_fn); +#endif return 0; } static void __exit fini(void) { +#ifdef NF_LOG_IPV6_HAS_BEEN_REPAIRED nf_ip6_log_unregister(&ip6_logging_fn); +#endif ip6t_unregister_target(&ip6t_log_reg); }