projects / 10.03 / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
refresh kernel patches so that they apply cleanly
[10.03/openwrt.git] / target / linux / generic-2.6 / patches / 150-netfilter_imq.patch
diff --git a/target/linux/generic-2.6/patches/150-netfilter_imq.patch b/target/linux/generic-2.6/patches/150-netfilter_imq.patch
index 6867974..7e41a97 100644 (file)
--- a/target/linux/generic-2.6/patches/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches/150-netfilter_imq.patch
@@ -1,5 +1,6 @@
---- linux-2.6.20-original/drivers/net/imq.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.20/drivers/net/imq.c     2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/drivers/net/imq.c linux-2.6.21.1.dev/drivers/net/imq.c
+--- linux-2.6.21.1.old/drivers/net/imq.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/drivers/net/imq.c       2007-05-26 20:34:15.180276984 +0200
 @@ -0,0 +1,402 @@
 +/*
 + *             Pseudo-driver for the intermediate queue device.
@@ -403,8 +404,9 @@
 +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");
---- linux-2.6.20-original/drivers/net/Kconfig  2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/drivers/net/Kconfig   2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/drivers/net/Kconfig linux-2.6.21.1.dev/drivers/net/Kconfig
+--- linux-2.6.21.1.old/drivers/net/Kconfig     2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/drivers/net/Kconfig     2007-05-26 20:34:15.193275008 +0200
 @@ -96,6 +96,129 @@
          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
@@ -535,8 +537,9 @@
  config TUN
        tristate "Universal TUN/TAP device driver support"
        select CRC32
---- linux-2.6.20-original/drivers/net/Makefile 2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/drivers/net/Makefile  2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/drivers/net/Makefile linux-2.6.21.1.dev/drivers/net/Makefile
+--- linux-2.6.21.1.old/drivers/net/Makefile    2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/drivers/net/Makefile    2007-05-26 20:34:15.194274856 +0200
 @@ -124,6 +124,7 @@
  obj-$(CONFIG_SLHC) += slhc.o
  
@@ -545,8 +548,9 @@
  obj-$(CONFIG_IFB) += ifb.o
  obj-$(CONFIG_DE600) += de600.o
  obj-$(CONFIG_DE620) += de620.o
---- linux-2.6.20-original/include/linux/imq.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.20/include/linux/imq.h   2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/include/linux/imq.h linux-2.6.21.1.dev/include/linux/imq.h
+--- linux-2.6.21.1.old/include/linux/imq.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/include/linux/imq.h     2007-05-26 20:34:15.458234728 +0200
 @@ -0,0 +1,9 @@
 +#ifndef _IMQ_H
 +#define _IMQ_H
@@ -557,8 +561,9 @@
 +#define IMQ_F_ENQUEUE  0x80
 +
 +#endif /* _IMQ_H */
---- linux-2.6.20-original/include/linux/netfilter_ipv4/ipt_IMQ.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.20/include/linux/netfilter_ipv4/ipt_IMQ.h        2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_IMQ.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_IMQ.h  2007-05-26 20:34:15.458234728 +0200
 @@ -0,0 +1,8 @@
 +#ifndef _IPT_IMQ_H
 +#define _IPT_IMQ_H
@@ -568,8 +573,9 @@
 +};
 +
 +#endif /* _IPT_IMQ_H */
---- linux-2.6.20-original/include/linux/netfilter_ipv6/ip6t_IMQ.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.20/include/linux/netfilter_ipv6/ip6t_IMQ.h       2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_IMQ.h
+--- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_IMQ.h 2007-05-26 20:34:15.495229104 +0200
 @@ -0,0 +1,8 @@
 +#ifndef _IP6T_IMQ_H
 +#define _IP6T_IMQ_H
@@ -579,9 +585,10 @@
 +};
 +
 +#endif /* _IP6T_IMQ_H */
---- linux-2.6.20-original/include/linux/skbuff.h       2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/include/linux/skbuff.h        2007-02-12 23:55:04.000000000 +0200
-@@ -293,6 +293,10 @@
+diff -urN linux-2.6.21.1.old/include/linux/skbuff.h linux-2.6.21.1.dev/include/linux/skbuff.h
+--- linux-2.6.21.1.old/include/linux/skbuff.h  2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/include/linux/skbuff.h  2007-05-26 20:34:15.496228952 +0200
+@@ -294,6 +294,10 @@
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        struct sk_buff          *nfct_reasm;
  #endif
@@ -592,8 +599,9 @@
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif
---- linux-2.6.20-original/net/core/dev.c       2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/net/core/dev.c        2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/net/core/dev.c linux-2.6.21.1.dev/net/core/dev.c
+--- linux-2.6.21.1.old/net/core/dev.c  2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/net/core/dev.c  2007-05-26 20:34:15.497228800 +0200
 @@ -94,6 +94,9 @@
  #include <linux/skbuff.h>
  #include <net/sock.h>
