Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / net / netfilter / nfnetlink_log.c

diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index d2c6aab6bb7ac1241ef7c58f7caabab895968271..e32e30e7a17caeec6d1a21841045ab5ff92b6586 100644 (file)
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -584,12 +584,7 @@ nfulnl_log_packet(unsigned int pf,
 
        inst = instance_lookup_get(li->u.ulog.group);
        if (!inst)
-               inst = instance_lookup_get(0);
-       if (!inst) {
-               PRINTR("nfnetlink_log: trying to log packet, "
-                       "but no instance for group %u\n", li->u.ulog.group);
                return;
-       }
 
        plen = 0;
        if (prefix)