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

laforge at netfilter.org laforge at netfilter.org
Fri Jul 29 13:08:31 CEST 2005 

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

Modified:
   trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323.c
   trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_core.c
   trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_h225.c
   trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_h245.c
   trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_nat_h323.c
Log:
2.6.12 merge (Sven Schuster)
- don't use lockhelp macros anymore


Modified: trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323.c	2005-07-29 11:06:17 UTC (rev 4165)
+++ trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323.c	2005-07-29 11:08:30 UTC (rev 4166)
@@ -16,7 +16,6 @@
 #include <net/checksum.h>
 #include <net/tcp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_conntrack.h>
 #include <linux/netfilter_ipv4/ip_conntrack_core.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
@@ -30,7 +29,7 @@
 /* This is slow, but it's simple. --RR */
 static char h323_buffer[65536];
 
-static DECLARE_LOCK(ip_h323_lock);
+static DEFINE_SPINLOCK(ip_h323_lock);
 
 struct module *ip_conntrack_h323 = THIS_MODULE;
 
@@ -100,7 +99,7 @@
 	}
 	datalen = (*pskb)->len - dataoff;
 
-	LOCK_BH(&ip_h323_lock);
+	spin_lock_bh(&ip_h323_lock);
 	data = skb_header_pointer((*pskb), dataoff,
 				  datalen, h323_buffer);
 	BUG_ON(data == NULL);
@@ -155,7 +154,7 @@
 
 	ret = NF_ACCEPT;
  out:
-	UNLOCK_BH(&ip_h323_lock);
+	spin_unlock_bh(&ip_h323_lock);
 	return ret;
 }
 
@@ -174,10 +173,10 @@
 void ip_conntrack_h245_expect(struct ip_conntrack *new,
 			      struct ip_conntrack_expect *this)
 {
-	WRITE_LOCK(&ip_conntrack_lock);
+	write_lock_bh(&ip_conntrack_lock);
 	new->helper = &h245;
 	DEBUGP("h225_expect: helper for %p added\n", new);
-	WRITE_UNLOCK(&ip_conntrack_lock);
+	write_unlock_bh(&ip_conntrack_lock);
 }
 EXPORT_SYMBOL_GPL(ip_conntrack_h245_expect);
 
@@ -408,7 +407,7 @@
 		return NF_ACCEPT;
 
 	/* get data portion, and evaluate it */
-	LOCK_BH(&ip_h323_lock);
+	spin_lock_bh(&ip_h323_lock);
 	data = skb_header_pointer((*pskb), dataoff,
 				  datalen, h323_buffer);
 	BUG_ON(data == NULL);
@@ -416,7 +415,7 @@
 	ret = h225_parse_tpkt(pskb, ct, ctinfo,
 			      data, datalen);
 
-	UNLOCK_BH(&ip_h323_lock);
+	spin_unlock_bh(&ip_h323_lock);
 	return ret;
 }
 

Modified: trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_core.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_core.c	2005-07-29 11:06:17 UTC (rev 4165)
+++ trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_core.c	2005-07-29 11:08:30 UTC (rev 4166)
@@ -13,7 +13,6 @@
 #include <net/checksum.h>
 #include <net/tcp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_conntrack.h>
 #include <linux/netfilter_ipv4/ip_conntrack_core.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>

Modified: trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_h225.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_h225.c	2005-07-29 11:06:17 UTC (rev 4165)
+++ trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_h225.c	2005-07-29 11:08:30 UTC (rev 4166)
@@ -13,7 +13,6 @@
 #include <net/checksum.h>
 #include <net/tcp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_conntrack.h>
 #include <linux/netfilter_ipv4/ip_conntrack_core.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
@@ -25,7 +24,7 @@
 /* This is slow, but it's simple. --RR */
 static char h225_buffer[65536];
 
-static DECLARE_LOCK(ip_h225_lock);
+static DEFINE_SPINLOCK(ip_h225_lock);
 
 int (*ip_nat_h225_hook)(struct sk_buff **pskb,
 			enum ip_conntrack_info ctinfo,
@@ -379,7 +378,7 @@
 		return NF_ACCEPT;
 
 	/* get data portion, and evaluate it */
-	LOCK_BH(&ip_h225_lock);
+	spin_lock_bh(&ip_h225_lock);
 	data = skb_header_pointer((*pskb), dataoff,
 				  datalen, h225_buffer);
 	BUG_ON(data == NULL);
@@ -387,7 +386,7 @@
 	ret = h225_parse_tpkt(pskb, ct, ctinfo,
 			      data, datalen);
 
-	UNLOCK_BH(&ip_h225_lock);
+	spin_unlock_bh(&ip_h225_lock);
 	return ret;
 }
 

Modified: trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_h245.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_h245.c	2005-07-29 11:06:17 UTC (rev 4165)
+++ trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_conntrack_h323_h245.c	2005-07-29 11:08:30 UTC (rev 4166)
@@ -13,7 +13,6 @@
 #include <net/checksum.h>
 #include <net/tcp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_conntrack.h>
 #include <linux/netfilter_ipv4/ip_conntrack_core.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
@@ -25,7 +24,7 @@
 /* This is slow, but it's simple. --RR */
 static char h245_buffer[65536];
 
-static DECLARE_LOCK(ip_h245_lock);
+static DEFINE_SPINLOCK(ip_h245_lock);
 
 struct module *ip_conntrack_h245 = THIS_MODULE;
 
@@ -925,7 +924,7 @@
 	if (datalen < 16)
 		return NF_ACCEPT;
 
-	LOCK_BH(&ip_h245_lock);
+	spin_lock_bh(&ip_h245_lock);
 	data = skb_header_pointer((*pskb), dataoff,
 				  datalen, h245_buffer);
 	BUG_ON(data == NULL);
@@ -933,7 +932,7 @@
 	ret = h245_parse_tpkt(pskb, ct, ctinfo,
 			      data, datalen);
 
-	UNLOCK_BH(&ip_h245_lock);
+	spin_unlock_bh(&ip_h245_lock);
 	return ret;
 }
 
@@ -952,9 +951,9 @@
 void ip_conntrack_h245_expect(struct ip_conntrack *new,
 			      struct ip_conntrack_expect *this)
 {
-	WRITE_LOCK(&ip_conntrack_lock);
+	write_lock_bh(&ip_conntrack_lock);
 	new->helper = &h245;
 	DEBUGP("h225_expect: helper for %p added\n", new);
-	WRITE_UNLOCK(&ip_conntrack_lock);
+	write_unlock_bh(&ip_conntrack_lock);
 }
 EXPORT_SYMBOL_GPL(ip_conntrack_h245_expect);

Modified: trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_nat_h323.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_nat_h323.c	2005-07-29 11:06:17 UTC (rev 4165)
+++ trunk/patch-o-matic-ng/patchlets/h323-conntrack-nat/linux-2.6.12/net/ipv4/netfilter/ip_nat_h323.c	2005-07-29 11:08:30 UTC (rev 4166)
@@ -16,7 +16,6 @@
 #include <net/checksum.h>
 #include <net/tcp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_nat.h>
 #include <linux/netfilter_ipv4/ip_nat_helper.h>
 #include <linux/netfilter_ipv4/ip_nat_rule.h>

More information about the netfilter-cvslog mailing list