3 files changed, 20 insertions, 17 deletions

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 6107592fbd8c..3c7b324cd20c 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -50,6 +50,7 @@
 #include <net/protocol.h>
 #include <linux/ipv6.h>
 #include <linux/icmpv6.h>
+#include <linux/mutex.h>
 
 struct ipcomp6_tfms {
         struct list_head list;
@@ -57,7 +58,7 @@ struct ipcomp6_tfms {
         int users;
 };
 
-static DECLARE_MUTEX(ipcomp6_resource_sem);
+static DEFINE_MUTEX(ipcomp6_resource_mutex);
 static void **ipcomp6_scratches;
 static int ipcomp6_scratch_users;
 static LIST_HEAD(ipcomp6_tfms_list);
@@ -405,9 +406,9 @@ static void ipcomp6_destroy(struct xfrm_state *x)
         if (!ipcd)
                 return;
         xfrm_state_delete_tunnel(x);
-        down(&ipcomp6_resource_sem);
+        mutex_lock(&ipcomp6_resource_mutex);
         ipcomp6_free_data(ipcd);
-        up(&ipcomp6_resource_sem);
+        mutex_unlock(&ipcomp6_resource_mutex);
         kfree(ipcd);
 
         xfrm6_tunnel_free_spi((xfrm_address_t *)&x->props.saddr);
@@ -436,14 +437,14 @@ static int ipcomp6_init_state(struct xfrm_state *x)
         if (x->props.mode)
                 x->props.header_len += sizeof(struct ipv6hdr);
         
-        down(&ipcomp6_resource_sem);
+        mutex_lock(&ipcomp6_resource_mutex);
         if (!ipcomp6_alloc_scratches())
                 goto error;
 
         ipcd->tfms = ipcomp6_alloc_tfms(x->calg->alg_name);
         if (!ipcd->tfms)
                 goto error;
-        up(&ipcomp6_resource_sem);
+        mutex_unlock(&ipcomp6_resource_mutex);
 
         if (x->props.mode) {
                 err = ipcomp6_tunnel_attach(x);
@@ -459,10 +460,10 @@ static int ipcomp6_init_state(struct xfrm_state *x)
 out:
         return err;
 error_tunnel:
-        down(&ipcomp6_resource_sem);
+        mutex_lock(&ipcomp6_resource_mutex);
 error:
         ipcomp6_free_data(ipcd);
-        up(&ipcomp6_resource_sem);
+        mutex_unlock(&ipcomp6_resource_mutex);
         kfree(ipcd);
 
         goto out;
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index af0635084df8..344eab3b5da8 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -35,6 +35,7 @@
 #include <linux/spinlock.h>
 #include <linux/sysctl.h>
 #include <linux/proc_fs.h>
+#include <linux/mutex.h>
 #include <net/sock.h>
 #include <net/ipv6.h>
 #include <net/ip6_route.h>
@@ -65,7 +66,7 @@ static unsigned int queue_dropped = 0;
 static unsigned int queue_user_dropped = 0;
 static struct sock *ipqnl;
 static LIST_HEAD(queue_list);
-static DECLARE_MUTEX(ipqnl_sem);
+static DEFINE_MUTEX(ipqnl_mutex);
 
 static void
 ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict)
@@ -537,7 +538,7 @@ ipq_rcv_sk(struct sock *sk, int len)
         struct sk_buff *skb;
         unsigned int qlen;
 
-        down(&ipqnl_sem);
+        mutex_lock(&ipqnl_mutex);
                         
         for (qlen = skb_queue_len(&sk->sk_receive_queue); qlen; qlen--) {
                 skb = skb_dequeue(&sk->sk_receive_queue);
@@ -545,7 +546,7 @@ ipq_rcv_sk(struct sock *sk, int len)
                 kfree_skb(skb);
         }
                 
-        up(&ipqnl_sem);
+        mutex_unlock(&ipqnl_mutex);
 }
 
 static int
@@ -704,8 +705,8 @@ cleanup_sysctl:
         
 cleanup_ipqnl:
         sock_release(ipqnl->sk_socket);
-        down(&ipqnl_sem);
-        up(&ipqnl_sem);
+        mutex_lock(&ipqnl_mutex);
+        mutex_unlock(&ipqnl_mutex);
         
 cleanup_netlink_notifier:
         netlink_unregister_notifier(&ipq_nl_notifier);
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index 8cfc58b96fc2..08f9abbdf1d7 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -31,6 +31,7 @@
 #include <net/protocol.h>
 #include <linux/ipv6.h>
 #include <linux/icmpv6.h>
+#include <linux/mutex.h>
 
 #ifdef CONFIG_IPV6_XFRM6_TUNNEL_DEBUG
 # define X6TDEBUG       3
@@ -357,19 +358,19 @@ static int xfrm6_tunnel_input(struct xfrm_state *x, struct xfrm_decap_state *dec
 }
 
 static struct xfrm6_tunnel *xfrm6_tunnel_handler;
-static DECLARE_MUTEX(xfrm6_tunnel_sem);
+static DEFINE_MUTEX(xfrm6_tunnel_mutex);
 
 int xfrm6_tunnel_register(struct xfrm6_tunnel *handler)
 {
         int ret;
 
-        down(&xfrm6_tunnel_sem);
+        mutex_lock(&xfrm6_tunnel_mutex);
         ret = 0;
         if (xfrm6_tunnel_handler != NULL)
                 ret = -EINVAL;
         if (!ret)
                 xfrm6_tunnel_handler = handler;
-        up(&xfrm6_tunnel_sem);
+        mutex_unlock(&xfrm6_tunnel_mutex);
 
         return ret;
 }
@@ -380,13 +381,13 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler)
 {
         int ret;
 
-        down(&xfrm6_tunnel_sem);
+        mutex_lock(&xfrm6_tunnel_mutex);
         ret = 0;
         if (xfrm6_tunnel_handler != handler)
                 ret = -EINVAL;
         if (!ret)
                 xfrm6_tunnel_handler = NULL;
-        up(&xfrm6_tunnel_sem);
+        mutex_unlock(&xfrm6_tunnel_mutex);
 
         synchronize_net();