- initial 3.8 update (builds --with rescuecd --without imq for now)

[packages/kernel.git] / kernel-imq.patch

diff --git a/kernel-imq.patch b/kernel-imq.patch
index 6764dd8e026a146ab42a471c3d2b31925b7b218a..ccc2014f2fc91a2fdb90977b68ddd6019478067a 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1477,7 +1477,7 @@ diff -uNr linux-3.5/net/netfilter/nf_queue.c linux-3.5-imq/net/netfilter/nf_queu
        /* QUEUE == DROP if no one is waiting, to be safe. */
        rcu_read_lock();
  
--      qh = rcu_dereference(queue_handler[pf]);
+-      qh = rcu_dereference(queue_handler);
 +      if (queuetype == NF_IMQ_QUEUE) {
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +              qh = rcu_dereference(queue_imq_handler);
@@ -1486,7 +1486,7 @@ diff -uNr linux-3.5/net/netfilter/nf_queue.c linux-3.5-imq/net/netfilter/nf_queu
 +              goto err_unlock;
 +#endif
 +      } else {
-+              qh = rcu_dereference(queue_handler[pf]);
++              qh = rcu_dereference(queue_handler);
 +      }
 +
        if (!qh) {