SOURCES (LINUX_2_6): kernel-imq.patch - updated (linux-2.6.25-imq5.diff).
pluto
pluto at pld-linux.org
Mon Sep 8 14:22:03 CEST 2008
Author: pluto Date: Mon Sep 8 12:22:03 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated (linux-2.6.25-imq5.diff).
---- Files affected:
SOURCES:
kernel-imq.patch (1.1.2.1.2.7 -> 1.1.2.1.2.8)
---- Diffs:
================================================================
Index: SOURCES/kernel-imq.patch
diff -u SOURCES/kernel-imq.patch:1.1.2.1.2.7 SOURCES/kernel-imq.patch:1.1.2.1.2.8
--- SOURCES/kernel-imq.patch:1.1.2.1.2.7 Tue May 20 20:38:26 2008
+++ SOURCES/kernel-imq.patch Mon Sep 8 14:21:56 2008
@@ -1,7 +1,6 @@
-diff -U 6 -Nr linux-2.6.25/drivers/net/imq.c linux-2.6.25+imq/drivers/net/imq.c
---- linux-2.6.25/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.25+imq/drivers/net/imq.c 2008-04-18 18:59:11.759564156 +0300
-@@ -0,0 +1,411 @@
+--- linux-2.6.25.7/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.25.7.imq/drivers/net/imq.c 2008-06-17 15:03:01.000000000 +0300
+@@ -0,0 +1,474 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+ *
@@ -25,8 +24,8 @@
+ * of IMQ again: http://www.linuximq.net
+ *
+ *
-+ * 2004/06/30 - New version of IMQ patch to kernels <=2.6.7 including
-+ * the following changes:
++ * 2004/06/30 - New version of IMQ patch to kernels <=2.6.7
++ * including the following changes:
+ *
+ * - Correction of ipv6 support "+"s issue (Hasso Tepper)
+ * - Correction of imq_init_devs() issue that resulted in
@@ -50,6 +49,15 @@
+ * Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
+ * I didn't forget anybody). I apologize again for my lack of time.
+ *
++ *
++ * 2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead
++ * of qdisc_restart() and moved qdisc_run() to tasklet to avoid
++ * recursive locking. New initialization routines to fix 'rmmod' not
++ * working anymore. Used code from ifb.c. (Jussi Kivilinna)
++ *
++ * Also, many thanks to pablo Sebastian Greco for making the initial
++ * patch and to those who helped the testing.
++ *
+ * More info at: http://www.linuximq.net/ (Andre Correa)
+ */
+
@@ -62,14 +70,17 @@
+#include <linux/if_arp.h>
+#include <linux/netfilter.h>
+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+ #include <linux/netfilter_ipv6.h>
+#endif
+#include <linux/imq.h>
+#include <net/pkt_sched.h>
+#include <net/netfilter/nf_queue.h>
+
-+extern int qdisc_restart1(struct net_device *dev);
++struct imq_private {
++ struct tasklet_struct tasklet;
++ int tasklet_pending;
++};
+
+static nf_hookfn imq_nf_hook;
+
@@ -97,7 +108,7 @@
+#endif
+};
+
-+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+static struct nf_hook_ops imq_ingress_ipv6 = {
+ .hook = imq_nf_hook,
+ .owner = THIS_MODULE,
@@ -126,14 +137,14 @@
+#if defined(CONFIG_IMQ_NUM_DEVS)
+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
+#else
-+static unsigned int numdevs = 16;
++static unsigned int numdevs = IMQ_MAX_DEVS;
+#endif
+
-+static struct net_device *imq_devs;
++static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
+
+static struct net_device_stats *imq_get_stats(struct net_device *dev)
+{
-+ return (struct net_device_stats *)dev->priv;
++ return &dev->stats;
+}
+
+/* called for packets kfree'd in qdiscs at places other than enqueue */
@@ -152,10 +163,8 @@
+
+static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
+{
-+ struct net_device_stats *stats = (struct net_device_stats*) dev->priv;
-+
-+ stats->tx_bytes += skb->len;
-+ stats->tx_packets++;
++ dev->stats.tx_bytes += skb->len;
++ dev->stats.tx_packets++;
+
+ skb->imq_flags = 0;
+ skb->destructor = NULL;
@@ -165,59 +174,70 @@
+ return 0;
+}
+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned int queuenum)
++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
+{
+ struct net_device *dev;
-+ struct net_device_stats *stats;
-+ struct sk_buff *skb = entry->skb;
++ struct imq_private *priv;
+ struct sk_buff *skb2 = NULL;
+ struct Qdisc *q;
-+ unsigned int index = skb->imq_flags&IMQ_F_IFMASK;
++ unsigned int index = entry->skb->imq_flags & IMQ_F_IFMASK;
+ int ret = -1;
+
+ if (index > numdevs)
+ return -1;
+
-+ dev = imq_devs + index;
++ /* check for imq device by index from cache */
++ dev = imq_devs_cache[index];
++ if (!dev) {
++ char buf[8];
++
++ /* get device by name and cache result */
++ snprintf(buf, sizeof(buf), "imq%d", index);
++ dev = dev_get_by_name(&init_net, buf);
++ if (!dev) {
++ /* not found ?!*/
++ BUG();
++ return -1;
++ }
++
++ imq_devs_cache[index] = dev;
++ }
++
++ priv = netdev_priv(dev);
+ if (!(dev->flags & IFF_UP)) {
-+ skb->imq_flags = 0;
++ entry->skb->imq_flags = 0;
+ nf_reinject(entry, NF_ACCEPT);
+ return 0;
+ }
+ dev->last_rx = jiffies;
+
-+ if (skb->destructor) {
-+ skb2 = skb;
-+ skb = skb_clone(skb, GFP_ATOMIC);
-+ if (!skb)
++ if (entry->skb->destructor) {
++ skb2 = entry->skb;
++ entry->skb = skb_clone(entry->skb, GFP_ATOMIC);
++ if (!entry->skb)
+ return -1;
+ }
-+ skb->nf_queue_entry = entry;
++ entry->skb->nf_queue_entry = entry;
+
-+ stats = (struct net_device_stats *)dev->priv;
-+ stats->rx_bytes+= skb->len;
-+ stats->rx_packets++;
++ dev->stats.rx_bytes += entry->skb->len;
++ dev->stats.rx_packets++;
+
+ spin_lock_bh(&dev->queue_lock);
+ q = dev->qdisc;
+ if (q->enqueue) {
-+ q->enqueue(skb_get(skb), q);
-+ if (skb_shared(skb)) {
-+ skb->destructor = imq_skb_destructor;
-+ kfree_skb(skb);
++ q->enqueue(skb_get(entry->skb), q);
++ if (skb_shared(entry->skb)) {
++ entry->skb->destructor = imq_skb_destructor;
++ kfree_skb(entry->skb);
+ ret = 0;
+ }
+ }
-+ if (spin_is_locked(&dev->_xmit_lock))
-+ netif_schedule(dev);
-+ else
-+ while (!netif_queue_stopped(dev) && qdisc_restart1(dev) < 0)
-+ /* NOTHING */;
-+
++ if (!test_and_set_bit(1, &priv->tasklet_pending))
++ tasklet_schedule(&priv->tasklet);
+ spin_unlock_bh(&dev->queue_lock);
+
+ if (skb2)
-+ kfree_skb(ret ? skb : skb2);
++ kfree_skb(ret ? entry->skb : skb2);
+
+ return ret;
+}
@@ -227,6 +247,17 @@
+ .outfn = imq_nf_queue,
+};
+
++static void qdisc_run_tasklet(unsigned long arg)
++{
++ struct net_device *dev = (struct net_device *)arg;
++ struct imq_private *priv = netdev_priv(dev);
++
++ spin_lock(&dev->queue_lock);
++ qdisc_run(dev);
++ clear_bit(1, &priv->tasklet_pending);
++ spin_unlock(&dev->queue_lock);
++}
++
+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
+ const struct net_device *indev,
+ const struct net_device *outdev,
@@ -238,30 +269,77 @@
+ return NF_ACCEPT;
+}
+
++static int imq_close(struct net_device *dev)
++{
++ struct imq_private *priv = netdev_priv(dev);
++
++ tasklet_kill(&priv->tasklet);
++ netif_stop_queue(dev);
++
++ return 0;
++}
++
++static int imq_open(struct net_device *dev)
++{
++ struct imq_private *priv = netdev_priv(dev);
++
++ tasklet_init(&priv->tasklet, qdisc_run_tasklet, (unsigned long)dev);
++ netif_start_queue(dev);
++
++ return 0;
++}
++
++static void imq_setup(struct net_device *dev)
++{
++ dev->hard_start_xmit = imq_dev_xmit;
++ dev->open = imq_open;
++ dev->get_stats = imq_get_stats;
++ dev->stop = imq_close;
++ dev->type = ARPHRD_VOID;
++ dev->mtu = 16000;
++ dev->tx_queue_len = 11000;
++ dev->flags = IFF_NOARP;
++}
++
++static struct rtnl_link_ops imq_link_ops __read_mostly = {
++ .kind = "imq",
++ .priv_size = sizeof(struct imq_private),
++ .setup = imq_setup,
++};
+
+static int __init imq_init_hooks(void)
+{
+ int err;
+
+ err = nf_register_queue_handler(PF_INET, &nfqh);
-+ if (err > 0)
++ if (err)
+ goto err1;
-+ if ((err = nf_register_hook(&imq_ingress_ipv4)))
++
++ err = nf_register_hook(&imq_ingress_ipv4);
++ if (err)
+ goto err2;
-+ if ((err = nf_register_hook(&imq_egress_ipv4)))
++
++ err = nf_register_hook(&imq_egress_ipv4);
++ if (err)
+ goto err3;
-+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
-+ if ((err = nf_register_queue_handler(PF_INET6, &nfqh)))
++
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++ err = nf_register_queue_handler(PF_INET6, &nfqh);
++ if (err)
+ goto err4;
-+ if ((err = nf_register_hook(&imq_ingress_ipv6)))
++
++ err = nf_register_hook(&imq_ingress_ipv6);
++ if (err)
+ goto err5;
-+ if ((err = nf_register_hook(&imq_egress_ipv6)))
++
++ err = nf_register_hook(&imq_egress_ipv6);
++ if (err)
+ goto err6;
+#endif
+
+ return 0;
+
-+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+err6:
+ nf_unregister_hook(&imq_ingress_ipv6);
+err5:
@@ -277,43 +355,33 @@
+ return err;
+}
+
-+static void __exit imq_unhook(void)
++static int __init imq_init_one(int index)
+{
-+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
-+ nf_unregister_hook(&imq_ingress_ipv6);
-+ nf_unregister_hook(&imq_egress_ipv6);
-+ nf_unregister_queue_handler(PF_INET6, &nfqh);
-+#endif
-+ nf_unregister_hook(&imq_ingress_ipv4);
-+ nf_unregister_hook(&imq_egress_ipv4);
-+ nf_unregister_queue_handler(PF_INET, &nfqh);
-+}
++ struct net_device *dev;
++ int ret;
+
-+static int __init imq_dev_init(struct net_device *dev)
-+{
-+ dev->hard_start_xmit = imq_dev_xmit;
-+ dev->type = ARPHRD_VOID;
-+ dev->mtu = 16000;
-+ dev->tx_queue_len = 11000;
-+ dev->flags = IFF_NOARP;
-+ dev->priv = kzalloc(sizeof(struct net_device_stats), GFP_KERNEL);
-+ if (dev->priv == NULL)
++ dev = alloc_netdev(sizeof(struct imq_private), "imq%d", imq_setup);
++ if (!dev)
+ return -ENOMEM;
-+ dev->get_stats = imq_get_stats;
+
-+ return 0;
-+}
++ ret = dev_alloc_name(dev, dev->name);
++ if (ret < 0)
++ goto fail;
++
++ dev->rtnl_link_ops = &imq_link_ops;
++ ret = register_netdevice(dev);
++ if (ret < 0)
++ goto fail;
+
-+static void imq_dev_uninit(struct net_device *dev)
-+{
-+ kfree(dev->priv);
++ return 0;
++fail:
++ free_netdev(dev);
++ return ret;
+}
+
-+static int __init imq_init_devs(struct net *net)
++static int __init imq_init_devs(void)
+{
-+ struct net_device *dev;
-+ int i,j;
-+ j = numdevs;
++ int err, i;
+
+ if (!numdevs || numdevs > IMQ_MAX_DEVS) {
+ printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
@@ -321,54 +389,36 @@
+ return -EINVAL;
+ }
+
-+ imq_devs = kzalloc(sizeof(struct net_device) * numdevs, GFP_KERNEL);
-+ if (!imq_devs)
-+ return -ENOMEM;
-+
-+ /* we start counting at zero */
-+ numdevs--;
++ rtnl_lock();
++ err = __rtnl_link_register(&imq_link_ops);
+
-+ for (i = 0, dev = imq_devs; i <= numdevs; i++, dev++) {
-+ strcpy(dev->name, "imq%d");
-+ dev->init = imq_dev_init;
-+ dev->uninit = imq_dev_uninit;
-+ dev->nd_net = net;
++ for (i = 0; i < numdevs && !err; i++)
++ err = imq_init_one(i);
+
-+ if (register_netdev(dev) < 0)
-+ goto err_register;
++ if (err) {
++ __rtnl_link_unregister(&imq_link_ops);
++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
+ }
-+ printk(KERN_INFO "IMQ starting with %u devices...\n", j);
-+ return 0;
-+
-+err_register:
-+ for (; i; i--)
-+ unregister_netdev(--dev);
-+ kfree(imq_devs);
-+ return -EIO;
-+}
-+
-+static void imq_cleanup_devs(void)
-+{
-+ int i;
-+ struct net_device *dev = imq_devs;
-+
-+ for (i = 0; i <= numdevs; i++)
-+ unregister_netdev(dev++);
++ rtnl_unlock();
+
-+ kfree(imq_devs);
++ return err;
+}
+
-+static __net_init int imq_init_module(struct net *net)
++static int __init imq_init_module(void)
+{
+ int err;
+
-+ if ((err = imq_init_devs(net))) {
++ err = imq_init_devs();
++ if (err) {
+ printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
+ return err;
+ }
-+ if ((err = imq_init_hooks())) {
++
++ err = imq_init_hooks();
++ if (err) {
+ printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+ imq_cleanup_devs();
++ rtnl_link_unregister(&imq_link_ops);
++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
+ return err;
+ }
+
@@ -388,38 +438,46 @@
+ return 0;
+}
+
-+static __net_exit void imq_exit_module(struct net *net)
++static void __exit imq_unhook(void)
+{
-+ imq_unhook();
-+ imq_cleanup_devs();
-+ printk(KERN_INFO "IMQ driver unloaded successfully.\n");
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++ nf_unregister_hook(&imq_ingress_ipv6);
++ nf_unregister_hook(&imq_egress_ipv6);
++ nf_unregister_queue_handler(PF_INET6, &nfqh);
++#endif
++ nf_unregister_hook(&imq_ingress_ipv4);
++ nf_unregister_hook(&imq_egress_ipv4);
++ nf_unregister_queue_handler(PF_INET, &nfqh);
+}
+
-+static struct pernet_operations __net_initdata imq_net_ops = {
-+ .init = imq_init_module,
-+ .exit = imq_exit_module,
-+};
-+
-+static int __init imq_init(void)
++static void __exit imq_cleanup_devs(void)
+{
-+ return register_pernet_device(&imq_net_ops);
++ rtnl_link_unregister(&imq_link_ops);
++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
+}
+
-+module_init(imq_init);
-+//module_exit(imq_cleanup_module);
++static void __exit imq_exit_module(void)
++{
++ imq_unhook();
++ imq_cleanup_devs();
++ printk(KERN_INFO "IMQ driver unloaded successfully.\n");
++}
++
++module_init(imq_init_module);
++module_exit(imq_exit_module);
+
+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will be created)");
++MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
++ "be created)");
+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
++ "http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
-diff -U 6 -Nr linux-2.6.25/drivers/net/Kconfig linux-2.6.25+imq/drivers/net/Kconfig
---- linux-2.6.25/drivers/net/Kconfig 2008-04-17 05:49:44.000000000 +0300
-+++ linux-2.6.25+imq/drivers/net/Kconfig 2008-04-18 14:54:49.587699858 +0300
-@@ -114,12 +114,135 @@
- section 6.2 of the NET-3-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
++MODULE_ALIAS_RTNL_LINK("imq");
++
+--- linux-2.6.25.7/drivers/net/Kconfig 2008-06-16 23:24:36.000000000 +0300
++++ linux-2.6.25.7.imq/drivers/net/Kconfig 2008-06-17 15:03:21.000000000 +0300
+@@ -117,6 +117,129 @@
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@@ -442,7 +500,7 @@
+choice
+ prompt "IMQ behavior (PRE/POSTROUTING)"
+ depends on IMQ
-+ default IMQ_BEHAVIOR_BB
++ default IMQ_BEHAVIOR_AB
+ help
+
+ This settings defines how IMQ behaves in respect to its
@@ -549,16 +607,9 @@
config TUN
tristate "Universal TUN/TAP device driver support"
select CRC32
- ---help---
- TUN/TAP provides packet reception and transmission for user space
- programs. It can be viewed as a simple Point-to-Point or Ethernet
-diff -U 6 -Nr linux-2.6.25/drivers/net/Makefile linux-2.6.25+imq/drivers/net/Makefile
---- linux-2.6.25/drivers/net/Makefile 2008-04-17 05:49:44.000000000 +0300
-+++ linux-2.6.25+imq/drivers/net/Makefile 2008-04-18 14:54:49.591038604 +0300
-@@ -140,12 +140,13 @@
- obj-$(CONFIG_SLIP) += slip.o
- obj-$(CONFIG_SLHC) += slhc.o
-
+--- linux-2.6.25.7/drivers/net/Makefile 2008-06-16 23:24:36.000000000 +0300
++++ linux-2.6.25.7.imq/drivers/net/Makefile 2008-06-17 14:56:58.000000000 +0300
+@@ -143,6 +143,7 @@
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_DUMMY) += dummy.o
@@ -566,12 +617,8 @@
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_DE600) += de600.o
- obj-$(CONFIG_DE620) += de620.o
- obj-$(CONFIG_LANCE) += lance.o
- obj-$(CONFIG_SUN3_82586) += sun3_82586.o
-diff -U 6 -Nr linux-2.6.25/include/linux/imq.h linux-2.6.25+imq/include/linux/imq.h
---- linux-2.6.25/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.25+imq/include/linux/imq.h 2008-04-18 14:54:49.594372600 +0300
+--- linux-2.6.25.7/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.25.7.imq/include/linux/imq.h 2008-06-17 14:56:58.000000000 +0300
@@ -0,0 +1,9 @@
+#ifndef _IMQ_H
+#define _IMQ_H
@@ -582,9 +629,8 @@
+#define IMQ_F_ENQUEUE 0x80
+
+#endif /* _IMQ_H */
-diff -U 6 -Nr linux-2.6.25/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.25+imq/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-2.6.25/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.25+imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2008-04-18 14:54:49.594372600 +0300
+--- linux-2.6.25.7/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.25.7.imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2008-06-17 14:56:58.000000000 +0300
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@@ -594,9 +640,8 @@
+};
+
+#endif /* _IPT_IMQ_H */
-diff -U 6 -Nr linux-2.6.25/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.25+imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- linux-2.6.25/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.25+imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2008-04-18 14:54:49.594372600 +0300
+--- linux-2.6.25.7/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.25.7.imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2008-06-17 14:56:58.000000000 +0300
@@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@@ -606,30 +651,20 @@
+};
+
+#endif /* _IP6T_IMQ_H */
-diff -U 6 -Nr linux-2.6.25/include/linux/skbuff.h linux-2.6.25+imq/include/linux/skbuff.h
---- linux-2.6.25/include/linux/skbuff.h 2008-04-17 05:49:44.000000000 +0300
-+++ linux-2.6.25+imq/include/linux/skbuff.h 2008-04-18 18:59:44.607852013 +0300
-@@ -293,12 +293,16 @@
-
- void (*destructor)(struct sk_buff *skb);
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+--- linux-2.6.25.7/include/linux/skbuff.h 2008-06-16 23:24:36.000000000 +0300
++++ linux-2.6.25.7.imq/include/linux/skbuff.h 2008-06-17 14:56:58.000000000 +0300
+@@ -296,6 +296,10 @@
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ unsigned char imq_flags;
++ unsigned char imq_flags;
+ struct nf_queue_entry *nf_queue_entry;
+#endif
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-imq.patch?r1=1.1.2.1.2.7&r2=1.1.2.1.2.8&f=u
More information about the pld-cvs-commit
mailing list