1 diff -urN linux-2.6.22.1/drivers/net/imq.c linux-2.6.22.1+imq1/drivers/net/imq.c
2 --- linux-2.6.22.1/drivers/net/imq.c 1970-01-01 09:30:00.000000000 +0930
3 +++ linux-2.6.22.1+imq1/drivers/net/imq.c 2007-07-15 11:03:43.000000000 +0930
6 + * Pseudo-driver for the intermediate queue device.
8 + * This program is free software; you can redistribute it and/or
9 + * modify it under the terms of the GNU General Public License
10 + * as published by the Free Software Foundation; either version
11 + * 2 of the License, or (at your option) any later version.
13 + * Authors: Patrick McHardy, <kaber@trash.net>
15 + * The first version was written by Martin Devera, <devik@cdi.cz>
17 + * Credits: Jan Rafaj <imq2t@cedric.vabo.cz>
18 + * - Update patch to 2.4.21
19 + * Sebastian Strollo <sstrollo@nortelnetworks.com>
20 + * - Fix "Dead-loop on netdevice imq"-issue
21 + * Marcel Sebek <sebek64@post.cz>
22 + * - Update to 2.6.2-rc1
24 + * After some time of inactivity there is a group taking care
25 + * of IMQ again: http://www.linuximq.net
28 + * 2004/06/30 - New version of IMQ patch to kernels <=2.6.7 including
29 + * the following changes:
31 + * - Correction of ipv6 support "+"s issue (Hasso Tepper)
32 + * - Correction of imq_init_devs() issue that resulted in
33 + * kernel OOPS unloading IMQ as module (Norbert Buchmuller)
34 + * - Addition of functionality to choose number of IMQ devices
35 + * during kernel config (Andre Correa)
36 + * - Addition of functionality to choose how IMQ hooks on
37 + * PRE and POSTROUTING (after or before NAT) (Andre Correa)
38 + * - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
41 + * 2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
42 + * released with almost no problems. 2.6.14-x was released
43 + * with some important changes: nfcache was removed; After
44 + * some weeks of trouble we figured out that some IMQ fields
45 + * in skb were missing in skbuff.c - skb_clone and copy_skb_header.
46 + * These functions are correctly patched by this new patch version.
48 + * Thanks for all who helped to figure out all the problems with
49 + * 2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
50 + * Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
51 + * I didn't forget anybody). I apologize again for my lack of time.
53 + * More info at: http://www.linuximq.net/ (Andre Correa)
56 +#include <linux/module.h>
57 +#include <linux/kernel.h>
58 +#include <linux/moduleparam.h>
59 +#include <linux/skbuff.h>
60 +#include <linux/netdevice.h>
61 +#include <linux/rtnetlink.h>
62 +#include <linux/if_arp.h>
63 +#include <linux/netfilter.h>
64 +#include <linux/netfilter_ipv4.h>
65 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
66 + #include <linux/netfilter_ipv6.h>
68 +#include <linux/imq.h>
69 +#include <net/pkt_sched.h>
71 +extern int qdisc_restart1(struct net_device *dev);
73 +static nf_hookfn imq_nf_hook;
75 +static struct nf_hook_ops imq_ingress_ipv4 = {
76 + .hook = imq_nf_hook,
77 + .owner = THIS_MODULE,
79 + .hooknum = NF_IP_PRE_ROUTING,
80 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
81 + .priority = NF_IP_PRI_MANGLE + 1
83 + .priority = NF_IP_PRI_NAT_DST + 1
87 +static struct nf_hook_ops imq_egress_ipv4 = {
88 + .hook = imq_nf_hook,
89 + .owner = THIS_MODULE,
91 + .hooknum = NF_IP_POST_ROUTING,
92 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
93 + .priority = NF_IP_PRI_LAST
95 + .priority = NF_IP_PRI_NAT_SRC - 1
99 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
100 +static struct nf_hook_ops imq_ingress_ipv6 = {
101 + .hook = imq_nf_hook,
102 + .owner = THIS_MODULE,
104 + .hooknum = NF_IP6_PRE_ROUTING,
105 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
106 + .priority = NF_IP6_PRI_MANGLE + 1
108 + .priority = NF_IP6_PRI_NAT_DST + 1
112 +static struct nf_hook_ops imq_egress_ipv6 = {
113 + .hook = imq_nf_hook,
114 + .owner = THIS_MODULE,
116 + .hooknum = NF_IP6_POST_ROUTING,
117 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
118 + .priority = NF_IP6_PRI_LAST
120 + .priority = NF_IP6_PRI_NAT_SRC - 1
125 +#if defined(CONFIG_IMQ_NUM_DEVS)
126 +static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
128 +static unsigned int numdevs = 16;
131 +static struct net_device *imq_devs;
133 +static struct net_device_stats *imq_get_stats(struct net_device *dev)
135 + return (struct net_device_stats *)dev->priv;
138 +/* called for packets kfree'd in qdiscs at places other than enqueue */
139 +static void imq_skb_destructor(struct sk_buff *skb)
141 + struct nf_info *info = skb->nf_info;
145 + dev_put(info->indev);
147 + dev_put(info->outdev);
152 +static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
154 + struct net_device_stats *stats = (struct net_device_stats*) dev->priv;
156 + stats->tx_bytes += skb->len;
157 + stats->tx_packets++;
159 + skb->imq_flags = 0;
160 + skb->destructor = NULL;
162 + dev->trans_start = jiffies;
163 + nf_reinject(skb, skb->nf_info, NF_ACCEPT);
167 +static int imq_nf_queue(struct sk_buff *skb, struct nf_info *info, unsigned queue_num, void *data)
169 + struct net_device *dev;
170 + struct net_device_stats *stats;
171 + struct sk_buff *skb2 = NULL;
173 + unsigned int index = skb->imq_flags&IMQ_F_IFMASK;
176 + if (index > numdevs)
179 + dev = imq_devs + index;
180 + if (!(dev->flags & IFF_UP)) {
181 + skb->imq_flags = 0;
182 + nf_reinject(skb, info, NF_ACCEPT);
185 + dev->last_rx = jiffies;
187 + if (skb->destructor) {
189 + skb = skb_clone(skb, GFP_ATOMIC);
193 + skb->nf_info = info;
195 + stats = (struct net_device_stats *)dev->priv;
196 + stats->rx_bytes+= skb->len;
197 + stats->rx_packets++;
199 + spin_lock_bh(&dev->queue_lock);
202 + q->enqueue(skb_get(skb), q);
203 + if (skb_shared(skb)) {
204 + skb->destructor = imq_skb_destructor;
209 + if (spin_is_locked(&dev->_xmit_lock))
210 + netif_schedule(dev);
212 + while (!netif_queue_stopped(dev) && qdisc_restart1(dev) < 0)
215 + spin_unlock_bh(&dev->queue_lock);
218 + kfree_skb(ret ? skb : skb2);
223 +static struct nf_queue_handler nfqh = {
225 + .outfn = imq_nf_queue,
228 +static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff **pskb,
229 + const struct net_device *indev,
230 + const struct net_device *outdev,
231 + int (*okfn)(struct sk_buff *))
233 + if ((*pskb)->imq_flags & IMQ_F_ENQUEUE)
240 +static int __init imq_init_hooks(void)
244 + err = nf_register_queue_handler(PF_INET, &nfqh);
247 + if ((err = nf_register_hook(&imq_ingress_ipv4)))
249 + if ((err = nf_register_hook(&imq_egress_ipv4)))
251 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
252 + if ((err = nf_register_queue_handler(PF_INET6, &nfqh)))
254 + if ((err = nf_register_hook(&imq_ingress_ipv6)))
256 + if ((err = nf_register_hook(&imq_egress_ipv6)))
262 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
264 + nf_unregister_hook(&imq_ingress_ipv6);
266 + nf_unregister_queue_handler(PF_INET6);
268 + nf_unregister_hook(&imq_egress_ipv4);
271 + nf_unregister_hook(&imq_ingress_ipv4);
273 + nf_unregister_queue_handler(PF_INET);
278 +static void __exit imq_unhook(void)
280 + nf_unregister_hook(&imq_ingress_ipv4);
281 + nf_unregister_hook(&imq_egress_ipv4);
282 + nf_unregister_queue_handler(PF_INET);
283 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
284 + nf_unregister_hook(&imq_ingress_ipv6);
285 + nf_unregister_hook(&imq_egress_ipv6);
286 + nf_unregister_queue_handler(PF_INET6);
290 +static int __init imq_dev_init(struct net_device *dev)
292 + dev->hard_start_xmit = imq_dev_xmit;
293 + dev->type = ARPHRD_VOID;
295 + dev->tx_queue_len = 11000;
296 + dev->flags = IFF_NOARP;
297 + dev->priv = kmalloc(sizeof(struct net_device_stats), GFP_KERNEL);
298 + if (dev->priv == NULL)
300 + memset(dev->priv, 0, sizeof(struct net_device_stats));
301 + dev->get_stats = imq_get_stats;
306 +static void imq_dev_uninit(struct net_device *dev)
311 +static int __init imq_init_devs(void)
313 + struct net_device *dev;
317 + if (!numdevs || numdevs > IMQ_MAX_DEVS) {
318 + printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
323 + imq_devs = kmalloc(sizeof(struct net_device) * numdevs, GFP_KERNEL);
326 + memset(imq_devs, 0, sizeof(struct net_device) * numdevs);
328 + /* we start counting at zero */
331 + for (i = 0, dev = imq_devs; i <= numdevs; i++, dev++) {
332 + SET_MODULE_OWNER(dev);
333 + strcpy(dev->name, "imq%d");
334 + dev->init = imq_dev_init;
335 + dev->uninit = imq_dev_uninit;
337 + if (register_netdev(dev) < 0)
340 + printk(KERN_INFO "IMQ starting with %u devices...\n", j);
345 + unregister_netdev(--dev);
350 +static void imq_cleanup_devs(void)
353 + struct net_device *dev = imq_devs;
355 + for (i = 0; i <= numdevs; i++)
356 + unregister_netdev(dev++);
361 +static int __init imq_init_module(void)
365 + if ((err = imq_init_devs())) {
366 + printk(KERN_ERR "IMQ: Error trying imq_init_devs()\n");
369 + if ((err = imq_init_hooks())) {
370 + printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
371 + imq_cleanup_devs();
375 + printk(KERN_INFO "IMQ driver loaded successfully.\n");
377 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
378 + printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
380 + printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
382 +#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
383 + printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
385 + printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
391 +static void __exit imq_cleanup_module(void)
394 + imq_cleanup_devs();
395 + printk(KERN_INFO "IMQ driver unloaded successfully.\n");
399 +module_init(imq_init_module);
400 +module_exit(imq_cleanup_module);
402 +module_param(numdevs, int, 16);
403 +MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will be created)");
404 +MODULE_AUTHOR("http://www.linuximq.net");
405 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
406 +MODULE_LICENSE("GPL");
407 diff -urN linux-2.6.22.1/drivers/net/Kconfig linux-2.6.22.1+imq1/drivers/net/Kconfig
408 --- linux-2.6.22.1/drivers/net/Kconfig 2007-07-14 15:40:42.000000000 +0930
409 +++ linux-2.6.22.1+imq1/drivers/net/Kconfig 2007-07-15 07:13:29.000000000 +0930
411 To compile this driver as a module, choose M here: the module
412 will be called eql. If unsure, say N.
415 + tristate "IMQ (intermediate queueing device) support"
416 + depends on NETDEVICES && NETFILTER
418 + The IMQ device(s) is used as placeholder for QoS queueing
419 + disciplines. Every packet entering/leaving the IP stack can be
420 + directed through the IMQ device where it's enqueued/dequeued to the
421 + attached qdisc. This allows you to treat network devices as classes
422 + and distribute bandwidth among them. Iptables is used to specify
423 + through which IMQ device, if any, packets travel.
425 + More information at: http://www.linuximq.net/
427 + To compile this driver as a module, choose M here: the module
428 + will be called imq. If unsure, say N.
431 + prompt "IMQ behavior (PRE/POSTROUTING)"
433 + default IMQ_BEHAVIOR_AB
436 + This settings defines how IMQ behaves in respect to its
437 + hooking in PREROUTING and POSTROUTING.
439 + IMQ can work in any of the following ways:
441 + PREROUTING | POSTROUTING
442 + -----------------|-------------------
443 + #1 After NAT | After NAT
444 + #2 After NAT | Before NAT
445 + #3 Before NAT | After NAT
446 + #4 Before NAT | Before NAT
448 + The default behavior is to hook before NAT on PREROUTING
449 + and after NAT on POSTROUTING (#3).
451 + This settings are specially usefull when trying to use IMQ
452 + to shape NATed clients.
454 + More information can be found at: www.linuximq.net
456 + If not sure leave the default settings alone.
458 +config IMQ_BEHAVIOR_AA
461 + This settings defines how IMQ behaves in respect to its
462 + hooking in PREROUTING and POSTROUTING.
464 + Choosing this option will make IMQ hook like this:
466 + PREROUTING: After NAT
467 + POSTROUTING: After NAT
469 + More information can be found at: www.linuximq.net
471 + If not sure leave the default settings alone.
473 +config IMQ_BEHAVIOR_AB
476 + This settings defines how IMQ behaves in respect to its
477 + hooking in PREROUTING and POSTROUTING.
479 + Choosing this option will make IMQ hook like this:
481 + PREROUTING: After NAT
482 + POSTROUTING: Before NAT
484 + More information can be found at: www.linuximq.net
486 + If not sure leave the default settings alone.
488 +config IMQ_BEHAVIOR_BA
491 + This settings defines how IMQ behaves in respect to its
492 + hooking in PREROUTING and POSTROUTING.
494 + Choosing this option will make IMQ hook like this:
496 + PREROUTING: Before NAT
497 + POSTROUTING: After NAT
499 + More information can be found at: www.linuximq.net
501 + If not sure leave the default settings alone.
503 +config IMQ_BEHAVIOR_BB
506 + This settings defines how IMQ behaves in respect to its
507 + hooking in PREROUTING and POSTROUTING.
509 + Choosing this option will make IMQ hook like this:
511 + PREROUTING: Before NAT
512 + POSTROUTING: Before NAT
514 + More information can be found at: www.linuximq.net
516 + If not sure leave the default settings alone.
522 + int "Number of IMQ devices"
528 + This settings defines how many IMQ devices will be
531 + The default value is 2.
533 + More information can be found at: www.linuximq.net
535 + If not sure leave the default settings alone.
538 tristate "Universal TUN/TAP device driver support"
540 diff -urN linux-2.6.22.1/drivers/net/Makefile linux-2.6.22.1+imq1/drivers/net/Makefile
541 --- linux-2.6.22.1/drivers/net/Makefile 2007-07-14 15:40:42.000000000 +0930
542 +++ linux-2.6.22.1+imq1/drivers/net/Makefile 2007-07-15 07:13:29.000000000 +0930
544 obj-$(CONFIG_SLHC) += slhc.o
546 obj-$(CONFIG_DUMMY) += dummy.o
547 +obj-$(CONFIG_IMQ) += imq.o
548 obj-$(CONFIG_IFB) += ifb.o
549 obj-$(CONFIG_DE600) += de600.o
550 obj-$(CONFIG_DE620) += de620.o
551 diff -urN linux-2.6.22.1/include/linux/imq.h linux-2.6.22.1+imq1/include/linux/imq.h
552 --- linux-2.6.22.1/include/linux/imq.h 1970-01-01 09:30:00.000000000 +0930
553 +++ linux-2.6.22.1+imq1/include/linux/imq.h 2007-07-15 07:13:29.000000000 +0930
558 +#define IMQ_MAX_DEVS 16
560 +#define IMQ_F_IFMASK 0x7f
561 +#define IMQ_F_ENQUEUE 0x80
564 diff -urN linux-2.6.22.1/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.22.1+imq1/include/linux/netfilter_ipv4/ipt_IMQ.h
565 --- linux-2.6.22.1/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 09:30:00.000000000 +0930
566 +++ linux-2.6.22.1+imq1/include/linux/netfilter_ipv4/ipt_IMQ.h 2007-07-15 07:13:29.000000000 +0930
571 +struct ipt_imq_info {
572 + unsigned int todev; /* target imq device */
575 +#endif /* _IPT_IMQ_H */
576 diff -urN linux-2.6.22.1/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.22.1+imq1/include/linux/netfilter_ipv6/ip6t_IMQ.h
577 --- linux-2.6.22.1/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 09:30:00.000000000 +0930
578 +++ linux-2.6.22.1+imq1/include/linux/netfilter_ipv6/ip6t_IMQ.h 2007-07-15 07:13:29.000000000 +0930
583 +struct ip6t_imq_info {
584 + unsigned int todev; /* target imq device */
587 +#endif /* _IP6T_IMQ_H */
588 diff -urN linux-2.6.22.1/include/linux/skbuff.h linux-2.6.22.1+imq1/include/linux/skbuff.h
589 --- linux-2.6.22.1/include/linux/skbuff.h 2007-07-14 15:41:17.000000000 +0930
590 +++ linux-2.6.22.1+imq1/include/linux/skbuff.h 2007-07-15 07:13:29.000000000 +0930
592 struct nf_conntrack *nfct;
593 struct sk_buff *nfct_reasm;
595 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
596 + unsigned char imq_flags;
597 + struct nf_info *nf_info;
599 #ifdef CONFIG_BRIDGE_NETFILTER
600 struct nf_bridge_info *nf_bridge;
602 @@ -1673,6 +1677,10 @@
603 dst->nfct_reasm = src->nfct_reasm;
604 nf_conntrack_get_reasm(src->nfct_reasm);
606 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
607 + dst->imq_flags = src->imq_flags;
608 + dst->nf_info = src->nf_info;
610 #ifdef CONFIG_BRIDGE_NETFILTER
611 dst->nf_bridge = src->nf_bridge;
612 nf_bridge_get(src->nf_bridge);
613 diff -urN linux-2.6.22.1/net/core/dev.c linux-2.6.22.1+imq1/net/core/dev.c
614 --- linux-2.6.22.1/net/core/dev.c 2007-07-14 15:41:23.000000000 +0930
615 +++ linux-2.6.22.1+imq1/net/core/dev.c 2007-07-15 07:13:30.000000000 +0930
617 #include <linux/skbuff.h>
618 #include <net/sock.h>
619 #include <linux/rtnetlink.h>
620 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
621 +#include <linux/imq.h>
623 #include <linux/proc_fs.h>
624 #include <linux/seq_file.h>
625 #include <linux/stat.h>
626 @@ -1403,7 +1406,11 @@
627 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
629 if (likely(!skb->next)) {
630 - if (!list_empty(&ptype_all))
631 + if (!list_empty(&ptype_all)
632 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
633 + && !(skb->imq_flags & IMQ_F_ENQUEUE)
636 dev_queue_xmit_nit(skb, dev);
638 if (netif_needs_gso(dev, skb)) {
639 diff -urN linux-2.6.22.1/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.22.1+imq1/net/ipv4/netfilter/ipt_IMQ.c
640 --- linux-2.6.22.1/net/ipv4/netfilter/ipt_IMQ.c 1970-01-01 09:30:00.000000000 +0930
641 +++ linux-2.6.22.1+imq1/net/ipv4/netfilter/ipt_IMQ.c 2007-07-15 07:13:30.000000000 +0930
644 + * This target marks packets to be enqueued to an imq device
646 +#include <linux/module.h>
647 +#include <linux/skbuff.h>
648 +#include <linux/netfilter_ipv4/ip_tables.h>
649 +#include <linux/netfilter_ipv4/ipt_IMQ.h>
650 +#include <linux/imq.h>
652 +static unsigned int imq_target(struct sk_buff **pskb,
653 + const struct net_device *in,
654 + const struct net_device *out,
655 + unsigned int hooknum,
656 + const struct xt_target *target,
657 + const void *targinfo)
659 + struct ipt_imq_info *mr = (struct ipt_imq_info*)targinfo;
661 + (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE;
663 + return XT_CONTINUE;
666 +static int imq_checkentry(const char *tablename,
668 + const struct xt_target *target,
670 + unsigned int hook_mask)
672 + struct ipt_imq_info *mr;
674 + mr = (struct ipt_imq_info*)targinfo;
676 + if (mr->todev > IMQ_MAX_DEVS) {
677 + printk(KERN_WARNING
678 + "IMQ: invalid device specified, highest is %u\n",
686 +static struct xt_target ipt_imq_reg = {
689 + .target = imq_target,
690 + .targetsize = sizeof(struct ipt_imq_info),
691 + .checkentry = imq_checkentry,
696 +static int __init init(void)
698 + return xt_register_target(&ipt_imq_reg);
701 +static void __exit fini(void)
703 + xt_unregister_target(&ipt_imq_reg);
709 +MODULE_AUTHOR("http://www.linuximq.net");
710 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
711 +MODULE_LICENSE("GPL");
712 diff -urN linux-2.6.22.1/net/ipv4/netfilter/Kconfig linux-2.6.22.1+imq1/net/ipv4/netfilter/Kconfig
713 --- linux-2.6.22.1/net/ipv4/netfilter/Kconfig 2007-07-14 15:41:25.000000000 +0930
714 +++ linux-2.6.22.1+imq1/net/ipv4/netfilter/Kconfig 2007-07-15 07:13:30.000000000 +0930
717 To compile it as a module, choose M here. If unsure, say N.
719 +config IP_NF_TARGET_IMQ
720 + tristate "IMQ target support"
721 + depends on IP_NF_MANGLE
723 + This option adds a `IMQ' target which is used to specify if and
724 + to which IMQ device packets should get enqueued/dequeued.
726 + For more information visit: http://www.linuximq.net/
728 + To compile it as a module, choose M here. If unsure, say N.
730 config IP_NF_TARGET_TOS
731 tristate "TOS target support"
732 depends on IP_NF_MANGLE
733 diff -urN linux-2.6.22.1/net/ipv4/netfilter/Makefile linux-2.6.22.1+imq1/net/ipv4/netfilter/Makefile
734 --- linux-2.6.22.1/net/ipv4/netfilter/Makefile 2007-07-14 15:41:25.000000000 +0930
735 +++ linux-2.6.22.1+imq1/net/ipv4/netfilter/Makefile 2007-07-15 07:13:30.000000000 +0930
737 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
738 obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
739 obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
740 +obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
741 obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
742 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
743 obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
744 diff -urN linux-2.6.22.1/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.22.1+imq1/net/ipv6/netfilter/ip6t_IMQ.c
745 --- linux-2.6.22.1/net/ipv6/netfilter/ip6t_IMQ.c 1970-01-01 09:30:00.000000000 +0930
746 +++ linux-2.6.22.1+imq1/net/ipv6/netfilter/ip6t_IMQ.c 2007-07-15 07:13:30.000000000 +0930
749 + * This target marks packets to be enqueued to an imq device
751 +#include <linux/module.h>
752 +#include <linux/skbuff.h>
753 +#include <linux/netfilter_ipv6/ip6_tables.h>
754 +#include <linux/netfilter_ipv6/ip6t_IMQ.h>
755 +#include <linux/imq.h>
757 +static unsigned int imq_target(struct sk_buff **pskb,
758 + const struct net_device *in,
759 + const struct net_device *out,
760 + unsigned int hooknum,
761 + const struct xt_target *target,
762 + const void *targinfo)
764 + struct ip6t_imq_info *mr = (struct ip6t_imq_info*)targinfo;
766 + (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE;
768 + return XT_CONTINUE;
771 +static int imq_checkentry(const char *tablename,
773 + const struct xt_target *target,
775 + unsigned int hook_mask)
777 + struct ip6t_imq_info *mr;
779 + mr = (struct ip6t_imq_info*)targinfo;
781 + if (mr->todev > IMQ_MAX_DEVS) {
782 + printk(KERN_WARNING
783 + "IMQ: invalid device specified, highest is %u\n",
791 +static struct xt_target ip6t_imq_reg = {
793 + .family = AF_INET6,
794 + .target = imq_target,
795 + .targetsize = sizeof(struct ip6t_imq_info),
797 + .checkentry = imq_checkentry,
801 +static int __init init(void)
803 + return xt_register_target(&ip6t_imq_reg);
806 +static void __exit fini(void)
808 + xt_unregister_target(&ip6t_imq_reg);
814 +MODULE_AUTHOR("http://www.linuximq.net");
815 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
816 +MODULE_LICENSE("GPL");
817 diff -urN linux-2.6.22.1/net/ipv6/netfilter/Kconfig linux-2.6.22.1+imq1/net/ipv6/netfilter/Kconfig
818 --- linux-2.6.22.1/net/ipv6/netfilter/Kconfig 2007-07-14 15:41:26.000000000 +0930
819 +++ linux-2.6.22.1+imq1/net/ipv6/netfilter/Kconfig 2007-07-15 07:13:30.000000000 +0930
822 To compile it as a module, choose M here. If unsure, say N.
824 +config IP6_NF_TARGET_IMQ
825 + tristate "IMQ target support"
826 + depends on IP6_NF_MANGLE
828 + This option adds a `IMQ' target which is used to specify if and
829 + to which imq device packets should get enqueued/dequeued.
831 + To compile it as a module, choose M here. If unsure, say N.
833 config IP6_NF_TARGET_HL
834 tristate 'HL (hoplimit) target support'
835 depends on IP6_NF_MANGLE
836 diff -urN linux-2.6.22.1/net/ipv6/netfilter/Makefile linux-2.6.22.1+imq1/net/ipv6/netfilter/Makefile
837 --- linux-2.6.22.1/net/ipv6/netfilter/Makefile 2007-07-14 15:38:30.000000000 +0930
838 +++ linux-2.6.22.1+imq1/net/ipv6/netfilter/Makefile 2007-07-15 07:13:30.000000000 +0930
840 obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
841 obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
842 obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
843 +obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
844 obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o
845 obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
846 obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
847 diff -urN linux-2.6.22.1/net/sched/sch_generic.c linux-2.6.22.1+imq1/net/sched/sch_generic.c
848 --- linux-2.6.22.1/net/sched/sch_generic.c 2007-07-14 15:41:27.000000000 +0930
849 +++ linux-2.6.22.1+imq1/net/sched/sch_generic.c 2007-07-15 07:13:30.000000000 +0930
852 NOTE: Called under dev->queue_lock with locally disabled BH.
855 static inline int qdisc_restart(struct net_device *dev)
857 struct Qdisc *q = dev->qdisc;
862 +int qdisc_restart1(struct net_device *dev)
864 + return qdisc_restart(dev);
867 void __qdisc_run(struct net_device *dev)
871 EXPORT_SYMBOL(qdisc_reset);
872 EXPORT_SYMBOL(qdisc_lock_tree);
873 EXPORT_SYMBOL(qdisc_unlock_tree);
874 +EXPORT_SYMBOL(qdisc_restart1);