[netfilter-cvslog] r6752 - trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2007-02-12 15:29:44 +0100 (Mon, 12 Feb 2007)
New Revision: 6752

Modified:
   trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c
Log:
[PATCH pom-ng] ipt_TARPIT for Linux 2.6.20

Patch for the function ip_direct_send() to compile on Linux 2.6.20.

Signed-off-by: Max Kellermann <max at duempel.org>


Modified: trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c	2007-02-12 02:02:27 UTC (rev 6751)
+++ trunk/patch-o-matic-ng/patchlets/TARPIT/linux-2.6/net/ipv4/netfilter/ipt_TARPIT.c	2007-02-12 14:29:44 UTC (rev 6752)
@@ -60,16 +60,11 @@
 static int ip_direct_send(struct sk_buff *skb)
 {
 	struct dst_entry *dst = skb->dst;
-	struct hh_cache *hh = dst->hh;
 
-	if (hh) {
-		read_lock_bh(&hh->hh_lock);
-		memcpy(skb->data - 16, hh->hh_data, 16);
-		read_unlock_bh(&hh->hh_lock);
-		skb_push(skb, hh->hh_len);
-		return hh->hh_output(skb);
-	} else if (dst->neighbour)
-		return dst->neighbour->output(skb);
+        if (dst->hh)
+                return neigh_hh_output(dst->hh, skb);
+        else if (dst->neighbour)
+                return dst->neighbour->output(skb);
 
 	if (net_ratelimit())
 		printk(KERN_DEBUG "TARPIT ip_direct_send: no header cache and no neighbor!\n");