netfilter-2.6/patch-o-matic-ng/trunk: include/linux/netfilter_ipv4/ip_conntrack_mms.h net/ipv4/netfi...

[pluto]

Author: pluto
Date: Mon Aug  1 10:39:48 2005
New Revision: 6281

Modified:
   netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_conntrack_mms.h
   netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_mms.c
   netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_nat_mms.c
   netfilter-2.6/patch-o-matic-ng/trunk/status
Log:
- mms-conntrack updated.


Modified: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_conntrack_mms.h
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_conntrack_mms.h	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_conntrack_mms.h	Mon Aug  1 10:39:48 2005
@@ -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: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_mms.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_mms.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_mms.c	Mon Aug  1 10:39:48 2005
@@ -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: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_nat_mms.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_nat_mms.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_nat_mms.c	Mon Aug  1 10:39:48 2005
@@ -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;

Modified: netfilter-2.6/patch-o-matic-ng/trunk/status
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/status	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/status	Mon Aug  1 10:39:48 2005
@@ -19,7 +19,7 @@
 ipv4options		2005/07/27	added
 IPV4OPTSSTRIP		2005/07/27	added
 layer7			2005/07/27	added		(v1.4)
-mms-conntrack-nat	2005/07/27	added
+mms-conntrack-nat	2005/08/01	updated
 nf_conntrack		2005/07/27	added
 nfnetlink		2005/07/27	added
 nth			2005/07/27	added