diff options
author | noz <noz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-16 19:25:20 +0000 |
---|---|---|
committer | noz <noz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-16 19:25:20 +0000 |
commit | a11dfce7a25fb7de61f3306c25d833710fdb316b (patch) | |
tree | 887dd555500536c150c4a656732da6bde9443082 /target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch | |
parent | c69fa28f0f3a6704f63e8b5316e5a292223f27d9 (diff) |
[generic-2.6] Remove files now present upstream in files-2.6.25
(This is mostly just drivers/ssb and include/linux/ssb)
[brcm47xx] Regenerate patches against 2.6.25.1 kernel+files set
Default is still to build against 2.6.23.16
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11155 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 caaf744041..eb5513050b 100644 --- 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. |