SOURCES (LINUX_2_6): 2.6.10-imq.patch - updated for 2.6.13
paszczus
paszczus at pld-linux.org
Wed Aug 31 09:03:57 CEST 2005
Author: paszczus Date: Wed Aug 31 07:03:57 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.13
---- Files affected:
SOURCES:
2.6.10-imq.patch (1.1.2.6 -> 1.1.2.7)
---- Diffs:
================================================================
Index: SOURCES/2.6.10-imq.patch
diff -u SOURCES/2.6.10-imq.patch:1.1.2.6 SOURCES/2.6.10-imq.patch:1.1.2.7
--- SOURCES/2.6.10-imq.patch:1.1.2.6 Fri Apr 22 02:46:51 2005
+++ SOURCES/2.6.10-imq.patch Wed Aug 31 09:03:52 2005
@@ -1,7 +1,7 @@
-diff -uprN linux-2.6.10.orig/drivers/net/Kconfig linux-2.6.10/drivers/net/Kconfig
---- linux-2.6.10.orig/drivers/net/Kconfig 2004-12-24 22:35:25.000000000 +0100
-+++ linux-2.6.10/drivers/net/Kconfig 2005-01-02 16:54:37.145797176 +0100
-@@ -81,6 +81,129 @@ config EQUALIZER
+diff -Nru linux-2.6.13/drivers/net/Kconfig linux-2.6.13-imq/drivers/net/Kconfig
+--- linux-2.6.13/drivers/net/Kconfig 2005-08-28 23:41:01.000000000 +0000
++++ linux-2.6.13-imq/drivers/net/Kconfig 2005-08-29 21:02:39.000000000 +0000
+@@ -82,6 +82,129 @@
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@@ -130,11 +130,11 @@
+
config TUN
tristate "Universal TUN/TAP device driver support"
- depends on NETDEVICES
-diff -uprN linux-2.6.10.orig/drivers/net/Makefile linux-2.6.10/drivers/net/Makefile
---- linux-2.6.10.orig/drivers/net/Makefile 2004-12-24 22:34:29.000000000 +0100
-+++ linux-2.6.10/drivers/net/Makefile 2005-01-02 16:54:37.158795200 +0100
-@@ -113,6 +113,7 @@ ifeq ($(CONFIG_SLIP_COMPRESSED),y)
+ select CRC32
+diff -Nru linux-2.6.13/drivers/net/Makefile linux-2.6.13-imq/drivers/net/Makefile
+--- linux-2.6.13/drivers/net/Makefile 2005-08-28 23:41:01.000000000 +0000
++++ linux-2.6.13-imq/drivers/net/Makefile 2005-08-29 21:02:39.000000000 +0000
+@@ -113,6 +113,7 @@
endif
obj-$(CONFIG_DUMMY) += dummy.o
@@ -142,9 +142,9 @@
obj-$(CONFIG_DE600) += de600.o
obj-$(CONFIG_DE620) += de620.o
obj-$(CONFIG_LANCE) += lance.o
-diff -uprN linux-2.6.10.orig/drivers/net/imq.c linux-2.6.10/drivers/net/imq.c
---- linux-2.6.10.orig/drivers/net/imq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.10/drivers/net/imq.c 2005-01-02 16:54:37.160794896 +0100
+diff -Nru linux-2.6.13/drivers/net/imq.c linux-2.6.13-imq/drivers/net/imq.c
+--- linux-2.6.13/drivers/net/imq.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.13-imq/drivers/net/imq.c 2005-08-29 21:02:39.000000000 +0000
@@ -0,0 +1,387 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
@@ -533,9 +533,9 @@
+MODULE_LICENSE("GPL");
+
+
-diff -uprN linux-2.6.10.orig/include/linux/imq.h linux-2.6.10/include/linux/imq.h
---- linux-2.6.10.orig/include/linux/imq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.10/include/linux/imq.h 2005-01-02 16:54:37.000000000 +0100
+diff -Nru linux-2.6.13/include/linux/imq.h linux-2.6.13-imq/include/linux/imq.h
+--- linux-2.6.13/include/linux/imq.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.13-imq/include/linux/imq.h 2005-08-29 21:02:39.000000000 +0000
@@ -0,0 +1,9 @@
+#ifndef _IMQ_H
+#define _IMQ_H
@@ -546,9 +546,9 @@
+#define IMQ_F_ENQUEUE 0x80
+
+#endif /* _IMQ_H */
-diff -uprN linux-2.6.10.orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.10/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-2.6.10.orig/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.10/include/linux/netfilter_ipv4/ipt_IMQ.h 2005-01-02 16:54:37.000000000 +0100
+diff -Nru linux-2.6.13/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.13-imq/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-2.6.13/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.13-imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2005-08-29 21:02:39.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@@ -558,9 +558,9 @@
+};
+
+#endif /* _IPT_IMQ_H */
-diff -uprN linux-2.6.10.orig/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.10/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- linux-2.6.10.orig/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.10/include/linux/netfilter_ipv6/ip6t_IMQ.h 2005-01-02 16:54:37.000000000 +0100
+diff -Nru linux-2.6.13/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.13-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
+--- linux-2.6.13/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.13-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2005-08-29 21:02:39.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@@ -570,24 +570,26 @@
+};
+
+#endif /* _IP6T_IMQ_H */
-diff -uprN linux-2.6.10.orig/include/linux/skbuff.h linux-2.6.10/include/linux/skbuff.h
---- linux-2.6.10.orig/include/linux/skbuff.h 2004-12-24 22:35:50.000000000 +0100
-+++ linux-2.6.10/include/linux/skbuff.h 2005-01-02 16:54:37.000000000 +0100
-@@ -257,6 +257,10 @@
- #ifdef CONFIG_BRIDGE_NETFILTER
- struct nf_bridge_info *nf_bridge;
- #endif
+diff -Nru linux-2.6.13/include/linux/skbuff.h linux-2.6.13-imq/include/linux/skbuff.h
+--- linux-2.6.13/include/linux/skbuff.h 2005-08-28 23:41:01.000000000 +0000
++++ linux-2.6.13-imq/include/linux/skbuff.h 2005-08-29 21:04:31.000000000 +0000
+@@ -263,6 +263,12 @@
+ __u32 nfcache;
+ __u32 nfctinfo;
+ struct nf_conntrack *nfct;
++
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ unsigned char imq_flags;
+ struct nf_info *nf_info;
+#endif
- #endif /* CONFIG_NETFILTER */
- #if defined(CONFIG_HIPPI)
- union {
-diff -uprN linux-2.6.10.orig/net/ipv4/netfilter/Kconfig linux-2.6.10/net/ipv4/netfilter/Kconfig
---- linux-2.6.10.orig/net/ipv4/netfilter/Kconfig 2005-01-02 16:54:19.000000000 +0100
-+++ linux-2.6.10/net/ipv4/netfilter/Kconfig 2005-01-02 16:54:37.000000000 +0100
-@@ -490,6 +490,17 @@ config IP_NF_TARGET_REJECT
++
+ #ifdef CONFIG_BRIDGE_NETFILTER
+ struct nf_bridge_info *nf_bridge;
+ #endif
+diff -Nru linux-2.6.13/net/ipv4/netfilter/Kconfig linux-2.6.13-imq/net/ipv4/netfilter/Kconfig
+--- linux-2.6.13/net/ipv4/netfilter/Kconfig 2005-08-28 23:41:01.000000000 +0000
++++ linux-2.6.13-imq/net/ipv4/netfilter/Kconfig 2005-08-29 21:02:39.000000000 +0000
+@@ -396,6 +396,17 @@
To compile it as a module, choose M here. If unsure, say N.
@@ -605,20 +607,20 @@
config IP_NF_TARGET_LOG
tristate "LOG target support"
depends on IP_NF_IPTABLES
-diff -uprN linux-2.6.10.orig/net/ipv4/netfilter/Makefile linux-2.6.10/net/ipv4/netfilter/Makefile
---- linux-2.6.10.orig/net/ipv4/netfilter/Makefile 2005-01-02 16:54:19.000000000 +0100
-+++ linux-2.6.10/net/ipv4/netfilter/Makefile 2005-01-02 16:55:10.000000000 +0100
-@@ -113,6 +113,7 @@ obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_EC
+diff -Nru linux-2.6.13/net/ipv4/netfilter/Makefile linux-2.6.13-imq/net/ipv4/netfilter/Makefile
+--- linux-2.6.13/net/ipv4/netfilter/Makefile 2005-08-28 23:41:01.000000000 +0000
++++ linux-2.6.13-imq/net/ipv4/netfilter/Makefile 2005-08-29 21:02:39.000000000 +0000
+@@ -66,6 +66,7 @@
+ obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o
obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o
- obj-$(CONFIG_IP_NF_TARGET_IPMARK) += ipt_IPMARK.o
+obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
- obj-$(CONFIG_IP_NF_TARGET_ROUTE) += ipt_ROUTE.o
-diff -uprN linux-2.6.10.orig/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.10/net/ipv4/netfilter/ipt_IMQ.c
---- linux-2.6.10.orig/net/ipv4/netfilter/ipt_IMQ.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.10/net/ipv4/netfilter/ipt_IMQ.c 2005-01-02 16:54:37.000000000 +0100
+ obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
+diff -Nru linux-2.6.13/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.13-imq/net/ipv4/netfilter/ipt_IMQ.c
+--- linux-2.6.13/net/ipv4/netfilter/ipt_IMQ.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.13-imq/net/ipv4/netfilter/ipt_IMQ.c 2005-08-29 21:02:39.000000000 +0000
@@ -0,0 +1,78 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@@ -698,10 +700,10 @@
+module_init(init);
+module_exit(fini);
+MODULE_LICENSE("GPL");
-diff -uprN linux-2.6.10.orig/net/ipv6/netfilter/Kconfig linux-2.6.10/net/ipv6/netfilter/Kconfig
---- linux-2.6.10.orig/net/ipv6/netfilter/Kconfig 2005-01-02 16:54:19.000000000 +0100
-+++ linux-2.6.10/net/ipv6/netfilter/Kconfig 2005-01-02 16:54:37.000000000 +0100
-@@ -187,6 +187,15 @@ config IP6_NF_FILTER
+diff -Nru linux-2.6.13/net/ipv6/netfilter/Kconfig linux-2.6.13-imq/net/ipv6/netfilter/Kconfig
+--- linux-2.6.13/net/ipv6/netfilter/Kconfig 2005-08-28 23:41:01.000000000 +0000
++++ linux-2.6.13-imq/net/ipv6/netfilter/Kconfig 2005-08-29 21:02:39.000000000 +0000
+@@ -187,6 +187,15 @@
To compile it as a module, choose M here. If unsure, say N.
@@ -717,20 +719,20 @@
config IP6_NF_TARGET_LOG
tristate "LOG target support"
depends on IP6_NF_FILTER
-diff -uprN linux-2.6.10.orig/net/ipv6/netfilter/Makefile linux-2.6.10/net/ipv6/netfilter/Makefile
---- linux-2.6.10.orig/net/ipv6/netfilter/Makefile 2005-01-02 16:54:19.000000000 +0100
-+++ linux-2.6.10/net/ipv6/netfilter/Makefile 2005-01-02 16:55:31.000000000 +0100
-@@ -24,6 +24,7 @@
+diff -Nru linux-2.6.13/net/ipv6/netfilter/Makefile linux-2.6.13-imq/net/ipv6/netfilter/Makefile
+--- linux-2.6.13/net/ipv6/netfilter/Makefile 2005-08-28 23:41:01.000000000 +0000
++++ linux-2.6.13-imq/net/ipv6/netfilter/Makefile 2005-08-29 21:02:39.000000000 +0000
+@@ -20,6 +20,7 @@
+ obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o
- obj-$(CONFIG_IP6_NF_TARGET_ROUTE) += ip6t_ROUTE.o
+obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
- obj-$(CONFIG_IP6_NF_TARGET_ULOG) += ip6t_ULOG.o
-diff -uprN linux-2.6.10.orig/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.10/net/ipv6/netfilter/ip6t_IMQ.c
---- linux-2.6.10.orig/net/ipv6/netfilter/ip6t_IMQ.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.10/net/ipv6/netfilter/ip6t_IMQ.c 2005-01-02 16:54:37.000000000 +0100
+ obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
+diff -Nru linux-2.6.13/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.13-imq/net/ipv6/netfilter/ip6t_IMQ.c
+--- linux-2.6.13/net/ipv6/netfilter/ip6t_IMQ.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.13-imq/net/ipv6/netfilter/ip6t_IMQ.c 2005-08-29 21:02:39.000000000 +0000
@@ -0,0 +1,78 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@@ -742,9 +744,9 @@
+#include <linux/imq.h>
+
+static unsigned int imq_target(struct sk_buff **pskb,
++ unsigned int hooknum,
+ const struct net_device *in,
+ const struct net_device *out,
-+ unsigned int hooknum,
+ const void *targinfo,
+ void *userdata)
+{
@@ -810,9 +812,9 @@
+module_init(init);
+module_exit(fini);
+MODULE_LICENSE("GPL");
-diff -uprN linux-2.6.10.orig/net/sched/sch_generic.c linux-2.6.10/net/sched/sch_generic.c
---- linux-2.6.10.orig/net/sched/sch_generic.c 2004-12-24 22:33:49.000000000 +0100
-+++ linux-2.6.10/net/sched/sch_generic.c 2005-01-02 16:54:37.000000000 +0100
+diff -Nru linux-2.6.13/net/sched/sch_generic.c linux-2.6.13-imq/net/sched/sch_generic.c
+--- linux-2.6.13/net/sched/sch_generic.c 2005-08-28 23:41:01.000000000 +0000
++++ linux-2.6.13-imq/net/sched/sch_generic.c 2005-08-29 21:02:39.000000000 +0000
@@ -29,6 +29,9 @@
#include <linux/netdevice.h>
#include <linux/skbuff.h>
@@ -823,7 +825,7 @@
#include <linux/init.h>
#include <linux/rcupdate.h>
#include <linux/list.h>
-@@ -136,7 +139,13 @@ int qdisc_restart(struct net_device *dev
+@@ -136,7 +139,13 @@
if (!netif_queue_stopped(dev)) {
int ret;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/2.6.10-imq.patch?r1=1.1.2.6&r2=1.1.2.7&f=u
More information about the pld-cvs-commit
mailing list