[netfilter-cvslog] r4265 - in trunk/patch-o-matic-ng/patchlets/u32: . linux-2.6/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-09-19 16:52:34 +0200 (Mon, 19 Sep 2005)
New Revision: 4265

Modified:
   trunk/patch-o-matic-ng/patchlets/u32/info
   trunk/patch-o-matic-ng/patchlets/u32/linux-2.6/net/ipv4/netfilter/ipt_u32.c
Log:
kill lockhelp.h (Samir Bellabes)


Modified: trunk/patch-o-matic-ng/patchlets/u32/info
===================================================================
--- trunk/patch-o-matic-ng/patchlets/u32/info	2005-09-19 14:50:06 UTC (rev 4264)
+++ trunk/patch-o-matic-ng/patchlets/u32/info	2005-09-19 14:52:34 UTC (rev 4265)
@@ -2,4 +2,3 @@
 Author: Don Cohen <don at isis.cs3-inc.com>
 Status: Tested locally, seems to work.
 Repository: base
-Requires: linux < 2.6.0

Modified: trunk/patch-o-matic-ng/patchlets/u32/linux-2.6/net/ipv4/netfilter/ipt_u32.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/u32/linux-2.6/net/ipv4/netfilter/ipt_u32.c	2005-09-19 14:50:06 UTC (rev 4264)
+++ trunk/patch-o-matic-ng/patchlets/u32/linux-2.6/net/ipv4/netfilter/ipt_u32.c	2005-09-19 14:52:34 UTC (rev 4265)
@@ -105,7 +105,6 @@
 
 #include <linux/netfilter_ipv4/ipt_u32.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/lockhelp.h>
 
 /* #include <asm-i386/timex.h> for timing */
 
@@ -115,7 +114,7 @@
 
 /* This is slow, but it's simple. --RR */
 static char u32_buffer[65536];
-static DECLARE_LOCK(u32_lock);
+static DEFINE_SPINLOCK(u32_lock);
 
 static int
 match(const struct sk_buff *skb,
@@ -136,7 +135,7 @@
 
 	u_int32_t AttPos;
 
-	LOCK_BH(&u32_lock);
+	spin_lock_bh(&u32_lock);
 
 	head = skb_header_pointer(skb, 0, skb->len, u32_buffer);
 	BUG_ON(head == NULL);
@@ -148,7 +147,7 @@
 	        AttPos = 0;
 		pos = data->tests[testind].location[0].number;
 		if (AttPos + pos + 3 > skb->len || AttPos + pos < 0){
-			UNLOCK_BH(&u32_lock);
+			spin_unlock_bh(&u32_lock);
 			return 0;
 		}
 		val = (base[pos]<<24) + (base[pos+1]<<16) +
@@ -190,13 +189,13 @@
 			/* cycles2 = get_cycles(); 
 			   printk("failed %d in %d cycles\n", testind, 
 				  cycles2-cycles1); */
-			UNLOCK_BH(&u32_lock);
+			spin_unlock_bh(&u32_lock);
 			return 0;
 		}
 	}
 	/* cycles2 = get_cycles();
 	   printk("succeeded in %d cycles\n", cycles2-cycles1); */
-	UNLOCK_BH(&u32_lock);
+	spin_unlock_bh(&u32_lock);
 	return 1;
 }