[NETFILTER] Kill lockhelp.h for rsh

------------------------------------------------------------------------------

 include/linux/netfilter_ipv4/ip_conntrack_rsh.h |    3 +--
 net/ipv4/netfilter/ip_conntrack_rsh.c           |    7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

------------------------------------------------------------------------------

Index: patchlets/rsh/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack_rsh.h
===================================================================
--- patchlets/rsh/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack_rsh.h	(révision 4248)
+++ patchlets/rsh/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack_rsh.h	(copie de travail)
@@ -13,9 +13,8 @@
 #define _IP_CONNTRACK_RSH_H
 
 #ifdef __KERNEL__
-#include <linux/netfilter_ipv4/lockhelp.h>
 
-DECLARE_LOCK_EXTERN(ip_rsh_lock);
+extern spinlock_t ip_rsh_lock;
 #endif
 
 
Index: patchlets/rsh/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rsh.c
===================================================================
--- patchlets/rsh/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rsh.c	(révision 4248)
+++ patchlets/rsh/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rsh.c	(copie de travail)
@@ -103,7 +103,6 @@
 #include <net/checksum.h>
 #include <net/tcp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/ip_conntrack_rsh.h>
@@ -120,7 +119,7 @@
 MODULE_PARM_DESC(ports, "port numbers of RSH servers");
 #endif
 
-static DECLARE_LOCK(rsh_buffer_lock);
+static spinlock_t rsh_buffer_lock = SPIN_LOCK_UNLOCKED;
 static char rsh_buffer[65535];
 
 unsigned int (*ip_nat_rsh_hook)(struct sk_buff **pskb,
@@ -179,7 +178,7 @@
 	if (dataoff >= (*pskb)->len)
 		return NF_ACCEPT;
 
-	LOCK_BH(&rsh_buffer_lock);
+	spin_lock_bh(&rsh_buffer_lock);
 	rb_ptr = skb_header_pointer(*pskb, dataoff,
 				    (*pskb)->len - dataoff, rsh_buffer);
 	BUG_ON(rb_ptr == NULL);
@@ -256,7 +255,7 @@
 		ntohs(exp->mask.dst.u.tcp.port));
 
 out:
-	UNLOCK_BH(&rsh_buffer_lock);
+	spin_unlock_bh(&rsh_buffer_lock);
 
 	return ret;
 }