Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)

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

diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index d10d552d9c40e2911aaf8cf796125c4212bdabff..d3a4f30a7f2247f0bac16cdc9466c31b12409e39 100644 (file)
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -117,7 +117,7 @@ int nf_queue(struct sk_buff **skb,
 
        /* QUEUE == DROP if noone is waiting, to be safe. */
        read_lock(&queue_handler_lock);
-       if (!queue_handler[pf]->outfn) {
+       if (!queue_handler[pf] || !queue_handler[pf]->outfn) {
                read_unlock(&queue_handler_lock);
                kfree_skb(*skb);
                return 1;