Forum Debian Users Gang

patching file imq.c
patching file Kconfig
Hunk #1 FAILED at 124.
1 out of 1 hunk FAILED -- saving rejects to file Kconfig.rej
patching file Makefile
Hunk #1 FAILED at 175.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file imq.h
patching file xt_IMQ.h
patching file netfilter.h
Hunk #1 FAILED at 22.
1 out of 1 hunk FAILED -- saving rejects to file netfilter.h.rej
patching file ipt_IMQ.h
patching file ip6t_IMQ.h
patching file skbuff.h
Hunk #1 FAILED at 29.
Hunk #2 FAILED at 356.
Hunk #3 FAILED at 394.
Hunk #4 FAILED at 418.
Hunk #5 FAILED at 504.
Hunk #6 FAILED at 2157.
6 out of 6 hunks FAILED -- saving rejects to file skbuff.h.rej
patching file nf_queue.h
Hunk #1 FAILED at 30.
1 out of 1 hunk FAILED -- saving rejects to file nf_queue.h.rej
patching file dev.c
Hunk #1 FAILED at 98.
Hunk #2 FAILED at 2126.
2 out of 2 hunks FAILED -- saving rejects to file dev.c.rej
patching file skbuff.c
Hunk #1 FAILED at 73.
Hunk #2 FAILED at 92.
Hunk #3 FAILED at 392.
Hunk #4 FAILED at 533.
Hunk #5 FAILED at 2888.
5 out of 5 hunks FAILED -- saving rejects to file skbuff.c.rej
patching file ip6_output.c
Hunk #1 FAILED at 102.
Hunk #2 FAILED at 170.
2 out of 2 hunks FAILED -- saving rejects to file ip6_output.c.rej
patching file core.c
Hunk #1 FAILED at 179.
1 out of 1 hunk FAILED -- saving rejects to file core.c.rej
patching file Kconfig
Hunk #1 FAILED at 507.
1 out of 1 hunk FAILED -- saving rejects to file Kconfig.rej
patching file Makefile
Hunk #1 FAILED at 56.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file nf_internals.h
Hunk #1 FAILED at 29.
1 out of 1 hunk FAILED -- saving rejects to file nf_internals.h.rej
patching file nf_queue.c
Hunk #1 FAILED at 22.
Hunk #2 FAILED at 92.
Hunk #3 FAILED at 112.
Hunk #4 FAILED at 123.
Hunk #5 FAILED at 137.
Hunk #6 FAILED at 209.
Hunk #7 FAILED at 217.
Hunk #8 FAILED at 244.
Hunk #9 FAILED at 299.
9 out of 9 hunks FAILED -- saving rejects to file nf_queue.c.rej
patching file xt_IMQ.c

--- nf_queue.c    2011-10-24 10:10:05.000000000 +0300
+++ nf_queue.c    2011-11-04 11:12:52.123057315 +0200
@@ -22,6 +22,26 @@
 
 static DEFINE_MUTEX(queue_handler_mutex);
 
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+static const struct nf_queue_handler *queue_imq_handler;
+
+void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
+{
+    mutex_lock(&queue_handler_mutex);
+    rcu_assign_pointer(queue_imq_handler, qh);
+    mutex_unlock(&queue_handler_mutex);
+}
+EXPORT_SYMBOL_GPL(nf_register_queue_imq_handler);
+
+void nf_unregister_queue_imq_handler(void)
+{
+    mutex_lock(&queue_handler_mutex);
+    rcu_assign_pointer(queue_imq_handler, NULL);
+    mutex_unlock(&queue_handler_mutex);
+}
+EXPORT_SYMBOL_GPL(nf_unregister_queue_imq_handler);
+#endif
+
 /* return EBUSY when somebody else is registered, return EEXIST if the
  * same handler is registered, return 0 in case of success. */
 int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
@@ -92,7 +112,7 @@
 }
 EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
 
-static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
+void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
 {
     /* Release those devices we held, or Alexey will kill me. */
     if (entry->indev)
@@ -112,6 +132,7 @@
     /* Drop reference to owner of hook which queued us. */
     module_put(entry->elem->owner);
 }
+EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
 
 /*
  * Any packet that leaves via this function must come back
@@ -123,7 +144,8 @@
               struct net_device *indev,
               struct net_device *outdev,
               int (*okfn)(struct sk_buff *),
-              unsigned int queuenum)
+              unsigned int queuenum,
+              unsigned int queuetype)
 {
     int status = -ENOENT;
     struct nf_queue_entry *entry = NULL;
@@ -137,7 +159,17 @@
     /* QUEUE == DROP if no one is waiting, to be safe. */
     rcu_read_lock();
 
-    qh = rcu_dereference(queue_handler[pf]);
+    if (queuetype == NF_IMQ_QUEUE) {
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+        qh = rcu_dereference(queue_imq_handler);
+#else
+        BUG();
+        goto err_unlock;
+#endif
+    } else {
+        qh = rcu_dereference(queue_handler[pf]);
+    }
+
     if (!qh) {
         status = -ESRCH;
         goto err_unlock;
@@ -209,7 +241,8 @@
          struct net_device *indev,
          struct net_device *outdev,
          int (*okfn)(struct sk_buff *),
-         unsigned int queuenum)
+         unsigned int queuenum,
+         unsigned int queuetype)
 {
     struct sk_buff *segs;
     int err;
@@ -217,7 +250,7 @@
 
     if (!skb_is_gso(skb))
         return __nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
-                  queuenum);
+                  queuenum, queuetype);
 
     switch (pf) {
     case NFPROTO_IPV4:
@@ -244,7 +277,7 @@
         segs->next = NULL;
         if (err == 0)
             err = __nf_queue(segs, elem, pf, hook, indev,
-                       outdev, okfn, queuenum);
+                     outdev, okfn, queuenum, queuetype);
         if (err == 0)
             queued++;
         else
@@ -299,9 +332,11 @@
         local_bh_enable();
         break;
     case NF_QUEUE:
+    case NF_IMQ_QUEUE:
         err = __nf_queue(skb, elem, entry->pf, entry->hook,
                  entry->indev, entry->outdev, entry->okfn,
-                 verdict >> NF_VERDICT_QBITS);
+                 verdict >> NF_VERDICT_QBITS,
+                 verdict & NF_VERDICT_MASK);
         if (err < 0) {
             if (err == -ECANCELED)
                 goto next_hook;