2 +++ b/drivers/net/imq.c
5 + * Pseudo-driver for the intermediate queue device.
7 + * This program is free software; you can redistribute it and/or
8 + * modify it under the terms of the GNU General Public License
9 + * as published by the Free Software Foundation; either version
10 + * 2 of the License, or (at your option) any later version.
12 + * Authors: Patrick McHardy, <kaber@trash.net>
14 + * The first version was written by Martin Devera, <devik@cdi.cz>
16 + * Credits: Jan Rafaj <imq2t@cedric.vabo.cz>
17 + * - Update patch to 2.4.21
18 + * Sebastian Strollo <sstrollo@nortelnetworks.com>
19 + * - Fix "Dead-loop on netdevice imq"-issue
20 + * Marcel Sebek <sebek64@post.cz>
21 + * - Update to 2.6.2-rc1
23 + * After some time of inactivity there is a group taking care
24 + * of IMQ again: http://www.linuximq.net
27 + * 2004/06/30 - New version of IMQ patch to kernels <=2.6.7 including
28 + * the following changes:
30 + * - Correction of ipv6 support "+"s issue (Hasso Tepper)
31 + * - Correction of imq_init_devs() issue that resulted in
32 + * kernel OOPS unloading IMQ as module (Norbert Buchmuller)
33 + * - Addition of functionality to choose number of IMQ devices
34 + * during kernel config (Andre Correa)
35 + * - Addition of functionality to choose how IMQ hooks on
36 + * PRE and POSTROUTING (after or before NAT) (Andre Correa)
37 + * - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
40 + * 2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
41 + * released with almost no problems. 2.6.14-x was released
42 + * with some important changes: nfcache was removed; After
43 + * some weeks of trouble we figured out that some IMQ fields
44 + * in skb were missing in skbuff.c - skb_clone and copy_skb_header.
45 + * These functions are correctly patched by this new patch version.
47 + * Thanks for all who helped to figure out all the problems with
48 + * 2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
49 + * Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
50 + * I didn't forget anybody). I apologize again for my lack of time.
52 + * More info at: http://www.linuximq.net/ (Andre Correa)
55 +#include <linux/module.h>
56 +#include <linux/kernel.h>
57 +#include <linux/moduleparam.h>
58 +#include <linux/skbuff.h>
59 +#include <linux/netdevice.h>
60 +#include <linux/rtnetlink.h>
61 +#include <linux/if_arp.h>
62 +#include <linux/netfilter.h>
63 +#include <linux/netfilter_ipv4.h>
64 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
65 + #include <linux/netfilter_ipv6.h>
67 +#include <linux/imq.h>
68 +#include <net/pkt_sched.h>
70 +extern int qdisc_restart1(struct net_device *dev);
72 +static nf_hookfn imq_nf_hook;
74 +static struct nf_hook_ops imq_ingress_ipv4 = {
75 + .hook = imq_nf_hook,
76 + .owner = THIS_MODULE,
78 + .hooknum = NF_IP_PRE_ROUTING,
79 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
80 + .priority = NF_IP_PRI_MANGLE + 1
82 + .priority = NF_IP_PRI_NAT_DST + 1
86 +static struct nf_hook_ops imq_egress_ipv4 = {
87 + .hook = imq_nf_hook,
88 + .owner = THIS_MODULE,
90 + .hooknum = NF_IP_POST_ROUTING,
91 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
92 + .priority = NF_IP_PRI_LAST
94 + .priority = NF_IP_PRI_NAT_SRC - 1
98 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
99 +static struct nf_hook_ops imq_ingress_ipv6 = {
100 + .hook = imq_nf_hook,
101 + .owner = THIS_MODULE,
103 + .hooknum = NF_IP6_PRE_ROUTING,
104 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
105 + .priority = NF_IP6_PRI_MANGLE + 1
107 + .priority = NF_IP6_PRI_NAT_DST + 1
111 +static struct nf_hook_ops imq_egress_ipv6 = {
112 + .hook = imq_nf_hook,
113 + .owner = THIS_MODULE,
115 + .hooknum = NF_IP6_POST_ROUTING,
116 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
117 + .priority = NF_IP6_PRI_LAST
119 + .priority = NF_IP6_PRI_NAT_SRC - 1
124 +#if defined(CONFIG_IMQ_NUM_DEVS)
125 +static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
127 +static unsigned int numdevs = 16;
130 +static struct net_device *imq_devs;
132 +static struct net_device_stats *imq_get_stats(struct net_device *dev)
134 + return (struct net_device_stats *)dev->priv;
137 +/* called for packets kfree'd in qdiscs at places other than enqueue */
138 +static void imq_skb_destructor(struct sk_buff *skb)
140 + struct nf_info *info = skb->nf_info;
144 + dev_put(info->indev);
146 + dev_put(info->outdev);
151 +static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
153 + struct net_device_stats *stats = (struct net_device_stats*) dev->priv;
155 + stats->tx_bytes += skb->len;
156 + stats->tx_packets++;
158 + skb->imq_flags = 0;
159 + skb->destructor = NULL;
161 + dev->trans_start = jiffies;
162 + nf_reinject(skb, skb->nf_info, NF_ACCEPT);
166 +static int imq_nf_queue(struct sk_buff *skb, struct nf_info *info, unsigned queue_num, void *data)
168 + struct net_device *dev;
169 + struct net_device_stats *stats;
170 + struct sk_buff *skb2 = NULL;
172 + unsigned int index = skb->imq_flags&IMQ_F_IFMASK;
175 + if (index > numdevs)
178 + dev = imq_devs + index;
179 + if (!(dev->flags & IFF_UP)) {
180 + skb->imq_flags = 0;
181 + nf_reinject(skb, info, NF_ACCEPT);
184 + dev->last_rx = jiffies;
186 + if (skb->destructor) {
188 + skb = skb_clone(skb, GFP_ATOMIC);
192 + skb->nf_info = info;
194 + stats = (struct net_device_stats *)dev->priv;
195 + stats->rx_bytes+= skb->len;
196 + stats->rx_packets++;
198 + spin_lock_bh(&dev->queue_lock);
201 + q->enqueue(skb_get(skb), q);
202 + if (skb_shared(skb)) {
203 + skb->destructor = imq_skb_destructor;
208 + if (spin_is_locked(&dev->_xmit_lock))
209 + netif_schedule(dev);
211 + while (!netif_queue_stopped(dev) && qdisc_restart1(dev) < 0)
214 + spin_unlock_bh(&dev->queue_lock);
217 + kfree_skb(ret ? skb : skb2);
222 +static struct nf_queue_handler nfqh = {
224 + .outfn = imq_nf_queue,
227 +static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
228 + const struct net_device *indev,
229 + const struct net_device *outdev,
230 + int (*okfn)(struct sk_buff *))
232 + if (pskb->imq_flags & IMQ_F_ENQUEUE)
239 +static int __init imq_init_hooks(void)
243 + err = nf_register_queue_handler(PF_INET, &nfqh);
246 + if ((err = nf_register_hook(&imq_ingress_ipv4)))
248 + if ((err = nf_register_hook(&imq_egress_ipv4)))
250 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
251 + if ((err = nf_register_queue_handler(PF_INET6, &nfqh)))
253 + if ((err = nf_register_hook(&imq_ingress_ipv6)))
255 + if ((err = nf_register_hook(&imq_egress_ipv6)))
261 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
263 + nf_unregister_hook(&imq_ingress_ipv6);
265 + nf_unregister_queue_handler(PF_INET6, &nfqh);
267 + nf_unregister_hook(&imq_egress_ipv4);
270 + nf_unregister_hook(&imq_ingress_ipv4);
272 + nf_unregister_queue_handler(PF_INET, &nfqh);
277 +static void __exit imq_unhook(void)
279 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
280 + nf_unregister_hook(&imq_ingress_ipv6);
281 + nf_unregister_hook(&imq_egress_ipv6);
282 + nf_unregister_queue_handler(PF_INET6, &nfqh);
284 + nf_unregister_hook(&imq_ingress_ipv4);
285 + nf_unregister_hook(&imq_egress_ipv4);
286 + nf_unregister_queue_handler(PF_INET, &nfqh);
289 +static int __init imq_dev_init(struct net_device *dev)
291 + dev->hard_start_xmit = imq_dev_xmit;
292 + dev->type = ARPHRD_VOID;
294 + dev->tx_queue_len = 11000;
295 + dev->flags = IFF_NOARP;
296 + dev->priv = kzalloc(sizeof(struct net_device_stats), GFP_KERNEL);
297 + if (dev->priv == NULL)
299 + dev->get_stats = imq_get_stats;
304 +static void imq_dev_uninit(struct net_device *dev)
309 +static int __init imq_init_devs(struct net *net)
311 + struct net_device *dev;
315 + if (!numdevs || numdevs > IMQ_MAX_DEVS) {
316 + printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
321 + imq_devs = kzalloc(sizeof(struct net_device) * numdevs, GFP_KERNEL);
325 + /* we start counting at zero */
328 + for (i = 0, dev = imq_devs; i <= numdevs; i++, dev++) {
329 + strcpy(dev->name, "imq%d");
330 + dev->init = imq_dev_init;
331 + dev->uninit = imq_dev_uninit;
334 + if (register_netdev(dev) < 0)
337 + printk(KERN_INFO "IMQ starting with %u devices...\n", j);
342 + unregister_netdev(--dev);
347 +static void imq_cleanup_devs(void)
350 + struct net_device *dev = imq_devs;
352 + for (i = 0; i <= numdevs; i++)
353 + unregister_netdev(dev++);
358 +static __net_init int imq_init_module(struct net *net)
362 + if ((err = imq_init_devs(net))) {
363 + printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
366 + if ((err = imq_init_hooks())) {
367 + printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
368 + imq_cleanup_devs();
372 + printk(KERN_INFO "IMQ driver loaded successfully.\n");
374 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
375 + printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
377 + printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
379 +#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
380 + printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
382 + printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
388 +static __net_exit void imq_exit_module(struct net *net)
391 + imq_cleanup_devs();
392 + printk(KERN_INFO "IMQ driver unloaded successfully.\n");
395 +static struct pernet_operations __net_initdata imq_net_ops = {
396 + .init = imq_init_module,
397 + .exit = imq_exit_module,
400 +static int __init imq_init(void)
402 + return register_pernet_device(&imq_net_ops);
405 +module_init(imq_init);
406 +//module_exit(imq_cleanup_module);
408 +module_param(numdevs, int, 0);
409 +MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will be created)");
410 +MODULE_AUTHOR("http://www.linuximq.net");
411 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
412 +MODULE_LICENSE("GPL");
413 --- a/drivers/net/Kconfig
414 +++ b/drivers/net/Kconfig
415 @@ -112,6 +112,129 @@ config EQUALIZER
416 To compile this driver as a module, choose M here: the module
417 will be called eql. If unsure, say N.
420 + tristate "IMQ (intermediate queueing device) support"
421 + depends on NETDEVICES && NETFILTER
423 + The IMQ device(s) is used as placeholder for QoS queueing
424 + disciplines. Every packet entering/leaving the IP stack can be
425 + directed through the IMQ device where it's enqueued/dequeued to the
426 + attached qdisc. This allows you to treat network devices as classes
427 + and distribute bandwidth among them. Iptables is used to specify
428 + through which IMQ device, if any, packets travel.
430 + More information at: http://www.linuximq.net/
432 + To compile this driver as a module, choose M here: the module
433 + will be called imq. If unsure, say N.
436 + prompt "IMQ behavior (PRE/POSTROUTING)"
438 + default IMQ_BEHAVIOR_BB
441 + This settings defines how IMQ behaves in respect to its
442 + hooking in PREROUTING and POSTROUTING.
444 + IMQ can work in any of the following ways:
446 + PREROUTING | POSTROUTING
447 + -----------------|-------------------
448 + #1 After NAT | After NAT
449 + #2 After NAT | Before NAT
450 + #3 Before NAT | After NAT
451 + #4 Before NAT | Before NAT
453 + The default behavior is to hook before NAT on PREROUTING
454 + and after NAT on POSTROUTING (#3).
456 + This settings are specially usefull when trying to use IMQ
457 + to shape NATed clients.
459 + More information can be found at: www.linuximq.net
461 + If not sure leave the default settings alone.
463 +config IMQ_BEHAVIOR_AA
466 + This settings defines how IMQ behaves in respect to its
467 + hooking in PREROUTING and POSTROUTING.
469 + Choosing this option will make IMQ hook like this:
471 + PREROUTING: After NAT
472 + POSTROUTING: After NAT
474 + More information can be found at: www.linuximq.net
476 + If not sure leave the default settings alone.
478 +config IMQ_BEHAVIOR_AB
481 + This settings defines how IMQ behaves in respect to its
482 + hooking in PREROUTING and POSTROUTING.
484 + Choosing this option will make IMQ hook like this:
486 + PREROUTING: After NAT
487 + POSTROUTING: Before NAT
489 + More information can be found at: www.linuximq.net
491 + If not sure leave the default settings alone.
493 +config IMQ_BEHAVIOR_BA
496 + This settings defines how IMQ behaves in respect to its
497 + hooking in PREROUTING and POSTROUTING.
499 + Choosing this option will make IMQ hook like this:
501 + PREROUTING: Before NAT
502 + POSTROUTING: After NAT
504 + More information can be found at: www.linuximq.net
506 + If not sure leave the default settings alone.
508 +config IMQ_BEHAVIOR_BB
511 + This settings defines how IMQ behaves in respect to its
512 + hooking in PREROUTING and POSTROUTING.
514 + Choosing this option will make IMQ hook like this:
516 + PREROUTING: Before NAT
517 + POSTROUTING: Before NAT
519 + More information can be found at: www.linuximq.net
521 + If not sure leave the default settings alone.
527 + int "Number of IMQ devices"
533 + This settings defines how many IMQ devices will be
536 + The default value is 16.
538 + More information can be found at: www.linuximq.net
540 + If not sure leave the default settings alone.
543 tristate "Universal TUN/TAP device driver support"
545 --- a/drivers/net/Makefile
546 +++ b/drivers/net/Makefile
547 @@ -139,6 +139,7 @@ obj-$(CONFIG_SLHC) += slhc.o
548 obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
550 obj-$(CONFIG_DUMMY) += dummy.o
551 +obj-$(CONFIG_IMQ) += imq.o
552 obj-$(CONFIG_IFB) += ifb.o
553 obj-$(CONFIG_MACVLAN) += macvlan.o
554 obj-$(CONFIG_DE600) += de600.o
556 +++ b/include/linux/imq.h
561 +#define IMQ_MAX_DEVS 16
563 +#define IMQ_F_IFMASK 0x7f
564 +#define IMQ_F_ENQUEUE 0x80
568 +++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
573 +struct ipt_imq_info {
574 + unsigned int todev; /* target imq device */
577 +#endif /* _IPT_IMQ_H */
579 +++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
584 +struct ip6t_imq_info {
585 + unsigned int todev; /* target imq device */
588 +#endif /* _IP6T_IMQ_H */
589 --- a/include/linux/skbuff.h
590 +++ b/include/linux/skbuff.h
591 @@ -295,6 +295,10 @@ struct sk_buff {
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 @@ -1728,6 +1732,10 @@ static inline void __nf_copy(struct sk_b
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);
616 #include <net/net_namespace.h>
617 #include <net/sock.h>
618 #include <linux/rtnetlink.h>
619 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
620 +#include <linux/imq.h>
622 #include <linux/proc_fs.h>
623 #include <linux/seq_file.h>
624 #include <linux/stat.h>
625 @@ -1533,7 +1536,11 @@ static int dev_gso_segment(struct sk_buf
626 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
628 if (likely(!skb->next)) {
629 - if (!list_empty(&ptype_all))
630 + if (!list_empty(&ptype_all)
631 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
632 + && !(skb->imq_flags & IMQ_F_ENQUEUE)
635 dev_queue_xmit_nit(skb, dev);
637 if (netif_needs_gso(dev, skb)) {
639 +++ b/net/ipv4/netfilter/ipt_IMQ.c
642 + * This target marks packets to be enqueued to an imq device
644 +#include <linux/module.h>
645 +#include <linux/skbuff.h>
646 +#include <linux/netfilter_ipv4/ip_tables.h>
647 +#include <linux/netfilter_ipv4/ipt_IMQ.h>
648 +#include <linux/imq.h>
650 +static unsigned int imq_target(struct sk_buff *pskb,
651 + const struct net_device *in,
652 + const struct net_device *out,
653 + unsigned int hooknum,
654 + const struct xt_target *target,
655 + const void *targinfo)
657 + struct ipt_imq_info *mr = (struct ipt_imq_info*)targinfo;
659 + pskb->imq_flags = mr->todev | IMQ_F_ENQUEUE;
661 + return XT_CONTINUE;
664 +static bool imq_checkentry(const char *tablename,
666 + const struct xt_target *target,
668 + unsigned int hook_mask)
670 + struct ipt_imq_info *mr;
672 + mr = (struct ipt_imq_info*)targinfo;
674 + if (mr->todev > IMQ_MAX_DEVS) {
675 + printk(KERN_WARNING
676 + "IMQ: invalid device specified, highest is %u\n",
684 +static struct xt_target ipt_imq_reg = {
687 + .target = imq_target,
688 + .targetsize = sizeof(struct ipt_imq_info),
689 + .checkentry = imq_checkentry,
694 +static int __init init(void)
696 + return xt_register_target(&ipt_imq_reg);
699 +static void __exit fini(void)
701 + xt_unregister_target(&ipt_imq_reg);
707 +MODULE_AUTHOR("http://www.linuximq.net");
708 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
709 +MODULE_LICENSE("GPL");
710 --- a/net/ipv4/netfilter/Kconfig
711 +++ b/net/ipv4/netfilter/Kconfig
712 @@ -333,6 +333,17 @@ config IP_NF_MANGLE
714 To compile it as a module, choose M here. If unsure, say N.
716 +config IP_NF_TARGET_IMQ
717 + tristate "IMQ target support"
718 + depends on IP_NF_MANGLE
720 + This option adds a `IMQ' target which is used to specify if and
721 + to which IMQ device packets should get enqueued/dequeued.
723 + For more information visit: http://www.linuximq.net/
725 + To compile it as a module, choose M here. If unsure, say N.
727 config IP_NF_TARGET_TOS
728 tristate "TOS target support"
729 depends on IP_NF_MANGLE
730 --- a/net/ipv4/netfilter/Makefile
731 +++ b/net/ipv4/netfilter/Makefile
732 @@ -58,6 +58,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i
733 obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
734 obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
735 obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
736 +obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
737 obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
738 obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
739 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
741 +++ b/net/ipv6/netfilter/ip6t_IMQ.c
744 + * This target marks packets to be enqueued to an imq device
746 +#include <linux/module.h>
747 +#include <linux/skbuff.h>
748 +#include <linux/netfilter_ipv6/ip6_tables.h>
749 +#include <linux/netfilter_ipv6/ip6t_IMQ.h>
750 +#include <linux/imq.h>
752 +static unsigned int imq_target(struct sk_buff *pskb,
753 + const struct net_device *in,
754 + const struct net_device *out,
755 + unsigned int hooknum,
756 + const struct xt_target *target,
757 + const void *targinfo)
759 + struct ip6t_imq_info *mr = (struct ip6t_imq_info*)targinfo;
761 + pskb->imq_flags = mr->todev | IMQ_F_ENQUEUE;
763 + return XT_CONTINUE;
766 +static bool imq_checkentry(const char *tablename,
768 + const struct xt_target *target,
770 + unsigned int hook_mask)
772 + struct ip6t_imq_info *mr;
774 + mr = (struct ip6t_imq_info*)targinfo;
776 + if (mr->todev > IMQ_MAX_DEVS) {
777 + printk(KERN_WARNING
778 + "IMQ: invalid device specified, highest is %u\n",
786 +static struct xt_target ip6t_imq_reg = {
788 + .family = AF_INET6,
789 + .target = imq_target,
790 + .targetsize = sizeof(struct ip6t_imq_info),
792 + .checkentry = imq_checkentry,
796 +static int __init init(void)
798 + return xt_register_target(&ip6t_imq_reg);
801 +static void __exit fini(void)
803 + xt_unregister_target(&ip6t_imq_reg);
809 +MODULE_AUTHOR("http://www.linuximq.net");
810 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
811 +MODULE_LICENSE("GPL");
812 --- a/net/ipv6/netfilter/Kconfig
813 +++ b/net/ipv6/netfilter/Kconfig
814 @@ -173,6 +173,15 @@ config IP6_NF_MANGLE
816 To compile it as a module, choose M here. If unsure, say N.
818 +config IP6_NF_TARGET_IMQ
819 + tristate "IMQ target support"
820 + depends on IP6_NF_MANGLE
822 + This option adds a `IMQ' target which is used to specify if and
823 + to which imq device packets should get enqueued/dequeued.
825 + To compile it as a module, choose M here. If unsure, say N.
827 config IP6_NF_TARGET_HL
828 tristate 'HL (hoplimit) target support'
829 depends on IP6_NF_MANGLE
830 --- a/net/ipv6/netfilter/Makefile
831 +++ b/net/ipv6/netfilter/Makefile
833 obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
834 obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
835 obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
836 +obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
837 obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
838 obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
840 --- a/net/sched/sch_generic.c
841 +++ b/net/sched/sch_generic.c
842 @@ -176,6 +176,11 @@ static inline int qdisc_restart(struct n
846 +int qdisc_restart1(struct net_device *dev)
848 + return qdisc_restart(dev);
851 void __qdisc_run(struct net_device *dev)
853 unsigned long start_time = jiffies;
854 @@ -650,3 +655,4 @@ EXPORT_SYMBOL(qdisc_destroy);
855 EXPORT_SYMBOL(qdisc_reset);
856 EXPORT_SYMBOL(qdisc_lock_tree);
857 EXPORT_SYMBOL(qdisc_unlock_tree);
858 +EXPORT_SYMBOL(qdisc_restart1);