@@ -604,7 +612,7 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>
-@@ -1343,7 +1346,11 @@
+@@ -1340,7 +1343,11 @@
  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
        if (likely(!skb->next)) {
@@ -617,9 +625,10 @@
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {
---- linux-2.6.20-original/net/core/skbuff.c    2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/net/core/skbuff.c     2007-02-12 23:55:04.000000000 +0200
-@@ -485,6 +485,10 @@
+diff -urN linux-2.6.21.1.old/net/core/skbuff.c linux-2.6.21.1.dev/net/core/skbuff.c
+--- linux-2.6.21.1.old/net/core/skbuff.c       2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/net/core/skbuff.c       2007-05-26 20:34:15.498228648 +0200
+@@ -430,6 +430,10 @@
        C(nfct_reasm);
        nf_conntrack_get_reasm(skb->nfct_reasm);
  #endif
@@ -630,7 +639,7 @@
  #ifdef CONFIG_BRIDGE_NETFILTER
        C(nf_bridge);
        nf_bridge_get(skb->nf_bridge);
-@@ -549,6 +553,10 @@
+@@ -494,6 +498,10 @@
  #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
        new->ipvs_property = old->ipvs_property;
  #endif
@@ -641,8 +650,9 @@
  #ifdef CONFIG_BRIDGE_NETFILTER
        new->nf_bridge  = old->nf_bridge;
        nf_bridge_get(old->nf_bridge);
---- linux-2.6.20-original/net/ipv4/netfilter/ipt_IMQ.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.20/net/ipv4/netfilter/ipt_IMQ.c  2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_IMQ.c
+--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_IMQ.c    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_IMQ.c    2007-05-26 20:34:15.498228648 +0200
 @@ -0,0 +1,71 @@
 +/*
 + * This target marks packets to be enqueued to an imq device
@@ -715,9 +725,10 @@
 +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");
---- linux-2.6.20-original/net/ipv4/netfilter/Kconfig   2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/net/ipv4/netfilter/Kconfig    2007-02-12 23:55:04.000000000 +0200
-@@ -591,6 +591,17 @@
+diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig
+--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig      2007-05-26 20:34:13.929467136 +0200
++++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig      2007-05-26 20:34:15.498228648 +0200
+@@ -605,6 +605,17 @@
  
          To compile it as a module, choose M here.  If unsure, say N.
  
@@ -735,9 +746,10 @@
  config IP_NF_TARGET_TOS
        tristate "TOS target support"
        depends on IP_NF_MANGLE
---- linux-2.6.20-original/net/ipv4/netfilter/Makefile  2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/net/ipv4/netfilter/Makefile   2007-02-12 23:55:04.000000000 +0200
-@@ -96,6 +96,7 @@
+diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile
+--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile     2007-05-26 20:34:13.930466984 +0200
++++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile     2007-05-26 20:34:15.499228496 +0200
+@@ -100,6 +100,7 @@
  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
  obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
@@ -745,8 +757,9 @@
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
  obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
---- linux-2.6.20-original/net/ipv6/netfilter/ip6t_IMQ.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.20/net/ipv6/netfilter/ip6t_IMQ.c 2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_IMQ.c
+--- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_IMQ.c   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_IMQ.c   2007-05-26 20:34:15.531223632 +0200
 @@ -0,0 +1,71 @@
 +/*
 + * This target marks packets to be enqueued to an imq device
@@ -819,9 +832,10 @@
 +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");
---- linux-2.6.20-original/net/ipv6/netfilter/Kconfig   2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/net/ipv6/netfilter/Kconfig    2007-02-12 23:55:04.000000000 +0200
-@@ -164,6 +164,15 @@
+diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig
+--- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig      2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig      2007-05-26 20:34:15.531223632 +0200
+@@ -173,6 +173,15 @@
  
          To compile it as a module, choose M here.  If unsure, say N.
  
@@ -837,8 +851,9 @@
  config IP6_NF_TARGET_HL
        tristate  'HL (hoplimit) target support'
        depends on IP6_NF_MANGLE
---- linux-2.6.20-original/net/ipv6/netfilter/Makefile  2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/net/ipv6/netfilter/Makefile   2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile
+--- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile     2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile     2007-05-26 20:34:15.558219528 +0200
 @@ -13,6 +13,7 @@
  obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
  obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
@@ -847,8 +862,9 @@
  obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o
  obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
  obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
---- linux-2.6.20-original/net/sched/sch_generic.c      2007-02-04 20:44:54.000000000 +0200
-+++ linux-2.6.20/net/sched/sch_generic.c       2007-02-12 23:55:04.000000000 +0200
+diff -urN linux-2.6.21.1.old/net/sched/sch_generic.c linux-2.6.21.1.dev/net/sched/sch_generic.c
+--- linux-2.6.21.1.old/net/sched/sch_generic.c 2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/net/sched/sch_generic.c 2007-05-26 20:34:15.599213296 +0200
 @@ -87,7 +87,6 @@
  
     NOTE: Called under dev->queue_lock with locally disabled BH.
OpenWrt 10.03 release branch