[netfilter-cvslog] r4164 - in trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12: include/linux/netfilter_ipv4 net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-07-29 13:04:10 +0200 (Fri, 29 Jul 2005)
New Revision: 4164

Modified:
   trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/include/linux/netfilter_ipv4/ip_conntrack_mms.h
   trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_mms.c
   trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_nat_mms.c
Log:
2.6.12 merge (Sven Schuster)


Modified: trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/include/linux/netfilter_ipv4/ip_conntrack_mms.h
===================================================================
--- trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/include/linux/netfilter_ipv4/ip_conntrack_mms.h	2005-07-29 11:02:49 UTC (rev 4163)
+++ trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/include/linux/netfilter_ipv4/ip_conntrack_mms.h	2005-07-29 11:04:10 UTC (rev 4164)
@@ -3,9 +3,8 @@
 /* MMS tracking. */
 
 #ifdef __KERNEL__
-#include <linux/netfilter_ipv4/lockhelp.h>
 
-DECLARE_LOCK_EXTERN(ip_mms_lock);
+extern spinlock_t ip_mms_lock;
 
 #define MMS_PORT                         1755
 #define MMS_SRV_MSG_ID                   196610

Modified: trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_mms.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_mms.c	2005-07-29 11:02:49 UTC (rev 4163)
+++ trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_mms.c	2005-07-29 11:04:10 UTC (rev 4164)
@@ -35,7 +35,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_mms.h>
 
@@ -47,7 +46,7 @@
 MODULE_PARM_DESC(ports, "port numbers of MMS");
 
 static char mms_buffer[65536];
-static DECLARE_LOCK(mms_buffer_lock);
+static DEFINE_SPINLOCK(mms_buffer_lock);
 
 unsigned int (*ip_nat_mms_hook)(struct sk_buff **pskb,
 				enum ip_conntrack_info ctinfo,
@@ -190,7 +189,7 @@
 	if (dataoff >= (*pskb)->len)
 		return NF_ACCEPT;
 
-	LOCK_BH(&mms_buffer_lock);
+	spin_lock_bh(&mms_buffer_lock);
 	mb_ptr = skb_header_pointer(*pskb, dataoff,
 				    (*pskb)->len - dataoff, mms_buffer);
 	BUG_ON(mb_ptr == NULL);
@@ -292,7 +291,7 @@
 		goto out;
 	}
 out:
-	UNLOCK_BH(&mms_buffer_lock);
+	spin_unlock_bh(&mms_buffer_lock);
 	return ret;
 }
 

Modified: trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_nat_mms.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_nat_mms.c	2005-07-29 11:02:49 UTC (rev 4163)
+++ trunk/patch-o-matic-ng/patchlets/mms-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_nat_mms.c	2005-07-29 11:04:10 UTC (rev 4164)
@@ -89,8 +89,6 @@
 				    (for unicode) */
 	char unicode_buffer[75]; /* 27*2 (unicode) + 20 + 1 */
 	char proto_string[6];
-	
-	MUST_BE_LOCKED(&ip_mms_lock);
 
 	/* what was the protocol again ? */
 	mms_proto = expect->tuple.dst.protonum;