diff --git a/[refs] b/[refs] index 7c61270c11dc..28b605f0e04e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b2f9631e789c3e7d59201c21f09a24cd6ce3b1a +refs/heads/master: a7c42955e036127f793ad955d3ec718494efb1eb diff --git a/trunk/net/netfilter/nf_log.c b/trunk/net/netfilter/nf_log.c index ed9116dc78b5..4f5f2885fcac 100644 --- a/trunk/net/netfilter/nf_log.c +++ b/trunk/net/netfilter/nf_log.c @@ -91,7 +91,6 @@ void nf_log_packet(int pf, va_start(args, fmt); vsnprintf(prefix, sizeof(prefix), fmt, args); va_end(args); - /* We must read logging before nf_logfn[pf] */ logger->logfn(pf, hooknum, skb, in, out, loginfo, prefix); } else if (net_ratelimit()) { printk(KERN_WARNING "nf_log_packet: can\'t log since "