[netfilter-cvslog] r4250 - in trunk/patch-o-matic-ng/patchlets/rsh/linux-2.6.11: include/linux/netfilter_ipv4 net/ipv4/netfilter

kaber at netfilter.org kaber at netfilter.org
Mon Aug 29 22:53:38 CEST 2005


Author: kaber at netfilter.org
Date: 2005-08-29 22:53:38 +0200 (Mon, 29 Aug 2005)
New Revision: 4250

Modified:
   trunk/patch-o-matic-ng/patchlets/rsh/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack_rsh.h
   trunk/patch-o-matic-ng/patchlets/rsh/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rsh.c
Log:
[NETFILTER] Kill lockhelp.h for rsh (Samir Bellabes <sbellabes at mandriva.com>)


Modified: trunk/patch-o-matic-ng/patchlets/rsh/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack_rsh.h
===================================================================
--- trunk/patch-o-matic-ng/patchlets/rsh/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack_rsh.h	2005-08-29 20:51:58 UTC (rev 4249)
+++ trunk/patch-o-matic-ng/patchlets/rsh/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack_rsh.h	2005-08-29 20:53:38 UTC (rev 4250)
@@ -12,13 +12,6 @@
 #ifndef _IP_CONNTRACK_RSH_H
 #define _IP_CONNTRACK_RSH_H
 
-#ifdef __KERNEL__
-#include <linux/netfilter_ipv4/lockhelp.h>
-
-DECLARE_LOCK_EXTERN(ip_rsh_lock);
-#endif
-
-
 #define RSH_PORT	514
 
 /* This structure is per expected connection */

Modified: trunk/patch-o-matic-ng/patchlets/rsh/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rsh.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/rsh/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rsh.c	2005-08-29 20:51:58 UTC (rev 4249)
+++ trunk/patch-o-matic-ng/patchlets/rsh/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rsh.c	2005-08-29 20:53:38 UTC (rev 4250)
@@ -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 DEFINE_SPINLOCK(rsh_buffer_lock);
 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;
 }




More information about the netfilter-cvslog mailing list