diff options
Diffstat (limited to 'net/netfilter/nfnetlink_queue.c')
-rw-r--r-- | net/netfilter/nfnetlink_queue.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 7e3fa410641..7ba4abc405c 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c | |||
@@ -112,7 +112,6 @@ instance_create(u_int16_t queue_num, int pid) | |||
112 | inst->copy_mode = NFQNL_COPY_NONE; | 112 | inst->copy_mode = NFQNL_COPY_NONE; |
113 | spin_lock_init(&inst->lock); | 113 | spin_lock_init(&inst->lock); |
114 | INIT_LIST_HEAD(&inst->queue_list); | 114 | INIT_LIST_HEAD(&inst->queue_list); |
115 | INIT_RCU_HEAD(&inst->rcu); | ||
116 | 115 | ||
117 | if (!try_module_get(THIS_MODULE)) { | 116 | if (!try_module_get(THIS_MODULE)) { |
118 | err = -EAGAIN; | 117 | err = -EAGAIN; |
@@ -414,13 +413,13 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum) | |||
414 | queue->queue_dropped++; | 413 | queue->queue_dropped++; |
415 | if (net_ratelimit()) | 414 | if (net_ratelimit()) |
416 | printk(KERN_WARNING "nf_queue: full at %d entries, " | 415 | printk(KERN_WARNING "nf_queue: full at %d entries, " |
417 | "dropping packets(s). Dropped: %d\n", | 416 | "dropping packets(s).\n", |
418 | queue->queue_total, queue->queue_dropped); | 417 | queue->queue_total); |
419 | goto err_out_free_nskb; | 418 | goto err_out_free_nskb; |
420 | } | 419 | } |
421 | 420 | ||
422 | /* nfnetlink_unicast will either free the nskb or add it to a socket */ | 421 | /* nfnetlink_unicast will either free the nskb or add it to a socket */ |
423 | err = nfnetlink_unicast(nskb, queue->peer_pid, MSG_DONTWAIT); | 422 | err = nfnetlink_unicast(nskb, &init_net, queue->peer_pid, MSG_DONTWAIT); |
424 | if (err < 0) { | 423 | if (err < 0) { |
425 | queue->queue_user_dropped++; | 424 | queue->queue_user_dropped++; |
426 | goto err_out_unlock; | 425 | goto err_out_unlock; |