Remove files now present upstream in files-2.6.25 (This is mostly just drivers/ssb...

[openwrt/openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 150-netfilter_imq.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
index caaf744041cf2d8e6d005452f7006a9bc8f15a01..eb5513050b05a73e75afa3ff21346ea16e6d02f4 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
@@ -77,7 +77,7 @@ Index: linux-2.6.25.1/drivers/net/imq.c
 +      .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
@@ -89,7 +89,7 @@ Index: linux-2.6.25.1/drivers/net/imq.c
 +      .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
@@ -102,7 +102,7 @@ Index: linux-2.6.25.1/drivers/net/imq.c
 +      .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
@@ -114,7 +114,7 @@ Index: linux-2.6.25.1/drivers/net/imq.c
 +      .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
@@ -398,7 +398,7 @@ Index: linux-2.6.25.1/drivers/net/imq.c
 +    .init = imq_init_module,
 +    .exit = imq_exit_module,
 +};
-+ 
++
 +static int __init imq_init(void)
 +{
 +    return register_pernet_device(&imq_net_ops);
@@ -735,7 +735,7 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
  
 +config IP_NF_TARGET_IMQ
 +       tristate "IMQ target support"
-+       depends on IP_NF_MANGLE
++       depends on IP_NF_MANGLE && IMQ
 +       help
 +         This option adds a `IMQ' target which is used to specify if and
 +         to which IMQ device packets should get enqueued/dequeued.