SOURCES (LINUX_2_6): kernel-imq.patch - let's try unofficial patch http://k...
zbyniu
zbyniu at pld-linux.org
Tue May 20 20:38:32 CEST 2008
Author: zbyniu Date: Tue May 20 18:38:32 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- let's try unofficial patch http://kapturkiewicz.name/linux-2.6.25-imq1.diff
---- Files affected:
SOURCES:
kernel-imq.patch (1.1.2.1.2.6 -> 1.1.2.1.2.7)
---- Diffs:
================================================================
Index: SOURCES/kernel-imq.patch
diff -u SOURCES/kernel-imq.patch:1.1.2.1.2.6 SOURCES/kernel-imq.patch:1.1.2.1.2.7
--- SOURCES/kernel-imq.patch:1.1.2.1.2.6 Tue Feb 26 03:30:14 2008
+++ SOURCES/kernel-imq.patch Tue May 20 20:38:26 2008
@@ -1,7 +1,7 @@
-diff -Naurw 2.6.24/drivers/net/imq.c 2.6.24.imq/drivers/net/imq.c
---- 2.6.24/drivers/net/imq.c 1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/drivers/net/imq.c 2008-01-26 14:52:43.000000000 -0300
-@@ -0,0 +1,409 @@
+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 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+ *
@@ -67,6 +67,7 @@
+#endif
+#include <linux/imq.h>
+#include <net/pkt_sched.h>
++#include <net/netfilter/nf_queue.h>
+
+extern int qdisc_restart1(struct net_device *dev);
+
@@ -76,7 +77,7 @@
+ .hook = imq_nf_hook,
+ .owner = THIS_MODULE,
+ .pf = PF_INET,
-+ .hooknum = NF_IP_PRE_ROUTING,
++ .hooknum = NF_INET_PRE_ROUTING,
+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
+ .priority = NF_IP_PRI_MANGLE + 1
+#else
@@ -88,7 +89,7 @@
+ .hook = imq_nf_hook,
+ .owner = THIS_MODULE,
+ .pf = PF_INET,
-+ .hooknum = NF_IP_POST_ROUTING,
++ .hooknum = NF_INET_POST_ROUTING,
+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
+ .priority = NF_IP_PRI_LAST
+#else
@@ -101,7 +102,7 @@
+ .hook = imq_nf_hook,
+ .owner = THIS_MODULE,
+ .pf = PF_INET6,
-+ .hooknum = NF_IP6_PRE_ROUTING,
++ .hooknum = NF_INET_PRE_ROUTING,
+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
+ .priority = NF_IP6_PRI_MANGLE + 1
+#else
@@ -113,7 +114,7 @@
+ .hook = imq_nf_hook,
+ .owner = THIS_MODULE,
+ .pf = PF_INET6,
-+ .hooknum = NF_IP6_POST_ROUTING,
++ .hooknum = NF_INET_POST_ROUTING,
+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
+ .priority = NF_IP6_PRI_LAST
+#else
@@ -138,14 +139,14 @@
+/* called for packets kfree'd in qdiscs at places other than enqueue */
+static void imq_skb_destructor(struct sk_buff *skb)
+{
-+ struct nf_info *info = skb->nf_info;
++ struct nf_queue_entry *entry = skb->nf_queue_entry;
+
-+ if (info) {
-+ if (info->indev)
-+ dev_put(info->indev);
-+ if (info->outdev)
-+ dev_put(info->outdev);
-+ kfree(info);
++ if (entry) {
++ if (entry->indev)
++ dev_put(entry->indev);
++ if (entry->outdev)
++ dev_put(entry->outdev);
++ kfree(entry);
+ }
+}
+
@@ -160,14 +161,15 @@
+ skb->destructor = NULL;
+
+ dev->trans_start = jiffies;
-+ nf_reinject(skb, skb->nf_info, NF_ACCEPT);
++ nf_reinject(skb->nf_queue_entry, NF_ACCEPT);
+ return 0;
+}
+
-+static int imq_nf_queue(struct sk_buff *skb, struct nf_info *info, unsigned queue_num, void *data)
++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned int queuenum)
+{
+ struct net_device *dev;
+ struct net_device_stats *stats;
++ struct sk_buff *skb = entry->skb;
+ struct sk_buff *skb2 = NULL;
+ struct Qdisc *q;
+ unsigned int index = skb->imq_flags&IMQ_F_IFMASK;
@@ -179,7 +181,7 @@
+ dev = imq_devs + index;
+ if (!(dev->flags & IFF_UP)) {
+ skb->imq_flags = 0;
-+ nf_reinject(skb, info, NF_ACCEPT);
++ nf_reinject(entry, NF_ACCEPT);
+ return 0;
+ }
+ dev->last_rx = jiffies;
@@ -190,7 +192,7 @@
+ if (!skb)
+ return -1;
+ }
-+ skb->nf_info = info;
++ skb->nf_queue_entry = entry;
+
+ stats = (struct net_device_stats *)dev->priv;
+ stats->rx_bytes+= skb->len;
@@ -411,10 +413,13 @@
+MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
-diff -Naurw 2.6.24/drivers/net/Kconfig 2.6.24.imq/drivers/net/Kconfig
---- 2.6.24/drivers/net/Kconfig 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/drivers/net/Kconfig 2008-01-26 15:00:11.000000000 -0300
-@@ -112,6 +112,129 @@
+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>.
+
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@@ -544,10 +549,16 @@
config TUN
tristate "Universal TUN/TAP device driver support"
select CRC32
-diff -Naurw 2.6.24/drivers/net/Makefile 2.6.24.imq/drivers/net/Makefile
---- 2.6.24/drivers/net/Makefile 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/drivers/net/Makefile 2008-01-26 15:00:11.000000000 -0300
-@@ -139,6 +139,7 @@
+ ---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
+
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_DUMMY) += dummy.o
@@ -555,9 +566,12 @@
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_DE600) += de600.o
-diff -Naurw 2.6.24/include/linux/imq.h 2.6.24.imq/include/linux/imq.h
---- 2.6.24/include/linux/imq.h 1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/include/linux/imq.h 2008-01-26 15:00:11.000000000 -0300
+ 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
@@ -0,0 +1,9 @@
+#ifndef _IMQ_H
+#define _IMQ_H
@@ -568,9 +582,9 @@
+#define IMQ_F_ENQUEUE 0x80
+
+#endif /* _IMQ_H */
-diff -Naurw 2.6.24/include/linux/netfilter_ipv4/ipt_IMQ.h 2.6.24.imq/include/linux/netfilter_ipv4/ipt_IMQ.h
---- 2.6.24/include/linux/netfilter_ipv4/ipt_IMQ.h 1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2008-01-26 15:00:11.000000000 -0300
+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
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@@ -580,9 +594,9 @@
+};
+
+#endif /* _IPT_IMQ_H */
-diff -Naurw 2.6.24/include/linux/netfilter_ipv6/ip6t_IMQ.h 2.6.24.imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- 2.6.24/include/linux/netfilter_ipv6/ip6t_IMQ.h 1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2008-01-26 15:00:11.000000000 -0300
+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
@@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@@ -592,35 +606,50 @@
+};
+
+#endif /* _IP6T_IMQ_H */
-diff -Naurw 2.6.24/include/linux/skbuff.h 2.6.24.imq/include/linux/skbuff.h
---- 2.6.24/include/linux/skbuff.h 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/include/linux/skbuff.h 2008-01-26 15:00:11.000000000 -0300
-@@ -295,6 +295,10 @@
+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)
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ unsigned char imq_flags;
-+ struct nf_info *nf_info;
++ struct nf_queue_entry *nf_queue_entry;
+#endif
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -1728,6 +1732,10 @@
+
+ int iif;
+ #ifdef CONFIG_NETDEVICES_MULTIQUEUE
+@@ -1733,12 +1737,16 @@
+ dst->nfct = src->nfct;
+ nf_conntrack_get(src->nfct);
+ dst->nfctinfo = src->nfctinfo;
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ dst->imq_flags = src->imq_flags;
-+ dst->nf_info = src->nf_info;
++ dst->nf_queue_entry = src->nf_queue_entry;
+#endif
#ifdef CONFIG_BRIDGE_NETFILTER
dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge);
-diff -Naurw 2.6.24/net/core/dev.c 2.6.24.imq/net/core/dev.c
---- 2.6.24/net/core/dev.c 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/core/dev.c 2008-01-26 15:00:11.000000000 -0300
-@@ -95,6 +95,9 @@
+ #endif
+ }
+
+diff -U 6 -Nr linux-2.6.25/net/core/dev.c linux-2.6.25+imq/net/core/dev.c
+--- linux-2.6.25/net/core/dev.c 2008-04-17 05:49:44.000000000 +0300
++++ linux-2.6.25+imq/net/core/dev.c 2008-04-18 14:54:49.611042584 +0300
+@@ -92,12 +92,15 @@
+ #include <linux/etherdevice.h>
+ #include <linux/notifier.h>
+ #include <linux/skbuff.h>
#include <net/net_namespace.h>
#include <net/sock.h>
#include <linux/rtnetlink.h>
@@ -630,7 +659,13 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -1533,7 +1536,11 @@
+ #include <linux/if_bridge.h>
+ #include <linux/if_macvlan.h>
+ #include <net/dst.h>
+@@ -1534,13 +1537,17 @@
+ return 0;
+ }
+
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
if (likely(!skb->next)) {
@@ -643,9 +678,12 @@
dev_queue_xmit_nit(skb, dev);
if (netif_needs_gso(dev, skb)) {
-diff -Naurw 2.6.24/net/ipv4/netfilter/ipt_IMQ.c 2.6.24.imq/net/ipv4/netfilter/ipt_IMQ.c
---- 2.6.24/net/ipv4/netfilter/ipt_IMQ.c 1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/net/ipv4/netfilter/ipt_IMQ.c 2008-01-26 15:00:11.000000000 -0300
+ if (unlikely(dev_gso_segment(skb)))
+ goto out_kfree_skb;
+ if (skb->next)
+diff -U 6 -Nr linux-2.6.25/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.25+imq/net/ipv4/netfilter/ipt_IMQ.c
+--- linux-2.6.25/net/ipv4/netfilter/ipt_IMQ.c 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.25+imq/net/ipv4/netfilter/ipt_IMQ.c 2008-04-18 14:54:49.614374346 +0300
@@ -0,0 +1,69 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@@ -716,35 +754,41 @@
+MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
-diff -Naurw 2.6.24/net/ipv4/netfilter/Kconfig 2.6.24.imq/net/ipv4/netfilter/Kconfig
---- 2.6.24/net/ipv4/netfilter/Kconfig 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/ipv4/netfilter/Kconfig 2008-01-26 15:00:11.000000000 -0300
-@@ -311,6 +311,17 @@
+diff -U 6 -Nr linux-2.6.25/net/ipv4/netfilter/Kconfig linux-2.6.25+imq/net/ipv4/netfilter/Kconfig
+--- linux-2.6.25/net/ipv4/netfilter/Kconfig 2008-04-17 05:49:44.000000000 +0300
++++ linux-2.6.25+imq/net/ipv4/netfilter/Kconfig 2008-04-18 14:59:00.917678729 +0300
+@@ -305,12 +305,23 @@
+ an IP packet. This is particularly useful, if you need to work around
+ existing ECN blackholes on the internet, but don't want to disable
+ ECN support in general.
To compile it as a module, choose M here. If unsure, say N.
+config IP_NF_TARGET_IMQ
-+ tristate "IMQ target support"
-+ depends on IP_NF_MANGLE
-+ help
-+ This option adds a `IMQ' target which is used to specify if and
-+ to which IMQ device packets should get enqueued/dequeued.
++ tristate "IMQ target support"
++ depends on IP_NF_MANGLE
++ help
++ This option adds a `IMQ' target which is used to specify if and
++ to which IMQ device packets should get enqueued/dequeued.
+
-+ For more information visit: http://www.linuximq.net/
++ For more information visit: http://www.linuximq.net/
+
-+ To compile it as a module, choose M here. If unsure, say N.
++ To compile it as a module, choose M here. If unsure, say N.
+
- config IP_NF_TARGET_TOS
- tristate "TOS target support"
+ config IP_NF_TARGET_TTL
+ tristate 'TTL target support'
depends on IP_NF_MANGLE
-diff -Naurw 2.6.24/net/ipv4/netfilter/Makefile 2.6.24.imq/net/ipv4/netfilter/Makefile
---- 2.6.24/net/ipv4/netfilter/Makefile 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/ipv4/netfilter/Makefile 2008-01-26 15:00:11.000000000 -0300
+ depends on NETFILTER_ADVANCED
+ help
+ This option adds a `TTL' target, which enables the user to modify
+diff -U 6 -Nr linux-2.6.25/net/ipv4/netfilter/Makefile linux-2.6.25+imq/net/ipv4/netfilter/Makefile
+--- linux-2.6.25/net/ipv4/netfilter/Makefile 2008-04-17 05:49:44.000000000 +0300
++++ linux-2.6.25+imq/net/ipv4/netfilter/Makefile 2008-04-18 14:54:49.692406744 +0300
@@ -0,0 +0,1 @@
+obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
-diff -Naurw 2.6.24/net/ipv6/netfilter/ip6t_IMQ.c 2.6.24.imq/net/ipv6/netfilter/ip6t_IMQ.c
---- 2.6.24/net/ipv6/netfilter/ip6t_IMQ.c 1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/net/ipv6/netfilter/ip6t_IMQ.c 2008-01-26 15:00:11.000000000 -0300
+diff -U 6 -Nr linux-2.6.25/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.25+imq/net/ipv6/netfilter/ip6t_IMQ.c
+--- linux-2.6.25/net/ipv6/netfilter/ip6t_IMQ.c 1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.25+imq/net/ipv6/netfilter/ip6t_IMQ.c 2008-04-18 14:54:49.694398090 +0300
@@ -0,0 +1,69 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@@ -815,10 +859,13 @@
+MODULE_AUTHOR("http://www.linuximq.net");
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
-diff -Naurw 2.6.24/net/ipv6/netfilter/Kconfig 2.6.24.imq/net/ipv6/netfilter/Kconfig
---- 2.6.24/net/ipv6/netfilter/Kconfig 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/ipv6/netfilter/Kconfig 2008-01-26 15:00:11.000000000 -0300
-@@ -173,6 +173,15 @@
+diff -U 6 -Nr linux-2.6.25/net/ipv6/netfilter/Kconfig linux-2.6.25+imq/net/ipv6/netfilter/Kconfig
+--- linux-2.6.25/net/ipv6/netfilter/Kconfig 2008-04-17 05:49:44.000000000 +0300
++++ linux-2.6.25+imq/net/ipv6/netfilter/Kconfig 2008-04-18 14:54:49.771062974 +0300
+@@ -176,12 +176,21 @@
+ This option adds a `mangle' table to iptables: see the man page for
+ iptables(8). This table is used for various packet alterations
+ which can effect how the packet is routed.
To compile it as a module, choose M here. If unsure, say N.
@@ -834,15 +881,33 @@
config IP6_NF_TARGET_HL
tristate 'HL (hoplimit) target support'
depends on IP6_NF_MANGLE
-diff -Naurw 2.6.24/net/ipv6/netfilter/Makefile 2.6.24.imq/net/ipv6/netfilter/Makefile
---- 2.6.24/net/ipv6/netfilter/Makefile 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/ipv6/netfilter/Makefile 2008-01-26 15:00:11.000000000 -0300
-@@ -0,0 +0,1 @@
+ depends on NETFILTER_ADVANCED
+ help
+ This option adds a `HL' target, which enables the user to decrement
+diff -U 6 -Nr linux-2.6.25/net/ipv6/netfilter/Makefile linux-2.6.25+imq/net/ipv6/netfilter/Makefile
+--- linux-2.6.25/net/ipv6/netfilter/Makefile 2008-04-17 05:49:44.000000000 +0300
++++ linux-2.6.25+imq/net/ipv6/netfilter/Makefile 2008-04-18 14:54:49.771062974 +0300
+@@ -3,12 +3,13 @@
+ #
+
+ # Link order matters here.
+ obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
+ obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
+ obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
+obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
-diff -Naurw 2.6.24/net/sched/sch_generic.c 2.6.24.imq/net/sched/sch_generic.c
---- 2.6.24/net/sched/sch_generic.c 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/sched/sch_generic.c 2008-01-26 15:00:11.000000000 -0300
-@@ -176,6 +176,11 @@
+ obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
+ obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
+
+ # objects for l3 independent conntrack
+ nf_conntrack_ipv6-objs := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o nf_conntrack_reasm.o
+
+diff -U 6 -Nr linux-2.6.25/net/sched/sch_generic.c linux-2.6.25+imq/net/sched/sch_generic.c
+--- linux-2.6.25/net/sched/sch_generic.c 2008-04-17 05:49:44.000000000 +0300
++++ linux-2.6.25+imq/net/sched/sch_generic.c 2008-04-18 14:56:21.977691013 +0300
+@@ -179,12 +179,18 @@
+ break;
+ }
+
return ret;
}
@@ -850,12 +915,11 @@
+{
+ return qdisc_restart(dev);
+}
++EXPORT_SYMBOL(qdisc_restart1);
+
void __qdisc_run(struct net_device *dev)
{
- do {
-@@ -638,3 +643,4 @@
- EXPORT_SYMBOL(qdisc_reset);
- EXPORT_SYMBOL(qdisc_lock_tree);
- EXPORT_SYMBOL(qdisc_unlock_tree);
-+EXPORT_SYMBOL(qdisc_restart1);
+ unsigned long start_time = jiffies;
+
+ while (qdisc_restart(dev)) {
+ if (netif_queue_stopped(dev))
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-imq.patch?r1=1.1.2.1.2.6&r2=1.1.2.1.2.7&f=u
More information about the pld-cvs-commit
mailing list