From a23828e5e3bff211228dbd122c90e72a56465ecd Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 30 Apr 2008 15:09:56 +0000 Subject: [kernel] fix some netfilter extensions on 2.6.25 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10991 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch') diff --git a/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch b/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch index f5f5589ff..e08900a46 100644 --- a/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch +++ b/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch @@ -218,7 +218,7 @@ Index: linux-2.6.23/net/netfilter/xt_TARPIT.c + fl.nl_u.ip4_u.tos = RT_TOS(niph->tos) | RTO_CONN; + fl.oif = 0; + -+ if (ip_route_output_key(&nrt, &fl)) ++ if (ip_route_output_key(&init_net, &nrt, &fl)) + goto free_nskb; + + dst_release(nskb->dst); @@ -279,7 +279,7 @@ Index: linux-2.6.23/net/netfilter/xt_TARPIT.c + if (iph->frag_off & htons(IP_OFFSET)) + return NF_DROP; + -+ tarpit_tcp(skb, rt, hooknum == NF_IP_LOCAL_IN); ++ tarpit_tcp(skb, rt, hooknum == NF_INET_LOCAL_IN); + return NF_DROP; +} + @@ -289,11 +289,11 @@ Index: linux-2.6.23/net/netfilter/xt_TARPIT.c +{ + bool invalid; + -+ if (strcmp(tablename, "raw") == 0 && hook_mask == NF_IP_PRE_ROUTING) ++ if (strcmp(tablename, "raw") == 0 && hook_mask == NF_INET_PRE_ROUTING) + return true; + if (strcmp(tablename, "filter") != 0) + return false; -+ invalid = hook_mask & ~((1 << NF_IP_LOCAL_IN) | (1 << NF_IP_FORWARD)); ++ invalid = hook_mask & ~((1 << NF_INET_LOCAL_IN) | (1 << NF_INET_FORWARD)); + return !invalid; +} + -- cgit v1.2.3