[netfilter-cvslog] r4168 - trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.12/net/ipv4/netfilter

laforge at netfilter.org laforge at netfilter.org
Fri Jul 29 13:11:09 CEST 2005


Author: laforge at netfilter.org
Date: 2005-07-29 13:11:08 +0200 (Fri, 29 Jul 2005)
New Revision: 4168

Modified:
   trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_sip.c
Log:
2.6.12 merge (Sven Schuster)
- don't use lockhelp.h macros anymore


Modified: trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_sip.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_sip.c	2005-07-29 11:09:39 UTC (rev 4167)
+++ trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_sip.c	2005-07-29 11:11:08 UTC (rev 4168)
@@ -16,7 +16,6 @@
 #include <net/checksum.h>
 #include <net/udp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/ip_conntrack_sip.h>
 
@@ -24,7 +23,7 @@
 MODULE_AUTHOR("Christian Hentschel <chentschel at arnet.com.ar>");
 MODULE_DESCRIPTION("SIP connection tracking helper");
 
-static DECLARE_LOCK(sipbf_lock);
+static DEFINE_SPINLOCK(sipbf_lock);
 
 #define MAX_PORTS	8
 static int ports[MAX_PORTS];
@@ -294,7 +293,7 @@
         
 	ip_ct_refresh_acct(ct, ctinfo, NULL, sip_timeout * HZ);
 		
-	LOCK_BH(&sipbf_lock);
+	spin_lock_bh(&sipbf_lock);
 	
 	if ((dataoff + (*pskb)->len - dataoff) <= skb_headlen(*pskb))
 		dptr = (*pskb)->data + dataoff;
@@ -347,7 +346,7 @@
 						ipaddr, port, dptr);
 		}
 	}
-out:	UNLOCK_BH(&sipbf_lock);
+out:	spin_unlock_bh(&sipbf_lock);
 	return ret;
 }
 




More information about the netfilter-cvslog mailing list