[netfilter-cvslog] r4266 - trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-09-19 16:53:50 +0200 (Mon, 19 Sep 2005)
New Revision: 4266

Modified:
   trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rtsp.c
Log:
kill lockhelp.h (Samir Bellabes)


Modified: trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rtsp.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rtsp.c	2005-09-19 14:52:34 UTC (rev 4265)
+++ trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rtsp.c	2005-09-19 14:53:50 UTC (rev 4266)
@@ -31,7 +31,6 @@
 #include <net/checksum.h>
 #include <net/tcp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/ip_conntrack_rtsp.h>
 
@@ -70,7 +69,7 @@
 MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
 
 static char rtsp_buffer[65536];
-static DECLARE_LOCK(rtsp_buffer_lock);
+static DEFINE_SPINLOCK(rtsp_buffer_lock);
 
 unsigned int (*ip_nat_rtsp_hook)(struct sk_buff **pskb,
 				 enum ip_conntrack_info ctinfo,
@@ -415,7 +414,7 @@
     if (dataoff >= (*pskb)->len)
 	    return NF_ACCEPT;
 
-    LOCK_BH(&rtsp_buffer_lock);
+    spin_lock_bh(&rtsp_buffer_lock);
     rb_ptr = skb_header_pointer(*pskb, dataoff,
 		    		(*pskb)->len - dataoff, rtsp_buffer);
     BUG_ON(rb_ptr == NULL);
@@ -443,7 +442,7 @@
         break;
     }
 
-    UNLOCK_BH(&rtsp_buffer_lock);
+    spin_unlock_bh(&rtsp_buffer_lock);
 
     return ret;
 }