target/linux/generic-2.6/patches-2.6.23/150-netfilter_imq.patch

   1 --- /dev/null
   2 +++ b/drivers/net/imq.c
   3 @@ -0,0 +1,400 @@
   4 +/*
   5 + *             Pseudo-driver for the intermediate queue device.
   6 + *
   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.
  11 + *
  12 + * Authors:    Patrick McHardy, <kaber@trash.net>
  13 + *
  14 + *            The first version was written by Martin Devera, <devik@cdi.cz>
  15 + *
  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
  22 + *
  23 + *            After some time of inactivity there is a group taking care
  24 + *            of IMQ again: http://www.linuximq.net
  25 + *
  26 + *
  27 + *            2004/06/30 - New version of IMQ patch to kernels <=2.6.7 including
  28 + *            the following changes:
  29 + *
  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)
  38 + *
  39 + *
  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.
  46 + *
  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.
  51 + *
  52 + *             More info at: http://www.linuximq.net/ (Andre Correa)
  53 + */
  54 +
  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>
  66 +#endif
  67 +#include <linux/imq.h>
  68 +#include <net/pkt_sched.h>
  69 +
  70 +extern int qdisc_restart1(struct net_device *dev);
  71 +
  72 +static nf_hookfn imq_nf_hook;
  73 +
  74 +static struct nf_hook_ops imq_ingress_ipv4 = {
  75 +       .hook           = imq_nf_hook,
  76 +       .owner          = THIS_MODULE,
  77 +       .pf             = PF_INET,
  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
  81 +#else
  82 +       .priority       = NF_IP_PRI_NAT_DST + 1
  83 +#endif
  84 +};
  85 +
  86 +static struct nf_hook_ops imq_egress_ipv4 = {
  87 +       .hook           = imq_nf_hook,
  88 +       .owner          = THIS_MODULE,
  89 +       .pf             = PF_INET,
  90 +       .hooknum        = NF_IP_POST_ROUTING,
  91 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
  92 +       .priority       = NF_IP_PRI_LAST
  93 +#else
  94 +       .priority       = NF_IP_PRI_NAT_SRC - 1
  95 +#endif
  96 +};
  97 +
  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,
 102 +       .pf             = PF_INET6,
 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
 106 +#else
 107 +       .priority       = NF_IP6_PRI_NAT_DST + 1
 108 +#endif
 109 +};
 110 +
 111 +static struct nf_hook_ops imq_egress_ipv6 = {
 112 +       .hook           = imq_nf_hook,
 113 +       .owner          = THIS_MODULE,
 114 +       .pf             = PF_INET6,
 115 +       .hooknum        = NF_IP6_POST_ROUTING,
 116 +#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
 117 +       .priority       = NF_IP6_PRI_LAST
 118 +#else
 119 +       .priority       = NF_IP6_PRI_NAT_SRC - 1
 120 +#endif
 121 +};
 122 +#endif
 123 +
 124 +#if defined(CONFIG_IMQ_NUM_DEVS)
 125 +static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
 126 +#else
 127 +static unsigned int numdevs = 16;
 128 +#endif
 129 +
 130 +static struct net_device *imq_devs;
 131 +
 132 +static struct net_device_stats *imq_get_stats(struct net_device *dev)
 133 +{
 134 +       return (struct net_device_stats *)dev->priv;
 135 +}
 136 +
 137 +/* called for packets kfree'd in qdiscs at places other than enqueue */
 138 +static void imq_skb_destructor(struct sk_buff *skb)
 139 +{
 140 +       struct nf_info *info = skb->nf_info;
 141 +
 142 +       if (info) {
 143 +               if (info->indev)
 144 +                       dev_put(info->indev);
 145 +               if (info->outdev)
 146 +                       dev_put(info->outdev);
 147 +               kfree(info);
 148 +       }
 149 +}
 150 +
 151 +static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
 152 +{
 153 +       struct net_device_stats *stats = (struct net_device_stats*) dev->priv;
 154 +
 155 +       stats->tx_bytes += skb->len;
 156 +       stats->tx_packets++;
 157 +
 158 +       skb->imq_flags = 0;
 159 +       skb->destructor = NULL;
 160 +
 161 +       dev->trans_start = jiffies;
 162 +       nf_reinject(skb, skb->nf_info, NF_ACCEPT);
 163 +       return 0;
 164 +}
 165 +
 166 +static int imq_nf_queue(struct sk_buff *skb, struct nf_info *info, unsigned queue_num, void *data)
 167 +{
 168 +       struct net_device *dev;
 169 +       struct net_device_stats *stats;
 170 +       struct sk_buff *skb2 = NULL;
 171 +       struct Qdisc *q;
 172 +       unsigned int index = skb->imq_flags&IMQ_F_IFMASK;
 173 +       int ret = -1;
 174 +
 175 +       if (index > numdevs)
 176 +               return -1;
 177 +
 178 +       dev = imq_devs + index;
 179 +       if (!(dev->flags & IFF_UP)) {
 180 +               skb->imq_flags = 0;
 181 +               nf_reinject(skb, info, NF_ACCEPT);
 182 +               return 0;
 183 +       }
 184 +       dev->last_rx = jiffies;
 185 +
 186 +       if (skb->destructor) {
 187 +               skb2 = skb;
 188 +               skb = skb_clone(skb, GFP_ATOMIC);
 189 +               if (!skb)
 190 +                       return -1;
 191 +       }
 192 +       skb->nf_info = info;
 193 +
 194 +       stats = (struct net_device_stats *)dev->priv;
 195 +       stats->rx_bytes+= skb->len;
 196 +       stats->rx_packets++;
 197 +
 198 +       spin_lock_bh(&dev->queue_lock);
 199 +       q = dev->qdisc;
 200 +       if (q->enqueue) {
 201 +               q->enqueue(skb_get(skb), q);
 202 +               if (skb_shared(skb)) {
 203 +                       skb->destructor = imq_skb_destructor;
 204 +                       kfree_skb(skb);
 205 +                       ret = 0;
 206 +               }
 207 +       }
 208 +       if (spin_is_locked(&dev->_xmit_lock))
 209 +               netif_schedule(dev);
 210 +       else
 211 +               while (!netif_queue_stopped(dev) && qdisc_restart1(dev) < 0)
 212 +                       /* NOTHING */;
 213 +
 214 +       spin_unlock_bh(&dev->queue_lock);
 215 +
 216 +       if (skb2)
 217 +               kfree_skb(ret ? skb : skb2);
 218 +
 219 +       return ret;
 220 +}
 221 +
 222 +static struct nf_queue_handler nfqh = {
 223 +       .name  = "imq",
 224 +       .outfn = imq_nf_queue,
 225 +};
 226 +
 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 *))
 231 +{
 232 +       if ((*pskb)->imq_flags & IMQ_F_ENQUEUE)
 233 +               return NF_QUEUE;
 234 +
 235 +       return NF_ACCEPT;
 236 +}
 237 +
 238 +
 239 +static int __init imq_init_hooks(void)
 240 +{
 241 +       int err;
 242 +
 243 +       err = nf_register_queue_handler(PF_INET, &nfqh);
 244 +       if (err > 0)
 245 +               goto err1;
 246 +       if ((err = nf_register_hook(&imq_ingress_ipv4)))
 247 +               goto err2;
 248 +       if ((err = nf_register_hook(&imq_egress_ipv4)))
 249 +               goto err3;
 250 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 251 +       if ((err = nf_register_queue_handler(PF_INET6, &nfqh)))
 252 +               goto err4;
 253 +       if ((err = nf_register_hook(&imq_ingress_ipv6)))
 254 +               goto err5;
 255 +       if ((err = nf_register_hook(&imq_egress_ipv6)))
 256 +               goto err6;
 257 +#endif
 258 +
 259 +       return 0;
 260 +
 261 +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 262 +err6:
 263 +       nf_unregister_hook(&imq_ingress_ipv6);
 264 +err5:
 265 +       nf_unregister_queue_handler(PF_INET6, &nfqh);
 266 +err4:
 267 +       nf_unregister_hook(&imq_egress_ipv4);
 268 +#endif
 269 +err3:
 270 +       nf_unregister_hook(&imq_ingress_ipv4);
 271 +err2:
 272 +       nf_unregister_queue_handler(PF_INET, &nfqh);
 273 +err1:
 274 +       return err;
 275 +}
 276 +
 277 +static void __exit imq_unhook(void)
 278 +{
 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);
 283 +#endif
 284 +       nf_unregister_hook(&imq_ingress_ipv4);
 285 +       nf_unregister_hook(&imq_egress_ipv4);
 286 +       nf_unregister_queue_handler(PF_INET, &nfqh);
 287 +}
 288 +
 289 +static int __init imq_dev_init(struct net_device *dev)
 290 +{
 291 +       dev->hard_start_xmit    = imq_dev_xmit;
 292 +       dev->type               = ARPHRD_VOID;
 293 +       dev->mtu                = 16000;
 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)
 298 +               return -ENOMEM;
 299 +       dev->get_stats          = imq_get_stats;
 300 +
 301 +       return 0;
 302 +}
 303 +
 304 +static void imq_dev_uninit(struct net_device *dev)
 305 +{
 306 +       kfree(dev->priv);
 307 +}
 308 +
 309 +static int __init imq_init_devs(void)
 310 +{
 311 +       struct net_device *dev;
 312 +       int i,j;
 313 +       j = numdevs;
 314 +
 315 +       if (!numdevs || numdevs > IMQ_MAX_DEVS) {
 316 +               printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
 317 +                      IMQ_MAX_DEVS);
 318 +               return -EINVAL;
 319 +       }
 320 +
 321 +       imq_devs = kzalloc(sizeof(struct net_device) * numdevs, GFP_KERNEL);
 322 +       if (!imq_devs)
 323 +               return -ENOMEM;
 324 +
 325 +       /* we start counting at zero */
 326 +       numdevs--;
 327 +
 328 +       for (i = 0, dev = imq_devs; i <= numdevs; i++, dev++) {
 329 +               SET_MODULE_OWNER(dev);
 330 +               strcpy(dev->name, "imq%d");
 331 +               dev->init   = imq_dev_init;
 332 +               dev->uninit = imq_dev_uninit;
 333 +
 334 +               if (register_netdev(dev) < 0)
 335 +                       goto err_register;
 336 +       }
 337 +       printk(KERN_INFO "IMQ starting with %u devices...\n", j);
 338 +       return 0;
 339 +
 340 +err_register:
 341 +       for (; i; i--)
 342 +               unregister_netdev(--dev);
 343 +       kfree(imq_devs);
 344 +       return -EIO;
 345 +}
 346 +
 347 +static void imq_cleanup_devs(void)
 348 +{
 349 +       int i;
 350 +       struct net_device *dev = imq_devs;
 351 +
 352 +       for (i = 0; i <= numdevs; i++)
 353 +               unregister_netdev(dev++);
 354 +
 355 +       kfree(imq_devs);
 356 +}
 357 +
 358 +static int __init imq_init_module(void)
 359 +{
 360 +       int err;
 361 +
 362 +       if ((err = imq_init_devs())) {
 363 +               printk(KERN_ERR "IMQ: Error trying imq_init_devs()\n");
 364 +               return err;
 365 +       }
 366 +       if ((err = imq_init_hooks())) {
 367 +               printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
 368 +               imq_cleanup_devs();
 369 +               return err;
 370 +       }
 371 +
 372 +       printk(KERN_INFO "IMQ driver loaded successfully.\n");
 373 +
 374 +#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
 375 +       printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
 376 +#else
 377 +       printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
 378 +#endif
 379 +#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
 380 +       printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
 381 +#else
 382 +       printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
 383 +#endif
 384 +
 385 +       return 0;
 386 +}
 387 +
 388 +static void __exit imq_cleanup_module(void)
 389 +{
 390 +       imq_unhook();
 391 +       imq_cleanup_devs();
 392 +       printk(KERN_INFO "IMQ driver unloaded successfully.\n");
 393 +}
 394 +
 395 +
 396 +module_init(imq_init_module);
 397 +module_exit(imq_cleanup_module);
 398 +
 399 +module_param(numdevs, int, 16);
 400 +MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will be created)");
 401 +MODULE_AUTHOR("http://www.linuximq.net");
 402 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 403 +MODULE_LICENSE("GPL");
 404 --- a/drivers/net/Kconfig
 405 +++ b/drivers/net/Kconfig
 406 @@ -112,6 +112,129 @@
 407           To compile this driver as a module, choose M here: the module
 408           will be called eql.  If unsure, say N.
 409
 410 +config IMQ
 411 +       tristate "IMQ (intermediate queueing device) support"
 412 +       depends on NETDEVICES && NETFILTER
 413 +       ---help---
 414 +         The IMQ device(s) is used as placeholder for QoS queueing
 415 +         disciplines. Every packet entering/leaving the IP stack can be
 416 +         directed through the IMQ device where it's enqueued/dequeued to the
 417 +         attached qdisc. This allows you to treat network devices as classes
 418 +         and distribute bandwidth among them. Iptables is used to specify
 419 +         through which IMQ device, if any, packets travel.
 420 +
 421 +         More information at: http://www.linuximq.net/
 422 +
 423 +         To compile this driver as a module, choose M here: the module
 424 +         will be called imq.  If unsure, say N.
 425 +
 426 +choice
 427 +       prompt "IMQ behavior (PRE/POSTROUTING)"
 428 +       depends on IMQ
 429 +       default IMQ_BEHAVIOR_AB
 430 +       help
 431 +
 432 +               This settings defines how IMQ behaves in respect to its
 433 +               hooking in PREROUTING and POSTROUTING.
 434 +
 435 +               IMQ can work in any of the following ways:
 436 +
 437 +                   PREROUTING   |      POSTROUTING
 438 +               -----------------|-------------------
 439 +               #1  After NAT    |      After NAT
 440 +               #2  After NAT    |      Before NAT
 441 +               #3  Before NAT   |      After NAT
 442 +               #4  Before NAT   |      Before NAT
 443 +
 444 +               The default behavior is to hook before NAT on PREROUTING
 445 +               and after NAT on POSTROUTING (#3).
 446 +
 447 +               This settings are specially usefull when trying to use IMQ
 448 +               to shape NATed clients.
 449 +
 450 +               More information can be found at: www.linuximq.net
 451 +
 452 +               If not sure leave the default settings alone.
 453 +
 454 +config IMQ_BEHAVIOR_AA
 455 +       bool "IMQ AA"
 456 +       help
 457 +               This settings defines how IMQ behaves in respect to its
 458 +               hooking in PREROUTING and POSTROUTING.
 459 +
 460 +               Choosing this option will make IMQ hook like this:
 461 +
 462 +               PREROUTING:   After NAT
 463 +               POSTROUTING:  After NAT
 464 +
 465 +               More information can be found at: www.linuximq.net
 466 +
 467 +               If not sure leave the default settings alone.
 468 +
 469 +config IMQ_BEHAVIOR_AB
 470 +       bool "IMQ AB"
 471 +       help
 472 +               This settings defines how IMQ behaves in respect to its
 473 +               hooking in PREROUTING and POSTROUTING.
 474 +
 475 +               Choosing this option will make IMQ hook like this:
 476 +
 477 +               PREROUTING:   After NAT
 478 +               POSTROUTING:  Before NAT
 479 +
 480 +               More information can be found at: www.linuximq.net
 481 +
 482 +               If not sure leave the default settings alone.
 483 +
 484 +config IMQ_BEHAVIOR_BA
 485 +       bool "IMQ BA"
 486 +       help
 487 +               This settings defines how IMQ behaves in respect to its
 488 +               hooking in PREROUTING and POSTROUTING.
 489 +
 490 +               Choosing this option will make IMQ hook like this:
 491 +
 492 +               PREROUTING:   Before NAT
 493 +               POSTROUTING:  After NAT
 494 +
 495 +               More information can be found at: www.linuximq.net
 496 +
 497 +               If not sure leave the default settings alone.
 498 +
 499 +config IMQ_BEHAVIOR_BB
 500 +       bool "IMQ BB"
 501 +       help
 502 +               This settings defines how IMQ behaves in respect to its
 503 +               hooking in PREROUTING and POSTROUTING.
 504 +
 505 +               Choosing this option will make IMQ hook like this:
 506 +
 507 +               PREROUTING:   Before NAT
 508 +               POSTROUTING:  Before NAT
 509 +
 510 +               More information can be found at: www.linuximq.net
 511 +
 512 +               If not sure leave the default settings alone.
 513 +
 514 +endchoice
 515 +
 516 +config IMQ_NUM_DEVS
 517 +
 518 +       int "Number of IMQ devices"
 519 +       range 2 16
 520 +       depends on IMQ
 521 +       default "16"
 522 +       help
 523 +
 524 +               This settings defines how many IMQ devices will be
 525 +               created.
 526 +
 527 +               The default value is 16.
 528 +
 529 +               More information can be found at: www.linuximq.net
 530 +
 531 +               If not sure leave the default settings alone.
 532 +
 533  config TUN
 534         tristate "Universal TUN/TAP device driver support"
 535         select CRC32
 536 --- a/drivers/net/Makefile
 537 +++ b/drivers/net/Makefile
 538 @@ -131,6 +131,7 @@
 539  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
 540
 541  obj-$(CONFIG_DUMMY) += dummy.o
 542 +obj-$(CONFIG_IMQ) += imq.o
 543  obj-$(CONFIG_IFB) += ifb.o
 544  obj-$(CONFIG_MACVLAN) += macvlan.o
 545  obj-$(CONFIG_DE600) += de600.o
 546 --- /dev/null
 547 +++ b/include/linux/imq.h
 548 @@ -0,0 +1,9 @@
 549 +#ifndef _IMQ_H
 550 +#define _IMQ_H
 551 +
 552 +#define IMQ_MAX_DEVS   16
 553 +
 554 +#define IMQ_F_IFMASK   0x7f
 555 +#define IMQ_F_ENQUEUE  0x80
 556 +
 557 +#endif /* _IMQ_H */
 558 --- /dev/null
 559 +++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
 560 @@ -0,0 +1,8 @@
 561 +#ifndef _IPT_IMQ_H
 562 +#define _IPT_IMQ_H
 563 +
 564 +struct ipt_imq_info {
 565 +       unsigned int todev;     /* target imq device */
 566 +};
 567 +
 568 +#endif /* _IPT_IMQ_H */
 569 --- /dev/null
 570 +++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
 571 @@ -0,0 +1,8 @@
 572 +#ifndef _IP6T_IMQ_H
 573 +#define _IP6T_IMQ_H
 574 +
 575 +struct ip6t_imq_info {
 576 +       unsigned int todev;     /* target imq device */
 577 +};
 578 +
 579 +#endif /* _IP6T_IMQ_H */
 580 --- a/include/linux/skbuff.h
 581 +++ b/include/linux/skbuff.h
 582 @@ -295,6 +295,10 @@
 583         struct nf_conntrack     *nfct;
 584         struct sk_buff          *nfct_reasm;
 585  #endif
 586 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 587 +       unsigned char           imq_flags;
 588 +       struct nf_info          *nf_info;
 589 +#endif
 590  #ifdef CONFIG_BRIDGE_NETFILTER
 591         struct nf_bridge_info   *nf_bridge;
 592  #endif
 593 @@ -1725,6 +1729,10 @@
 594         dst->nfct_reasm = src->nfct_reasm;
 595         nf_conntrack_get_reasm(src->nfct_reasm);
 596  #endif
 597 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 598 +       dst->imq_flags = src->imq_flags;
 599 +       dst->nf_info = src->nf_info;
 600 +#endif
 601  #ifdef CONFIG_BRIDGE_NETFILTER
 602         dst->nf_bridge  = src->nf_bridge;
 603         nf_bridge_get(src->nf_bridge);
 604 --- a/net/core/dev.c
 605 +++ b/net/core/dev.c
 606 @@ -94,6 +94,9 @@
 607  #include <linux/skbuff.h>
 608  #include <net/sock.h>
 609  #include <linux/rtnetlink.h>
 610 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 611 +#include <linux/imq.h>
 612 +#endif
 613  #include <linux/proc_fs.h>
 614  #include <linux/seq_file.h>
 615  #include <linux/stat.h>
 616 @@ -1462,7 +1465,11 @@
 617  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 618  {
 619         if (likely(!skb->next)) {
 620 -               if (!list_empty(&ptype_all))
 621 +               if (!list_empty(&ptype_all)
 622 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 623 +                   && !(skb->imq_flags & IMQ_F_ENQUEUE)
 624 +#endif
 625 +                   )
 626                         dev_queue_xmit_nit(skb, dev);
 627
 628                 if (netif_needs_gso(dev, skb)) {
 629 --- /dev/null
 630 +++ b/net/ipv4/netfilter/ipt_IMQ.c
 631 @@ -0,0 +1,69 @@
 632 +/*
 633 + * This target marks packets to be enqueued to an imq device
 634 + */
 635 +#include <linux/module.h>
 636 +#include <linux/skbuff.h>
 637 +#include <linux/netfilter_ipv4/ip_tables.h>
 638 +#include <linux/netfilter_ipv4/ipt_IMQ.h>
 639 +#include <linux/imq.h>
 640 +
 641 +static unsigned int imq_target(struct sk_buff **pskb,
 642 +                              const struct net_device *in,
 643 +                              const struct net_device *out,
 644 +                              unsigned int hooknum,
 645 +                              const struct xt_target *target,
 646 +                              const void *targinfo)
 647 +{
 648 +       struct ipt_imq_info *mr = (struct ipt_imq_info*)targinfo;
 649 +
 650 +       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE;
 651 +
 652 +       return XT_CONTINUE;
 653 +}
 654 +
 655 +static bool imq_checkentry(const char *tablename,
 656 +                         const void *e,
 657 +                         const struct xt_target *target,
 658 +                         void *targinfo,
 659 +                         unsigned int hook_mask)
 660 +{
 661 +       struct ipt_imq_info *mr;
 662 +
 663 +       mr = (struct ipt_imq_info*)targinfo;
 664 +
 665 +       if (mr->todev > IMQ_MAX_DEVS) {
 666 +               printk(KERN_WARNING
 667 +                      "IMQ: invalid device specified, highest is %u\n",
 668 +                      IMQ_MAX_DEVS);
 669 +               return 0;
 670 +       }
 671 +
 672 +       return 1;
 673 +}
 674 +
 675 +static struct xt_target ipt_imq_reg = {
 676 +       .name           = "IMQ",
 677 +       .family         = AF_INET,
 678 +       .target         = imq_target,
 679 +       .targetsize     = sizeof(struct ipt_imq_info),
 680 +       .checkentry     = imq_checkentry,
 681 +       .me             = THIS_MODULE,
 682 +       .table          = "mangle"
 683 +};
 684 +
 685 +static int __init init(void)
 686 +{
 687 +       return xt_register_target(&ipt_imq_reg);
 688 +}
 689 +
 690 +static void __exit fini(void)
 691 +{
 692 +       xt_unregister_target(&ipt_imq_reg);
 693 +}
 694 +
 695 +module_init(init);
 696 +module_exit(fini);
 697 +
 698 +MODULE_AUTHOR("http://www.linuximq.net");
 699 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 700 +MODULE_LICENSE("GPL");
 701 --- a/net/ipv4/netfilter/Kconfig
 702 +++ b/net/ipv4/netfilter/Kconfig
 703 @@ -333,6 +333,17 @@
 704
 705           To compile it as a module, choose M here.  If unsure, say N.
 706
 707 +config IP_NF_TARGET_IMQ
 708 +       tristate "IMQ target support"
 709 +       depends on IP_NF_MANGLE
 710 +       help
 711 +         This option adds a `IMQ' target which is used to specify if and
 712 +         to which IMQ device packets should get enqueued/dequeued.
 713 +
 714 +        For more information visit: http://www.linuximq.net/
 715 +
 716 +         To compile it as a module, choose M here.  If unsure, say N.
 717 +
 718  config IP_NF_TARGET_TOS
 719         tristate "TOS target support"
 720         depends on IP_NF_MANGLE
 721 --- a/net/ipv4/netfilter/Makefile
 722 +++ b/net/ipv4/netfilter/Makefile
 723 @@ -58,6 +58,7 @@
 724  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
 725  obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
 726  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
 727 +obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
 728  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
 729  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
 730  obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
 731 --- /dev/null
 732 +++ b/net/ipv6/netfilter/ip6t_IMQ.c
 733 @@ -0,0 +1,69 @@
 734 +/*
 735 + * This target marks packets to be enqueued to an imq device
 736 + */
 737 +#include <linux/module.h>
 738 +#include <linux/skbuff.h>
 739 +#include <linux/netfilter_ipv6/ip6_tables.h>
 740 +#include <linux/netfilter_ipv6/ip6t_IMQ.h>
 741 +#include <linux/imq.h>
 742 +
 743 +static unsigned int imq_target(struct sk_buff **pskb,
 744 +                              const struct net_device *in,
 745 +                              const struct net_device *out,
 746 +                              unsigned int hooknum,
 747 +                              const struct xt_target *target,
 748 +                              const void *targinfo)
 749 +{
 750 +       struct ip6t_imq_info *mr = (struct ip6t_imq_info*)targinfo;
 751 +
 752 +       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE;
 753 +
 754 +       return XT_CONTINUE;
 755 +}
 756 +
 757 +static bool imq_checkentry(const char *tablename,
 758 +                         const void *entry,
 759 +                         const struct xt_target *target,
 760 +                         void *targinfo,
 761 +                         unsigned int hook_mask)
 762 +{
 763 +       struct ip6t_imq_info *mr;
 764 +
 765 +       mr = (struct ip6t_imq_info*)targinfo;
 766 +
 767 +       if (mr->todev > IMQ_MAX_DEVS) {
 768 +               printk(KERN_WARNING
 769 +                      "IMQ: invalid device specified, highest is %u\n",
 770 +                      IMQ_MAX_DEVS);
 771 +               return 0;
 772 +       }
 773 +
 774 +       return 1;
 775 +}
 776 +
 777 +static struct xt_target ip6t_imq_reg = {
 778 +       .name           = "IMQ",
 779 +       .family         = AF_INET6,
 780 +       .target         = imq_target,
 781 +       .targetsize     = sizeof(struct ip6t_imq_info),
 782 +       .table          = "mangle",
 783 +       .checkentry     = imq_checkentry,
 784 +       .me             = THIS_MODULE
 785 +};
 786 +
 787 +static int __init init(void)
 788 +{
 789 +       return xt_register_target(&ip6t_imq_reg);
 790 +}
 791 +
 792 +static void __exit fini(void)
 793 +{
 794 +       xt_unregister_target(&ip6t_imq_reg);
 795 +}
 796 +
 797 +module_init(init);
 798 +module_exit(fini);
 799 +
 800 +MODULE_AUTHOR("http://www.linuximq.net");
 801 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 802 +MODULE_LICENSE("GPL");
 803 --- a/net/ipv6/netfilter/Kconfig
 804 +++ b/net/ipv6/netfilter/Kconfig
 805 @@ -173,6 +173,15 @@
 806
 807           To compile it as a module, choose M here.  If unsure, say N.
 808
 809 +config IP6_NF_TARGET_IMQ
 810 +       tristate "IMQ target support"
 811 +       depends on IP6_NF_MANGLE
 812 +       help
 813 +          This option adds a `IMQ' target which is used to specify if and
 814 +          to which imq device packets should get enqueued/dequeued.
 815 +
 816 +          To compile it as a module, choose M here.  If unsure, say N.
 817 +
 818  config IP6_NF_TARGET_HL
 819         tristate  'HL (hoplimit) target support'
 820         depends on IP6_NF_MANGLE
 821 --- a/net/ipv6/netfilter/Makefile
 822 +++ b/net/ipv6/netfilter/Makefile
 823 @@ -13,6 +13,7 @@
 824  obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
 825  obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
 826  obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
 827 +obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
 828  obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o
 829  obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
 830  obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
 831 --- a/net/sched/sch_generic.c
 832 +++ b/net/sched/sch_generic.c
 833 @@ -191,6 +191,11 @@
 834         return ret;
 835  }
 836
 837 +int qdisc_restart1(struct net_device *dev)
 838 +{
 839 +       return qdisc_restart(dev);
 840 +}
 841 +
 842  void __qdisc_run(struct net_device *dev)
 843  {
 844         do {
 845 @@ -620,3 +625,4 @@
 846  EXPORT_SYMBOL(qdisc_reset);
 847  EXPORT_SYMBOL(qdisc_lock_tree);
 848  EXPORT_SYMBOL(qdisc_unlock_tree);
 849 +EXPORT_SYMBOL(qdisc_restart1);