Changeset 7847


Ignore:
Timestamp:
2007-07-02T08:31:27+02:00 (11 years ago)
Author:
nbd
Message:

update imq patches (fixes #2009)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • tags/kamikaze_7.07/target/linux/generic-2.6/patches-2.6.22/150-netfilter_imq.patch

    r7644 r7847  
    1 diff -urN linux-2.6.21.1.old/drivers/net/imq.c linux-2.6.21.1.dev/drivers/net/imq.c 
    2 --- linux-2.6.21.1.old/drivers/net/imq.c        1970-01-01 01:00:00.000000000 +0100 
    3 +++ linux-2.6.21.1.dev/drivers/net/imq.c        2007-05-26 20:34:15.180276984 +0200 
     1Index: linux-2.6.22-rc6/drivers/net/imq.c 
     2=================================================================== 
     3--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     4+++ linux-2.6.22-rc6/drivers/net/imq.c  2007-07-02 07:26:41.305182000 +0200 
    45@@ -0,0 +1,402 @@ 
    56+/* 
     
    405406+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    406407+MODULE_LICENSE("GPL"); 
    407 diff -urN linux-2.6.21.1.old/drivers/net/Kconfig linux-2.6.21.1.dev/drivers/net/Kconfig 
    408 --- linux-2.6.21.1.old/drivers/net/Kconfig      2007-04-27 23:49:26.000000000 +0200 
    409 +++ linux-2.6.21.1.dev/drivers/net/Kconfig      2007-05-26 20:34:15.193275008 +0200 
     408Index: linux-2.6.22-rc6/drivers/net/Kconfig 
     409=================================================================== 
     410--- linux-2.6.22-rc6.orig/drivers/net/Kconfig   2007-07-02 07:26:15.155547750 +0200 
     411+++ linux-2.6.22-rc6/drivers/net/Kconfig        2007-07-02 07:26:41.309182250 +0200 
    410412@@ -96,6 +96,129 @@ 
    411413          To compile this driver as a module, choose M here: the module 
     
    526528+       help 
    527529+ 
    528 +               This settings defines how many IMQ devices will be  
     530+               This settings defines how many IMQ devices will be 
    529531+               created. 
    530532+ 
     
    538540        tristate "Universal TUN/TAP device driver support" 
    539541        select CRC32 
    540 diff -urN linux-2.6.21.1.old/drivers/net/Makefile linux-2.6.21.1.dev/drivers/net/Makefile 
    541 --- linux-2.6.21.1.old/drivers/net/Makefile     2007-04-27 23:49:26.000000000 +0200 
    542 +++ linux-2.6.21.1.dev/drivers/net/Makefile     2007-05-26 20:34:15.194274856 +0200 
     542Index: linux-2.6.22-rc6/drivers/net/Makefile 
     543=================================================================== 
     544--- linux-2.6.22-rc6.orig/drivers/net/Makefile  2007-07-02 07:26:15.163548250 +0200 
     545+++ linux-2.6.22-rc6/drivers/net/Makefile       2007-07-02 07:26:41.309182250 +0200 
    543546@@ -124,6 +124,7 @@ 
    544547 obj-$(CONFIG_SLHC) += slhc.o 
     
    549552 obj-$(CONFIG_DE600) += de600.o 
    550553 obj-$(CONFIG_DE620) += de620.o 
    551 diff -urN linux-2.6.21.1.old/include/linux/imq.h linux-2.6.21.1.dev/include/linux/imq.h 
    552 --- linux-2.6.21.1.old/include/linux/imq.h      1970-01-01 01:00:00.000000000 +0100 
    553 +++ linux-2.6.21.1.dev/include/linux/imq.h      2007-05-26 20:34:15.458234728 +0200 
     554Index: linux-2.6.22-rc6/include/linux/imq.h 
     555=================================================================== 
     556--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     557+++ linux-2.6.22-rc6/include/linux/imq.h        2007-07-02 07:26:41.333183750 +0200 
    554558@@ -0,0 +1,9 @@ 
    555559+#ifndef _IMQ_H 
     
    562566+ 
    563567+#endif /* _IMQ_H */ 
    564 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 
    565 --- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_IMQ.h   1970-01-01 01:00:00.000000000 +0100 
    566 +++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_IMQ.h   2007-05-26 20:34:15.458234728 +0200 
     568Index: linux-2.6.22-rc6/include/linux/netfilter_ipv4/ipt_IMQ.h 
     569=================================================================== 
     570--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     571+++ linux-2.6.22-rc6/include/linux/netfilter_ipv4/ipt_IMQ.h     2007-07-02 07:26:41.357185250 +0200 
    567572@@ -0,0 +1,8 @@ 
    568573+#ifndef _IPT_IMQ_H 
     
    574579+ 
    575580+#endif /* _IPT_IMQ_H */ 
    576 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 
    577 --- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_IMQ.h  1970-01-01 01:00:00.000000000 +0100 
    578 +++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_IMQ.h  2007-05-26 20:34:15.495229104 +0200 
     581Index: linux-2.6.22-rc6/include/linux/netfilter_ipv6/ip6t_IMQ.h 
     582=================================================================== 
     583--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     584+++ linux-2.6.22-rc6/include/linux/netfilter_ipv6/ip6t_IMQ.h    2007-07-02 07:26:41.385187000 +0200 
    579585@@ -0,0 +1,8 @@ 
    580586+#ifndef _IP6T_IMQ_H 
     
    586592+ 
    587593+#endif /* _IP6T_IMQ_H */ 
    588 diff -urN linux-2.6.21.1.old/include/linux/skbuff.h linux-2.6.21.1.dev/include/linux/skbuff.h 
    589 --- linux-2.6.21.1.old/include/linux/skbuff.h   2007-04-27 23:49:26.000000000 +0200 
    590 +++ linux-2.6.21.1.dev/include/linux/skbuff.h   2007-05-26 20:34:15.496228952 +0200 
     594Index: linux-2.6.22-rc6/include/linux/skbuff.h 
     595=================================================================== 
     596--- linux-2.6.22-rc6.orig/include/linux/skbuff.h        2007-07-02 07:26:15.199550500 +0200 
     597+++ linux-2.6.22-rc6/include/linux/skbuff.h     2007-07-02 07:26:41.405188250 +0200 
    591598@@ -285,6 +285,10 @@ 
    592599        struct nf_conntrack     *nfct; 
     
    600607        struct nf_bridge_info   *nf_bridge; 
    601608 #endif 
    602 diff -urN linux-2.6.21.1.old/net/core/dev.c linux-2.6.21.1.dev/net/core/dev.c 
    603 --- linux-2.6.21.1.old/net/core/dev.c   2007-04-27 23:49:26.000000000 +0200 
    604 +++ linux-2.6.21.1.dev/net/core/dev.c   2007-05-26 20:34:15.497228800 +0200 
     609Index: linux-2.6.22-rc6/net/core/dev.c 
     610=================================================================== 
     611--- linux-2.6.22-rc6.orig/net/core/dev.c        2007-07-02 07:26:15.207551000 +0200 
     612+++ linux-2.6.22-rc6/net/core/dev.c     2007-07-02 07:28:00.814151000 +0200 
    605613@@ -94,6 +94,9 @@ 
    606614 #include <linux/skbuff.h> 
     
    613621 #include <linux/seq_file.h> 
    614622 #include <linux/stat.h> 
    615 @@ -1403,7 +1406,11 @@ 
    616  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
     623@@ -1404,6 +1407,9 @@ 
    617624 { 
    618625        if (likely(!skb->next)) { 
    619 -               if (!list_empty(&ptype_all)) 
    620 +               if (!list_empty(&ptype_all) 
     626                if (!list_empty(&ptype_all)) 
    621627+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) 
    622 +                   && !(skb->imq_flags & IMQ_F_ENQUEUE) 
    623 +#endif 
    624 +                   ) 
     628+                   if (!(skb->imq_flags & IMQ_F_ENQUEUE)) 
     629+#endif 
    625630                        dev_queue_xmit_nit(skb, dev); 
    626631  
    627632                if (netif_needs_gso(dev, skb)) { 
    628 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 
    629 --- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_IMQ.c     1970-01-01 01:00:00.000000000 +0100 
    630 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_IMQ.c     2007-05-26 20:34:15.498228648 +0200 
    631 @@ -0,0 +1,71 @@ 
     633Index: linux-2.6.22-rc6/net/core/skbuff.c 
     634=================================================================== 
     635--- linux-2.6.22-rc6.orig/net/core/skbuff.c     2007-06-25 01:21:48.000000000 +0200 
     636+++ linux-2.6.22-rc6/net/core/skbuff.c  2007-07-02 08:18:13.558435750 +0200 
     637@@ -419,6 +419,10 @@ 
     638        C(pkt_type); 
     639        C(ip_summed); 
     640        C(priority); 
     641+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) 
     642+       C(imq_flags); 
     643+       C(nf_info); 
     644+#endif /*CONFIG_IMQ*/ 
     645 #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) 
     646        C(ipvs_property); 
     647 #endif 
     648@@ -485,6 +489,10 @@ 
     649 #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) 
     650        new->ipvs_property = old->ipvs_property; 
     651 #endif 
     652+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) 
     653+       new->imq_flags  = old->imq_flags; 
     654+       new->nf_info    = old->nf_info; 
     655+#endif /*CONFIG_IMQ*/ 
     656 #ifdef CONFIG_NET_SCHED 
     657 #ifdef CONFIG_NET_CLS_ACT 
     658        new->tc_verd = old->tc_verd; 
     659Index: linux-2.6.22-rc6/net/ipv4/netfilter/ipt_IMQ.c 
     660=================================================================== 
     661--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     662+++ linux-2.6.22-rc6/net/ipv4/netfilter/ipt_IMQ.c       2007-07-02 07:26:41.493193750 +0200 
     663@@ -0,0 +1,69 @@ 
    632664+/* 
    633665+ * This target marks packets to be enqueued to an imq device 
     
    650682+       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE; 
    651683+ 
    652 +       return IPT_CONTINUE; 
     684+       return XT_CONTINUE; 
    653685+} 
    654686+ 
     
    673705+} 
    674706+ 
    675 +static struct ipt_target ipt_imq_reg = { 
     707+static struct xt_target ipt_imq_reg = { 
    676708+       .name           = "IMQ", 
     709+       .family         = AF_INET, 
    677710+       .target         = imq_target, 
    678711+       .targetsize     = sizeof(struct ipt_imq_info), 
     
    684717+static int __init init(void) 
    685718+{ 
    686 +       if (xt_register_target(&ipt_imq_reg)) 
    687 +               return -EINVAL; 
    688 + 
    689 +       return 0; 
     719+       return xt_register_target(&ipt_imq_reg); 
    690720+} 
    691721+ 
     
    701731+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    702732+MODULE_LICENSE("GPL"); 
    703 diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig 
    704 --- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig       2007-05-26 20:34:13.929467136 +0200 
    705 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig       2007-05-26 20:34:15.498228648 +0200 
     733Index: linux-2.6.22-rc6/net/ipv4/netfilter/Kconfig 
     734=================================================================== 
     735--- linux-2.6.22-rc6.orig/net/ipv4/netfilter/Kconfig    2007-07-02 07:26:15.223552000 +0200 
     736+++ linux-2.6.22-rc6/net/ipv4/netfilter/Kconfig 2007-07-02 08:16:57.545685250 +0200 
    706737@@ -351,6 +351,17 @@ 
    707738  
     
    722753        tristate "TOS target support" 
    723754        depends on IP_NF_MANGLE 
    724 diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile 
    725 --- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile      2007-05-26 20:34:13.930466984 +0200 
    726 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile      2007-05-26 20:34:15.499228496 +0200 
     755Index: linux-2.6.22-rc6/net/ipv4/netfilter/Makefile 
     756=================================================================== 
     757--- linux-2.6.22-rc6.orig/net/ipv4/netfilter/Makefile   2007-07-02 07:26:15.235552750 +0200 
     758+++ linux-2.6.22-rc6/net/ipv4/netfilter/Makefile        2007-07-02 08:16:57.557686000 +0200 
    727759@@ -58,6 +58,7 @@ 
    728760 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o 
     
    733765 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o 
    734766 obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o 
    735 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 
    736 --- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_IMQ.c    1970-01-01 01:00:00.000000000 +0100 
    737 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_IMQ.c    2007-05-26 20:34:15.531223632 +0200 
    738 @@ -0,0 +1,71 @@ 
     767Index: linux-2.6.22-rc6/net/ipv6/netfilter/ip6t_IMQ.c 
     768=================================================================== 
     769--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     770+++ linux-2.6.22-rc6/net/ipv6/netfilter/ip6t_IMQ.c      2007-07-02 07:26:41.593200000 +0200 
     771@@ -0,0 +1,69 @@ 
    739772+/* 
    740773+ * This target marks packets to be enqueued to an imq device 
     
    757790+       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE; 
    758791+ 
    759 +       return IP6T_CONTINUE; 
     792+       return XT_CONTINUE; 
    760793+} 
    761794+ 
     
    780813+} 
    781814+ 
    782 +static struct ip6t_target ip6t_imq_reg = { 
     815+static struct xt_target ip6t_imq_reg = { 
    783816+       .name           = "IMQ", 
     817+       .family         = AF_INET6, 
    784818+       .target         = imq_target, 
    785819+       .targetsize     = sizeof(struct ip6t_imq_info), 
     
    791825+static int __init init(void) 
    792826+{ 
    793 +       if (xt_register_target(&ip6t_imq_reg)) 
    794 +               return -EINVAL; 
    795 + 
    796 +       return 0; 
     827+       return xt_register_target(&ip6t_imq_reg); 
    797828+} 
    798829+ 
     
    808839+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    809840+MODULE_LICENSE("GPL"); 
    810 diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig 
    811 --- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig       2007-04-27 23:49:26.000000000 +0200 
    812 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig       2007-05-26 20:34:15.531223632 +0200 
     841Index: linux-2.6.22-rc6/net/ipv6/netfilter/Kconfig 
     842=================================================================== 
     843--- linux-2.6.22-rc6.orig/net/ipv6/netfilter/Kconfig    2007-07-02 07:26:15.247553500 +0200 
     844+++ linux-2.6.22-rc6/net/ipv6/netfilter/Kconfig 2007-07-02 08:16:57.581687500 +0200 
    813845@@ -173,6 +173,15 @@ 
    814846  
     
    827859        tristate  'HL (hoplimit) target support' 
    828860        depends on IP6_NF_MANGLE 
    829 diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile 
    830 --- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile      2007-04-27 23:49:26.000000000 +0200 
    831 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile      2007-05-26 20:34:15.558219528 +0200 
     861Index: linux-2.6.22-rc6/net/ipv6/netfilter/Makefile 
     862=================================================================== 
     863--- linux-2.6.22-rc6.orig/net/ipv6/netfilter/Makefile   2007-07-02 07:26:15.259554250 +0200 
     864+++ linux-2.6.22-rc6/net/ipv6/netfilter/Makefile        2007-07-02 08:16:57.597688500 +0200 
    832865@@ -13,6 +13,7 @@ 
    833866 obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o 
     
    838871 obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o 
    839872 obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o 
    840 diff -urN linux-2.6.21.1.old/net/sched/sch_generic.c linux-2.6.21.1.dev/net/sched/sch_generic.c 
    841 --- linux-2.6.21.1.old/net/sched/sch_generic.c  2007-04-27 23:49:26.000000000 +0200 
    842 +++ linux-2.6.21.1.dev/net/sched/sch_generic.c  2007-05-26 20:34:15.599213296 +0200 
     873Index: linux-2.6.22-rc6/net/sched/sch_generic.c 
     874=================================================================== 
     875--- linux-2.6.22-rc6.orig/net/sched/sch_generic.c       2007-07-02 07:26:15.271555000 +0200 
     876+++ linux-2.6.22-rc6/net/sched/sch_generic.c    2007-07-02 07:26:41.665204500 +0200 
    843877@@ -77,7 +77,6 @@ 
    844878  
     
    861895 { 
    862896        do { 
    863 @@ -607,3 +611,4 @@ 
     897@@ -608,3 +612,4 @@ 
    864898 EXPORT_SYMBOL(qdisc_reset); 
    865899 EXPORT_SYMBOL(qdisc_lock_tree); 
  • tags/kamikaze_7.07/target/linux/generic-2.6/patches/150-netfilter_imq.patch

    r7347 r7847  
    1 diff -urN linux-2.6.21.1.old/drivers/net/imq.c linux-2.6.21.1.dev/drivers/net/imq.c 
    2 --- linux-2.6.21.1.old/drivers/net/imq.c        1970-01-01 01:00:00.000000000 +0100 
    3 +++ linux-2.6.21.1.dev/drivers/net/imq.c        2007-05-26 20:34:15.180276984 +0200 
     1Index: linux-2.6.21.5/drivers/net/imq.c 
     2=================================================================== 
     3--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     4+++ linux-2.6.21.5/drivers/net/imq.c    2007-07-02 08:26:03.223788000 +0200 
    45@@ -0,0 +1,402 @@ 
    56+/* 
     
    405406+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    406407+MODULE_LICENSE("GPL"); 
    407 diff -urN linux-2.6.21.1.old/drivers/net/Kconfig linux-2.6.21.1.dev/drivers/net/Kconfig 
    408 --- linux-2.6.21.1.old/drivers/net/Kconfig      2007-04-27 23:49:26.000000000 +0200 
    409 +++ linux-2.6.21.1.dev/drivers/net/Kconfig      2007-05-26 20:34:15.193275008 +0200 
     408Index: linux-2.6.21.5/drivers/net/Kconfig 
     409=================================================================== 
     410--- linux-2.6.21.5.orig/drivers/net/Kconfig     2007-07-02 08:25:36.554121250 +0200 
     411+++ linux-2.6.21.5/drivers/net/Kconfig  2007-07-02 08:26:03.719819000 +0200 
    410412@@ -96,6 +96,129 @@ 
    411413          To compile this driver as a module, choose M here: the module 
     
    526528+       help 
    527529+ 
    528 +               This settings defines how many IMQ devices will be  
     530+               This settings defines how many IMQ devices will be 
    529531+               created. 
    530532+ 
     
    538540        tristate "Universal TUN/TAP device driver support" 
    539541        select CRC32 
    540 diff -urN linux-2.6.21.1.old/drivers/net/Makefile linux-2.6.21.1.dev/drivers/net/Makefile 
    541 --- linux-2.6.21.1.old/drivers/net/Makefile     2007-04-27 23:49:26.000000000 +0200 
    542 +++ linux-2.6.21.1.dev/drivers/net/Makefile     2007-05-26 20:34:15.194274856 +0200 
     542Index: linux-2.6.21.5/drivers/net/Makefile 
     543=================================================================== 
     544--- linux-2.6.21.5.orig/drivers/net/Makefile    2007-07-02 08:25:36.566122000 +0200 
     545+++ linux-2.6.21.5/drivers/net/Makefile 2007-07-02 08:26:03.859827750 +0200 
    543546@@ -124,6 +124,7 @@ 
    544547 obj-$(CONFIG_SLHC) += slhc.o 
     
    549552 obj-$(CONFIG_DE600) += de600.o 
    550553 obj-$(CONFIG_DE620) += de620.o 
    551 diff -urN linux-2.6.21.1.old/include/linux/imq.h linux-2.6.21.1.dev/include/linux/imq.h 
    552 --- linux-2.6.21.1.old/include/linux/imq.h      1970-01-01 01:00:00.000000000 +0100 
    553 +++ linux-2.6.21.1.dev/include/linux/imq.h      2007-05-26 20:34:15.458234728 +0200 
     554Index: linux-2.6.21.5/include/linux/imq.h 
     555=================================================================== 
     556--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     557+++ linux-2.6.21.5/include/linux/imq.h  2007-07-02 08:26:04.311856000 +0200 
    554558@@ -0,0 +1,9 @@ 
    555559+#ifndef _IMQ_H 
     
    562566+ 
    563567+#endif /* _IMQ_H */ 
    564 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 
    565 --- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_IMQ.h   1970-01-01 01:00:00.000000000 +0100 
    566 +++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_IMQ.h   2007-05-26 20:34:15.458234728 +0200 
     568Index: linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_IMQ.h 
     569=================================================================== 
     570--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     571+++ linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_IMQ.h       2007-07-02 08:26:04.607874500 +0200 
    567572@@ -0,0 +1,8 @@ 
    568573+#ifndef _IPT_IMQ_H 
     
    574579+ 
    575580+#endif /* _IPT_IMQ_H */ 
    576 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 
    577 --- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_IMQ.h  1970-01-01 01:00:00.000000000 +0100 
    578 +++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_IMQ.h  2007-05-26 20:34:15.495229104 +0200 
     581Index: linux-2.6.21.5/include/linux/netfilter_ipv6/ip6t_IMQ.h 
     582=================================================================== 
     583--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     584+++ linux-2.6.21.5/include/linux/netfilter_ipv6/ip6t_IMQ.h      2007-07-02 08:26:04.927894500 +0200 
    579585@@ -0,0 +1,8 @@ 
    580586+#ifndef _IP6T_IMQ_H 
     
    586592+ 
    587593+#endif /* _IP6T_IMQ_H */ 
    588 diff -urN linux-2.6.21.1.old/include/linux/skbuff.h linux-2.6.21.1.dev/include/linux/skbuff.h 
    589 --- linux-2.6.21.1.old/include/linux/skbuff.h   2007-04-27 23:49:26.000000000 +0200 
    590 +++ linux-2.6.21.1.dev/include/linux/skbuff.h   2007-05-26 20:34:15.496228952 +0200 
     594Index: linux-2.6.21.5/include/linux/skbuff.h 
     595=================================================================== 
     596--- linux-2.6.21.5.orig/include/linux/skbuff.h  2007-07-02 08:25:36.598124000 +0200 
     597+++ linux-2.6.21.5/include/linux/skbuff.h       2007-07-02 08:26:04.983898000 +0200 
    591598@@ -294,6 +294,10 @@ 
    592599 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) 
     
    600607        struct nf_bridge_info   *nf_bridge; 
    601608 #endif 
    602 diff -urN linux-2.6.21.1.old/net/core/dev.c linux-2.6.21.1.dev/net/core/dev.c 
    603 --- linux-2.6.21.1.old/net/core/dev.c   2007-04-27 23:49:26.000000000 +0200 
    604 +++ linux-2.6.21.1.dev/net/core/dev.c   2007-05-26 20:34:15.497228800 +0200 
     609Index: linux-2.6.21.5/net/core/dev.c 
     610=================================================================== 
     611--- linux-2.6.21.5.orig/net/core/dev.c  2007-07-02 08:25:36.606124500 +0200 
     612+++ linux-2.6.21.5/net/core/dev.c       2007-07-02 08:26:04.983898000 +0200 
    605613@@ -94,6 +94,9 @@ 
    606614 #include <linux/skbuff.h> 
     
    626634  
    627635                if (netif_needs_gso(dev, skb)) { 
    628 diff -urN linux-2.6.21.1.old/net/core/skbuff.c linux-2.6.21.1.dev/net/core/skbuff.c 
    629 --- linux-2.6.21.1.old/net/core/skbuff.c        2007-04-27 23:49:26.000000000 +0200 
    630 +++ linux-2.6.21.1.dev/net/core/skbuff.c        2007-05-26 20:34:15.498228648 +0200 
     636Index: linux-2.6.21.5/net/core/skbuff.c 
     637=================================================================== 
     638--- linux-2.6.21.5.orig/net/core/skbuff.c       2007-07-02 08:25:36.618125250 +0200 
     639+++ linux-2.6.21.5/net/core/skbuff.c    2007-07-02 08:26:05.007899500 +0200 
    631640@@ -430,6 +430,10 @@ 
    632641        C(nfct_reasm); 
     
    651660        new->nf_bridge  = old->nf_bridge; 
    652661        nf_bridge_get(old->nf_bridge); 
    653 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 
    654 --- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_IMQ.c     1970-01-01 01:00:00.000000000 +0100 
    655 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_IMQ.c     2007-05-26 20:34:15.498228648 +0200 
    656 @@ -0,0 +1,71 @@ 
     662Index: linux-2.6.21.5/net/ipv4/netfilter/ipt_IMQ.c 
     663=================================================================== 
     664--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     665+++ linux-2.6.21.5/net/ipv4/netfilter/ipt_IMQ.c 2007-07-02 08:26:05.055902500 +0200 
     666@@ -0,0 +1,69 @@ 
    657667+/* 
    658668+ * This target marks packets to be enqueued to an imq device 
     
    675685+       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE; 
    676686+ 
    677 +       return IPT_CONTINUE; 
     687+       return XT_CONTINUE; 
    678688+} 
    679689+ 
     
    698708+} 
    699709+ 
    700 +static struct ipt_target ipt_imq_reg = { 
     710+static struct xt_target ipt_imq_reg = { 
    701711+       .name           = "IMQ", 
     712+       .family         = AF_INET, 
    702713+       .target         = imq_target, 
    703714+       .targetsize     = sizeof(struct ipt_imq_info), 
     
    709720+static int __init init(void) 
    710721+{ 
    711 +       if (xt_register_target(&ipt_imq_reg)) 
    712 +               return -EINVAL; 
    713 + 
    714 +       return 0; 
     722+       return xt_register_target(&ipt_imq_reg); 
    715723+} 
    716724+ 
     
    726734+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    727735+MODULE_LICENSE("GPL"); 
    728 diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig 
    729 --- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig       2007-05-26 20:34:13.929467136 +0200 
    730 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig       2007-05-26 20:34:15.498228648 +0200 
     736Index: linux-2.6.21.5/net/ipv4/netfilter/Kconfig 
     737=================================================================== 
     738--- linux-2.6.21.5.orig/net/ipv4/netfilter/Kconfig      2007-07-02 08:25:36.630126000 +0200 
     739+++ linux-2.6.21.5/net/ipv4/netfilter/Kconfig   2007-07-02 08:26:05.115906250 +0200 
    731740@@ -605,6 +605,17 @@ 
    732741  
     
    747756        tristate "TOS target support" 
    748757        depends on IP_NF_MANGLE 
    749 diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile 
    750 --- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile      2007-05-26 20:34:13.930466984 +0200 
    751 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile      2007-05-26 20:34:15.499228496 +0200 
     758Index: linux-2.6.21.5/net/ipv4/netfilter/Makefile 
     759=================================================================== 
     760--- linux-2.6.21.5.orig/net/ipv4/netfilter/Makefile     2007-07-02 08:25:36.714131250 +0200 
     761+++ linux-2.6.21.5/net/ipv4/netfilter/Makefile  2007-07-02 08:26:05.175910000 +0200 
    752762@@ -100,6 +100,7 @@ 
    753763 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o 
     
    758768 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o 
    759769 obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o 
    760 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 
    761 --- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_IMQ.c    1970-01-01 01:00:00.000000000 +0100 
    762 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_IMQ.c    2007-05-26 20:34:15.531223632 +0200 
    763 @@ -0,0 +1,71 @@ 
     770Index: linux-2.6.21.5/net/ipv6/netfilter/ip6t_IMQ.c 
     771=================================================================== 
     772--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     773+++ linux-2.6.21.5/net/ipv6/netfilter/ip6t_IMQ.c        2007-07-02 08:26:05.231913500 +0200 
     774@@ -0,0 +1,69 @@ 
    764775+/* 
    765776+ * This target marks packets to be enqueued to an imq device 
     
    782793+       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE; 
    783794+ 
    784 +       return IP6T_CONTINUE; 
     795+       return XT_CONTINUE; 
    785796+} 
    786797+ 
     
    805816+} 
    806817+ 
    807 +static struct ip6t_target ip6t_imq_reg = { 
     818+static struct xt_target ip6t_imq_reg = { 
    808819+       .name           = "IMQ", 
     820+       .family         = AF_INET6, 
    809821+       .target         = imq_target, 
    810822+       .targetsize     = sizeof(struct ip6t_imq_info), 
     
    816828+static int __init init(void) 
    817829+{ 
    818 +       if (xt_register_target(&ip6t_imq_reg)) 
    819 +               return -EINVAL; 
    820 + 
    821 +       return 0; 
     830+       return xt_register_target(&ip6t_imq_reg); 
    822831+} 
    823832+ 
     
    833842+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    834843+MODULE_LICENSE("GPL"); 
    835 diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig 
    836 --- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig       2007-04-27 23:49:26.000000000 +0200 
    837 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig       2007-05-26 20:34:15.531223632 +0200 
     844Index: linux-2.6.21.5/net/ipv6/netfilter/Kconfig 
     845=================================================================== 
     846--- linux-2.6.21.5.orig/net/ipv6/netfilter/Kconfig      2007-07-02 08:25:36.726132000 +0200 
     847+++ linux-2.6.21.5/net/ipv6/netfilter/Kconfig   2007-07-02 08:26:05.267915750 +0200 
    838848@@ -173,6 +173,15 @@ 
    839849  
     
    852862        tristate  'HL (hoplimit) target support' 
    853863        depends on IP6_NF_MANGLE 
    854 diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile 
    855 --- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile      2007-04-27 23:49:26.000000000 +0200 
    856 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile      2007-05-26 20:34:15.558219528 +0200 
     864Index: linux-2.6.21.5/net/ipv6/netfilter/Makefile 
     865=================================================================== 
     866--- linux-2.6.21.5.orig/net/ipv6/netfilter/Makefile     2007-07-02 08:25:36.738132750 +0200 
     867+++ linux-2.6.21.5/net/ipv6/netfilter/Makefile  2007-07-02 08:26:05.319919000 +0200 
    857868@@ -13,6 +13,7 @@ 
    858869 obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o 
     
    863874 obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o 
    864875 obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o 
    865 diff -urN linux-2.6.21.1.old/net/sched/sch_generic.c linux-2.6.21.1.dev/net/sched/sch_generic.c 
    866 --- linux-2.6.21.1.old/net/sched/sch_generic.c  2007-04-27 23:49:26.000000000 +0200 
    867 +++ linux-2.6.21.1.dev/net/sched/sch_generic.c  2007-05-26 20:34:15.599213296 +0200 
     876Index: linux-2.6.21.5/net/sched/sch_generic.c 
     877=================================================================== 
     878--- linux-2.6.21.5.orig/net/sched/sch_generic.c 2007-07-02 08:25:36.750133500 +0200 
     879+++ linux-2.6.21.5/net/sched/sch_generic.c      2007-07-02 08:26:05.343920500 +0200 
    868880@@ -87,7 +87,6 @@ 
    869881  
  • trunk/target/linux/generic-2.6/patches-2.6.22/150-netfilter_imq.patch

    r7644 r7847  
    1 diff -urN linux-2.6.21.1.old/drivers/net/imq.c linux-2.6.21.1.dev/drivers/net/imq.c 
    2 --- linux-2.6.21.1.old/drivers/net/imq.c        1970-01-01 01:00:00.000000000 +0100 
    3 +++ linux-2.6.21.1.dev/drivers/net/imq.c        2007-05-26 20:34:15.180276984 +0200 
     1Index: linux-2.6.22-rc6/drivers/net/imq.c 
     2=================================================================== 
     3--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     4+++ linux-2.6.22-rc6/drivers/net/imq.c  2007-07-02 07:26:41.305182000 +0200 
    45@@ -0,0 +1,402 @@ 
    56+/* 
     
    405406+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    406407+MODULE_LICENSE("GPL"); 
    407 diff -urN linux-2.6.21.1.old/drivers/net/Kconfig linux-2.6.21.1.dev/drivers/net/Kconfig 
    408 --- linux-2.6.21.1.old/drivers/net/Kconfig      2007-04-27 23:49:26.000000000 +0200 
    409 +++ linux-2.6.21.1.dev/drivers/net/Kconfig      2007-05-26 20:34:15.193275008 +0200 
     408Index: linux-2.6.22-rc6/drivers/net/Kconfig 
     409=================================================================== 
     410--- linux-2.6.22-rc6.orig/drivers/net/Kconfig   2007-07-02 07:26:15.155547750 +0200 
     411+++ linux-2.6.22-rc6/drivers/net/Kconfig        2007-07-02 07:26:41.309182250 +0200 
    410412@@ -96,6 +96,129 @@ 
    411413          To compile this driver as a module, choose M here: the module 
     
    526528+       help 
    527529+ 
    528 +               This settings defines how many IMQ devices will be  
     530+               This settings defines how many IMQ devices will be 
    529531+               created. 
    530532+ 
     
    538540        tristate "Universal TUN/TAP device driver support" 
    539541        select CRC32 
    540 diff -urN linux-2.6.21.1.old/drivers/net/Makefile linux-2.6.21.1.dev/drivers/net/Makefile 
    541 --- linux-2.6.21.1.old/drivers/net/Makefile     2007-04-27 23:49:26.000000000 +0200 
    542 +++ linux-2.6.21.1.dev/drivers/net/Makefile     2007-05-26 20:34:15.194274856 +0200 
     542Index: linux-2.6.22-rc6/drivers/net/Makefile 
     543=================================================================== 
     544--- linux-2.6.22-rc6.orig/drivers/net/Makefile  2007-07-02 07:26:15.163548250 +0200 
     545+++ linux-2.6.22-rc6/drivers/net/Makefile       2007-07-02 07:26:41.309182250 +0200 
    543546@@ -124,6 +124,7 @@ 
    544547 obj-$(CONFIG_SLHC) += slhc.o 
     
    549552 obj-$(CONFIG_DE600) += de600.o 
    550553 obj-$(CONFIG_DE620) += de620.o 
    551 diff -urN linux-2.6.21.1.old/include/linux/imq.h linux-2.6.21.1.dev/include/linux/imq.h 
    552 --- linux-2.6.21.1.old/include/linux/imq.h      1970-01-01 01:00:00.000000000 +0100 
    553 +++ linux-2.6.21.1.dev/include/linux/imq.h      2007-05-26 20:34:15.458234728 +0200 
     554Index: linux-2.6.22-rc6/include/linux/imq.h 
     555=================================================================== 
     556--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     557+++ linux-2.6.22-rc6/include/linux/imq.h        2007-07-02 07:26:41.333183750 +0200 
    554558@@ -0,0 +1,9 @@ 
    555559+#ifndef _IMQ_H 
     
    562566+ 
    563567+#endif /* _IMQ_H */ 
    564 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 
    565 --- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_IMQ.h   1970-01-01 01:00:00.000000000 +0100 
    566 +++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_IMQ.h   2007-05-26 20:34:15.458234728 +0200 
     568Index: linux-2.6.22-rc6/include/linux/netfilter_ipv4/ipt_IMQ.h 
     569=================================================================== 
     570--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     571+++ linux-2.6.22-rc6/include/linux/netfilter_ipv4/ipt_IMQ.h     2007-07-02 07:26:41.357185250 +0200 
    567572@@ -0,0 +1,8 @@ 
    568573+#ifndef _IPT_IMQ_H 
     
    574579+ 
    575580+#endif /* _IPT_IMQ_H */ 
    576 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 
    577 --- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_IMQ.h  1970-01-01 01:00:00.000000000 +0100 
    578 +++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_IMQ.h  2007-05-26 20:34:15.495229104 +0200 
     581Index: linux-2.6.22-rc6/include/linux/netfilter_ipv6/ip6t_IMQ.h 
     582=================================================================== 
     583--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     584+++ linux-2.6.22-rc6/include/linux/netfilter_ipv6/ip6t_IMQ.h    2007-07-02 07:26:41.385187000 +0200 
    579585@@ -0,0 +1,8 @@ 
    580586+#ifndef _IP6T_IMQ_H 
     
    586592+ 
    587593+#endif /* _IP6T_IMQ_H */ 
    588 diff -urN linux-2.6.21.1.old/include/linux/skbuff.h linux-2.6.21.1.dev/include/linux/skbuff.h 
    589 --- linux-2.6.21.1.old/include/linux/skbuff.h   2007-04-27 23:49:26.000000000 +0200 
    590 +++ linux-2.6.21.1.dev/include/linux/skbuff.h   2007-05-26 20:34:15.496228952 +0200 
     594Index: linux-2.6.22-rc6/include/linux/skbuff.h 
     595=================================================================== 
     596--- linux-2.6.22-rc6.orig/include/linux/skbuff.h        2007-07-02 07:26:15.199550500 +0200 
     597+++ linux-2.6.22-rc6/include/linux/skbuff.h     2007-07-02 07:26:41.405188250 +0200 
    591598@@ -285,6 +285,10 @@ 
    592599        struct nf_conntrack     *nfct; 
     
    600607        struct nf_bridge_info   *nf_bridge; 
    601608 #endif 
    602 diff -urN linux-2.6.21.1.old/net/core/dev.c linux-2.6.21.1.dev/net/core/dev.c 
    603 --- linux-2.6.21.1.old/net/core/dev.c   2007-04-27 23:49:26.000000000 +0200 
    604 +++ linux-2.6.21.1.dev/net/core/dev.c   2007-05-26 20:34:15.497228800 +0200 
     609Index: linux-2.6.22-rc6/net/core/dev.c 
     610=================================================================== 
     611--- linux-2.6.22-rc6.orig/net/core/dev.c        2007-07-02 07:26:15.207551000 +0200 
     612+++ linux-2.6.22-rc6/net/core/dev.c     2007-07-02 07:28:00.814151000 +0200 
    605613@@ -94,6 +94,9 @@ 
    606614 #include <linux/skbuff.h> 
     
    613621 #include <linux/seq_file.h> 
    614622 #include <linux/stat.h> 
    615 @@ -1403,7 +1406,11 @@ 
    616  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
     623@@ -1404,6 +1407,9 @@ 
    617624 { 
    618625        if (likely(!skb->next)) { 
    619 -               if (!list_empty(&ptype_all)) 
    620 +               if (!list_empty(&ptype_all) 
     626                if (!list_empty(&ptype_all)) 
    621627+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) 
    622 +                   && !(skb->imq_flags & IMQ_F_ENQUEUE) 
    623 +#endif 
    624 +                   ) 
     628+                   if (!(skb->imq_flags & IMQ_F_ENQUEUE)) 
     629+#endif 
    625630                        dev_queue_xmit_nit(skb, dev); 
    626631  
    627632                if (netif_needs_gso(dev, skb)) { 
    628 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 
    629 --- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_IMQ.c     1970-01-01 01:00:00.000000000 +0100 
    630 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_IMQ.c     2007-05-26 20:34:15.498228648 +0200 
    631 @@ -0,0 +1,71 @@ 
     633Index: linux-2.6.22-rc6/net/core/skbuff.c 
     634=================================================================== 
     635--- linux-2.6.22-rc6.orig/net/core/skbuff.c     2007-06-25 01:21:48.000000000 +0200 
     636+++ linux-2.6.22-rc6/net/core/skbuff.c  2007-07-02 08:18:13.558435750 +0200 
     637@@ -419,6 +419,10 @@ 
     638        C(pkt_type); 
     639        C(ip_summed); 
     640        C(priority); 
     641+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) 
     642+       C(imq_flags); 
     643+       C(nf_info); 
     644+#endif /*CONFIG_IMQ*/ 
     645 #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) 
     646        C(ipvs_property); 
     647 #endif 
     648@@ -485,6 +489,10 @@ 
     649 #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) 
     650        new->ipvs_property = old->ipvs_property; 
     651 #endif 
     652+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) 
     653+       new->imq_flags  = old->imq_flags; 
     654+       new->nf_info    = old->nf_info; 
     655+#endif /*CONFIG_IMQ*/ 
     656 #ifdef CONFIG_NET_SCHED 
     657 #ifdef CONFIG_NET_CLS_ACT 
     658        new->tc_verd = old->tc_verd; 
     659Index: linux-2.6.22-rc6/net/ipv4/netfilter/ipt_IMQ.c 
     660=================================================================== 
     661--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     662+++ linux-2.6.22-rc6/net/ipv4/netfilter/ipt_IMQ.c       2007-07-02 07:26:41.493193750 +0200 
     663@@ -0,0 +1,69 @@ 
    632664+/* 
    633665+ * This target marks packets to be enqueued to an imq device 
     
    650682+       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE; 
    651683+ 
    652 +       return IPT_CONTINUE; 
     684+       return XT_CONTINUE; 
    653685+} 
    654686+ 
     
    673705+} 
    674706+ 
    675 +static struct ipt_target ipt_imq_reg = { 
     707+static struct xt_target ipt_imq_reg = { 
    676708+       .name           = "IMQ", 
     709+       .family         = AF_INET, 
    677710+       .target         = imq_target, 
    678711+       .targetsize     = sizeof(struct ipt_imq_info), 
     
    684717+static int __init init(void) 
    685718+{ 
    686 +       if (xt_register_target(&ipt_imq_reg)) 
    687 +               return -EINVAL; 
    688 + 
    689 +       return 0; 
     719+       return xt_register_target(&ipt_imq_reg); 
    690720+} 
    691721+ 
     
    701731+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    702732+MODULE_LICENSE("GPL"); 
    703 diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig 
    704 --- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig       2007-05-26 20:34:13.929467136 +0200 
    705 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig       2007-05-26 20:34:15.498228648 +0200 
     733Index: linux-2.6.22-rc6/net/ipv4/netfilter/Kconfig 
     734=================================================================== 
     735--- linux-2.6.22-rc6.orig/net/ipv4/netfilter/Kconfig    2007-07-02 07:26:15.223552000 +0200 
     736+++ linux-2.6.22-rc6/net/ipv4/netfilter/Kconfig 2007-07-02 08:16:57.545685250 +0200 
    706737@@ -351,6 +351,17 @@ 
    707738  
     
    722753        tristate "TOS target support" 
    723754        depends on IP_NF_MANGLE 
    724 diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile 
    725 --- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile      2007-05-26 20:34:13.930466984 +0200 
    726 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile      2007-05-26 20:34:15.499228496 +0200 
     755Index: linux-2.6.22-rc6/net/ipv4/netfilter/Makefile 
     756=================================================================== 
     757--- linux-2.6.22-rc6.orig/net/ipv4/netfilter/Makefile   2007-07-02 07:26:15.235552750 +0200 
     758+++ linux-2.6.22-rc6/net/ipv4/netfilter/Makefile        2007-07-02 08:16:57.557686000 +0200 
    727759@@ -58,6 +58,7 @@ 
    728760 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o 
     
    733765 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o 
    734766 obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o 
    735 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 
    736 --- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_IMQ.c    1970-01-01 01:00:00.000000000 +0100 
    737 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_IMQ.c    2007-05-26 20:34:15.531223632 +0200 
    738 @@ -0,0 +1,71 @@ 
     767Index: linux-2.6.22-rc6/net/ipv6/netfilter/ip6t_IMQ.c 
     768=================================================================== 
     769--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     770+++ linux-2.6.22-rc6/net/ipv6/netfilter/ip6t_IMQ.c      2007-07-02 07:26:41.593200000 +0200 
     771@@ -0,0 +1,69 @@ 
    739772+/* 
    740773+ * This target marks packets to be enqueued to an imq device 
     
    757790+       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE; 
    758791+ 
    759 +       return IP6T_CONTINUE; 
     792+       return XT_CONTINUE; 
    760793+} 
    761794+ 
     
    780813+} 
    781814+ 
    782 +static struct ip6t_target ip6t_imq_reg = { 
     815+static struct xt_target ip6t_imq_reg = { 
    783816+       .name           = "IMQ", 
     817+       .family         = AF_INET6, 
    784818+       .target         = imq_target, 
    785819+       .targetsize     = sizeof(struct ip6t_imq_info), 
     
    791825+static int __init init(void) 
    792826+{ 
    793 +       if (xt_register_target(&ip6t_imq_reg)) 
    794 +               return -EINVAL; 
    795 + 
    796 +       return 0; 
     827+       return xt_register_target(&ip6t_imq_reg); 
    797828+} 
    798829+ 
     
    808839+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    809840+MODULE_LICENSE("GPL"); 
    810 diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig 
    811 --- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig       2007-04-27 23:49:26.000000000 +0200 
    812 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig       2007-05-26 20:34:15.531223632 +0200 
     841Index: linux-2.6.22-rc6/net/ipv6/netfilter/Kconfig 
     842=================================================================== 
     843--- linux-2.6.22-rc6.orig/net/ipv6/netfilter/Kconfig    2007-07-02 07:26:15.247553500 +0200 
     844+++ linux-2.6.22-rc6/net/ipv6/netfilter/Kconfig 2007-07-02 08:16:57.581687500 +0200 
    813845@@ -173,6 +173,15 @@ 
    814846  
     
    827859        tristate  'HL (hoplimit) target support' 
    828860        depends on IP6_NF_MANGLE 
    829 diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile 
    830 --- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile      2007-04-27 23:49:26.000000000 +0200 
    831 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile      2007-05-26 20:34:15.558219528 +0200 
     861Index: linux-2.6.22-rc6/net/ipv6/netfilter/Makefile 
     862=================================================================== 
     863--- linux-2.6.22-rc6.orig/net/ipv6/netfilter/Makefile   2007-07-02 07:26:15.259554250 +0200 
     864+++ linux-2.6.22-rc6/net/ipv6/netfilter/Makefile        2007-07-02 08:16:57.597688500 +0200 
    832865@@ -13,6 +13,7 @@ 
    833866 obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o 
     
    838871 obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o 
    839872 obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o 
    840 diff -urN linux-2.6.21.1.old/net/sched/sch_generic.c linux-2.6.21.1.dev/net/sched/sch_generic.c 
    841 --- linux-2.6.21.1.old/net/sched/sch_generic.c  2007-04-27 23:49:26.000000000 +0200 
    842 +++ linux-2.6.21.1.dev/net/sched/sch_generic.c  2007-05-26 20:34:15.599213296 +0200 
     873Index: linux-2.6.22-rc6/net/sched/sch_generic.c 
     874=================================================================== 
     875--- linux-2.6.22-rc6.orig/net/sched/sch_generic.c       2007-07-02 07:26:15.271555000 +0200 
     876+++ linux-2.6.22-rc6/net/sched/sch_generic.c    2007-07-02 07:26:41.665204500 +0200 
    843877@@ -77,7 +77,6 @@ 
    844878  
     
    861895 { 
    862896        do { 
    863 @@ -607,3 +611,4 @@ 
     897@@ -608,3 +612,4 @@ 
    864898 EXPORT_SYMBOL(qdisc_reset); 
    865899 EXPORT_SYMBOL(qdisc_lock_tree); 
  • trunk/target/linux/generic-2.6/patches/150-netfilter_imq.patch

    r7347 r7847  
    1 diff -urN linux-2.6.21.1.old/drivers/net/imq.c linux-2.6.21.1.dev/drivers/net/imq.c 
    2 --- linux-2.6.21.1.old/drivers/net/imq.c        1970-01-01 01:00:00.000000000 +0100 
    3 +++ linux-2.6.21.1.dev/drivers/net/imq.c        2007-05-26 20:34:15.180276984 +0200 
     1Index: linux-2.6.21.5/drivers/net/imq.c 
     2=================================================================== 
     3--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     4+++ linux-2.6.21.5/drivers/net/imq.c    2007-07-02 08:26:03.223788000 +0200 
    45@@ -0,0 +1,402 @@ 
    56+/* 
     
    405406+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    406407+MODULE_LICENSE("GPL"); 
    407 diff -urN linux-2.6.21.1.old/drivers/net/Kconfig linux-2.6.21.1.dev/drivers/net/Kconfig 
    408 --- linux-2.6.21.1.old/drivers/net/Kconfig      2007-04-27 23:49:26.000000000 +0200 
    409 +++ linux-2.6.21.1.dev/drivers/net/Kconfig      2007-05-26 20:34:15.193275008 +0200 
     408Index: linux-2.6.21.5/drivers/net/Kconfig 
     409=================================================================== 
     410--- linux-2.6.21.5.orig/drivers/net/Kconfig     2007-07-02 08:25:36.554121250 +0200 
     411+++ linux-2.6.21.5/drivers/net/Kconfig  2007-07-02 08:26:03.719819000 +0200 
    410412@@ -96,6 +96,129 @@ 
    411413          To compile this driver as a module, choose M here: the module 
     
    526528+       help 
    527529+ 
    528 +               This settings defines how many IMQ devices will be  
     530+               This settings defines how many IMQ devices will be 
    529531+               created. 
    530532+ 
     
    538540        tristate "Universal TUN/TAP device driver support" 
    539541        select CRC32 
    540 diff -urN linux-2.6.21.1.old/drivers/net/Makefile linux-2.6.21.1.dev/drivers/net/Makefile 
    541 --- linux-2.6.21.1.old/drivers/net/Makefile     2007-04-27 23:49:26.000000000 +0200 
    542 +++ linux-2.6.21.1.dev/drivers/net/Makefile     2007-05-26 20:34:15.194274856 +0200 
     542Index: linux-2.6.21.5/drivers/net/Makefile 
     543=================================================================== 
     544--- linux-2.6.21.5.orig/drivers/net/Makefile    2007-07-02 08:25:36.566122000 +0200 
     545+++ linux-2.6.21.5/drivers/net/Makefile 2007-07-02 08:26:03.859827750 +0200 
    543546@@ -124,6 +124,7 @@ 
    544547 obj-$(CONFIG_SLHC) += slhc.o 
     
    549552 obj-$(CONFIG_DE600) += de600.o 
    550553 obj-$(CONFIG_DE620) += de620.o 
    551 diff -urN linux-2.6.21.1.old/include/linux/imq.h linux-2.6.21.1.dev/include/linux/imq.h 
    552 --- linux-2.6.21.1.old/include/linux/imq.h      1970-01-01 01:00:00.000000000 +0100 
    553 +++ linux-2.6.21.1.dev/include/linux/imq.h      2007-05-26 20:34:15.458234728 +0200 
     554Index: linux-2.6.21.5/include/linux/imq.h 
     555=================================================================== 
     556--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     557+++ linux-2.6.21.5/include/linux/imq.h  2007-07-02 08:26:04.311856000 +0200 
    554558@@ -0,0 +1,9 @@ 
    555559+#ifndef _IMQ_H 
     
    562566+ 
    563567+#endif /* _IMQ_H */ 
    564 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 
    565 --- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_IMQ.h   1970-01-01 01:00:00.000000000 +0100 
    566 +++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_IMQ.h   2007-05-26 20:34:15.458234728 +0200 
     568Index: linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_IMQ.h 
     569=================================================================== 
     570--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     571+++ linux-2.6.21.5/include/linux/netfilter_ipv4/ipt_IMQ.h       2007-07-02 08:26:04.607874500 +0200 
    567572@@ -0,0 +1,8 @@ 
    568573+#ifndef _IPT_IMQ_H 
     
    574579+ 
    575580+#endif /* _IPT_IMQ_H */ 
    576 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 
    577 --- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_IMQ.h  1970-01-01 01:00:00.000000000 +0100 
    578 +++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_IMQ.h  2007-05-26 20:34:15.495229104 +0200 
     581Index: linux-2.6.21.5/include/linux/netfilter_ipv6/ip6t_IMQ.h 
     582=================================================================== 
     583--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     584+++ linux-2.6.21.5/include/linux/netfilter_ipv6/ip6t_IMQ.h      2007-07-02 08:26:04.927894500 +0200 
    579585@@ -0,0 +1,8 @@ 
    580586+#ifndef _IP6T_IMQ_H 
     
    586592+ 
    587593+#endif /* _IP6T_IMQ_H */ 
    588 diff -urN linux-2.6.21.1.old/include/linux/skbuff.h linux-2.6.21.1.dev/include/linux/skbuff.h 
    589 --- linux-2.6.21.1.old/include/linux/skbuff.h   2007-04-27 23:49:26.000000000 +0200 
    590 +++ linux-2.6.21.1.dev/include/linux/skbuff.h   2007-05-26 20:34:15.496228952 +0200 
     594Index: linux-2.6.21.5/include/linux/skbuff.h 
     595=================================================================== 
     596--- linux-2.6.21.5.orig/include/linux/skbuff.h  2007-07-02 08:25:36.598124000 +0200 
     597+++ linux-2.6.21.5/include/linux/skbuff.h       2007-07-02 08:26:04.983898000 +0200 
    591598@@ -294,6 +294,10 @@ 
    592599 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) 
     
    600607        struct nf_bridge_info   *nf_bridge; 
    601608 #endif 
    602 diff -urN linux-2.6.21.1.old/net/core/dev.c linux-2.6.21.1.dev/net/core/dev.c 
    603 --- linux-2.6.21.1.old/net/core/dev.c   2007-04-27 23:49:26.000000000 +0200 
    604 +++ linux-2.6.21.1.dev/net/core/dev.c   2007-05-26 20:34:15.497228800 +0200 
     609Index: linux-2.6.21.5/net/core/dev.c 
     610=================================================================== 
     611--- linux-2.6.21.5.orig/net/core/dev.c  2007-07-02 08:25:36.606124500 +0200 
     612+++ linux-2.6.21.5/net/core/dev.c       2007-07-02 08:26:04.983898000 +0200 
    605613@@ -94,6 +94,9 @@ 
    606614 #include <linux/skbuff.h> 
     
    626634  
    627635                if (netif_needs_gso(dev, skb)) { 
    628 diff -urN linux-2.6.21.1.old/net/core/skbuff.c linux-2.6.21.1.dev/net/core/skbuff.c 
    629 --- linux-2.6.21.1.old/net/core/skbuff.c        2007-04-27 23:49:26.000000000 +0200 
    630 +++ linux-2.6.21.1.dev/net/core/skbuff.c        2007-05-26 20:34:15.498228648 +0200 
     636Index: linux-2.6.21.5/net/core/skbuff.c 
     637=================================================================== 
     638--- linux-2.6.21.5.orig/net/core/skbuff.c       2007-07-02 08:25:36.618125250 +0200 
     639+++ linux-2.6.21.5/net/core/skbuff.c    2007-07-02 08:26:05.007899500 +0200 
    631640@@ -430,6 +430,10 @@ 
    632641        C(nfct_reasm); 
     
    651660        new->nf_bridge  = old->nf_bridge; 
    652661        nf_bridge_get(old->nf_bridge); 
    653 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 
    654 --- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_IMQ.c     1970-01-01 01:00:00.000000000 +0100 
    655 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_IMQ.c     2007-05-26 20:34:15.498228648 +0200 
    656 @@ -0,0 +1,71 @@ 
     662Index: linux-2.6.21.5/net/ipv4/netfilter/ipt_IMQ.c 
     663=================================================================== 
     664--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     665+++ linux-2.6.21.5/net/ipv4/netfilter/ipt_IMQ.c 2007-07-02 08:26:05.055902500 +0200 
     666@@ -0,0 +1,69 @@ 
    657667+/* 
    658668+ * This target marks packets to be enqueued to an imq device 
     
    675685+       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE; 
    676686+ 
    677 +       return IPT_CONTINUE; 
     687+       return XT_CONTINUE; 
    678688+} 
    679689+ 
     
    698708+} 
    699709+ 
    700 +static struct ipt_target ipt_imq_reg = { 
     710+static struct xt_target ipt_imq_reg = { 
    701711+       .name           = "IMQ", 
     712+       .family         = AF_INET, 
    702713+       .target         = imq_target, 
    703714+       .targetsize     = sizeof(struct ipt_imq_info), 
     
    709720+static int __init init(void) 
    710721+{ 
    711 +       if (xt_register_target(&ipt_imq_reg)) 
    712 +               return -EINVAL; 
    713 + 
    714 +       return 0; 
     722+       return xt_register_target(&ipt_imq_reg); 
    715723+} 
    716724+ 
     
    726734+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    727735+MODULE_LICENSE("GPL"); 
    728 diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig 
    729 --- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig       2007-05-26 20:34:13.929467136 +0200 
    730 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig       2007-05-26 20:34:15.498228648 +0200 
     736Index: linux-2.6.21.5/net/ipv4/netfilter/Kconfig 
     737=================================================================== 
     738--- linux-2.6.21.5.orig/net/ipv4/netfilter/Kconfig      2007-07-02 08:25:36.630126000 +0200 
     739+++ linux-2.6.21.5/net/ipv4/netfilter/Kconfig   2007-07-02 08:26:05.115906250 +0200 
    731740@@ -605,6 +605,17 @@ 
    732741  
     
    747756        tristate "TOS target support" 
    748757        depends on IP_NF_MANGLE 
    749 diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile 
    750 --- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile      2007-05-26 20:34:13.930466984 +0200 
    751 +++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile      2007-05-26 20:34:15.499228496 +0200 
     758Index: linux-2.6.21.5/net/ipv4/netfilter/Makefile 
     759=================================================================== 
     760--- linux-2.6.21.5.orig/net/ipv4/netfilter/Makefile     2007-07-02 08:25:36.714131250 +0200 
     761+++ linux-2.6.21.5/net/ipv4/netfilter/Makefile  2007-07-02 08:26:05.175910000 +0200 
    752762@@ -100,6 +100,7 @@ 
    753763 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o 
     
    758768 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o 
    759769 obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o 
    760 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 
    761 --- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_IMQ.c    1970-01-01 01:00:00.000000000 +0100 
    762 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_IMQ.c    2007-05-26 20:34:15.531223632 +0200 
    763 @@ -0,0 +1,71 @@ 
     770Index: linux-2.6.21.5/net/ipv6/netfilter/ip6t_IMQ.c 
     771=================================================================== 
     772--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     773+++ linux-2.6.21.5/net/ipv6/netfilter/ip6t_IMQ.c        2007-07-02 08:26:05.231913500 +0200 
     774@@ -0,0 +1,69 @@ 
    764775+/* 
    765776+ * This target marks packets to be enqueued to an imq device 
     
    782793+       (*pskb)->imq_flags = mr->todev | IMQ_F_ENQUEUE; 
    783794+ 
    784 +       return IP6T_CONTINUE; 
     795+       return XT_CONTINUE; 
    785796+} 
    786797+ 
     
    805816+} 
    806817+ 
    807 +static struct ip6t_target ip6t_imq_reg = { 
     818+static struct xt_target ip6t_imq_reg = { 
    808819+       .name           = "IMQ", 
     820+       .family         = AF_INET6, 
    809821+       .target         = imq_target, 
    810822+       .targetsize     = sizeof(struct ip6t_imq_info), 
     
    816828+static int __init init(void) 
    817829+{ 
    818 +       if (xt_register_target(&ip6t_imq_reg)) 
    819 +               return -EINVAL; 
    820 + 
    821 +       return 0; 
     830+       return xt_register_target(&ip6t_imq_reg); 
    822831+} 
    823832+ 
     
    833842+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); 
    834843+MODULE_LICENSE("GPL"); 
    835 diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig 
    836 --- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig       2007-04-27 23:49:26.000000000 +0200 
    837 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig       2007-05-26 20:34:15.531223632 +0200 
     844Index: linux-2.6.21.5/net/ipv6/netfilter/Kconfig 
     845=================================================================== 
     846--- linux-2.6.21.5.orig/net/ipv6/netfilter/Kconfig      2007-07-02 08:25:36.726132000 +0200 
     847+++ linux-2.6.21.5/net/ipv6/netfilter/Kconfig   2007-07-02 08:26:05.267915750 +0200 
    838848@@ -173,6 +173,15 @@ 
    839849  
     
    852862        tristate  'HL (hoplimit) target support' 
    853863        depends on IP6_NF_MANGLE 
    854 diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile 
    855 --- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile      2007-04-27 23:49:26.000000000 +0200 
    856 +++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile      2007-05-26 20:34:15.558219528 +0200 
     864Index: linux-2.6.21.5/net/ipv6/netfilter/Makefile 
     865=================================================================== 
     866--- linux-2.6.21.5.orig/net/ipv6/netfilter/Makefile     2007-07-02 08:25:36.738132750 +0200 
     867+++ linux-2.6.21.5/net/ipv6/netfilter/Makefile  2007-07-02 08:26:05.319919000 +0200 
    857868@@ -13,6 +13,7 @@ 
    858869 obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o 
     
    863874 obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o 
    864875 obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o 
    865 diff -urN linux-2.6.21.1.old/net/sched/sch_generic.c linux-2.6.21.1.dev/net/sched/sch_generic.c 
    866 --- linux-2.6.21.1.old/net/sched/sch_generic.c  2007-04-27 23:49:26.000000000 +0200 
    867 +++ linux-2.6.21.1.dev/net/sched/sch_generic.c  2007-05-26 20:34:15.599213296 +0200 
     876Index: linux-2.6.21.5/net/sched/sch_generic.c 
     877=================================================================== 
     878--- linux-2.6.21.5.orig/net/sched/sch_generic.c 2007-07-02 08:25:36.750133500 +0200 
     879+++ linux-2.6.21.5/net/sched/sch_generic.c      2007-07-02 08:26:05.343920500 +0200 
    868880@@ -87,7 +87,6 @@ 
    869881  
Note: See TracChangeset for help on using the changeset viewer.