[NETFILTER]: x_tables: unify IPv4/IPv6 multiport match

[powerpc.git] / net / ipv4 / ipcomp.c

diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index dcb7ee6..0a1d86a 100644 (file)
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -24,10 +24,12 @@
 #include <linux/list.h>
 #include <linux/vmalloc.h>
 #include <linux/rtnetlink.h>
+#include <linux/mutex.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/icmp.h>
 #include <net/ipcomp.h>
+#include <net/protocol.h>
 
 struct ipcomp_tfms {
        struct list_head list;
@@ -35,7 +37,7 @@ struct ipcomp_tfms {
        int users;
 };
 
-static DECLARE_MUTEX(ipcomp_resource_sem);
+static DEFINE_MUTEX(ipcomp_resource_mutex);
 static void **ipcomp_scratches;
 static int ipcomp_scratch_users;
 static LIST_HEAD(ipcomp_tfms_list);
@@ -79,8 +81,7 @@ out:
        return err;
 }
 
-static int ipcomp_input(struct xfrm_state *x,
-                        struct xfrm_decap_state *decap, struct sk_buff *skb)
+static int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb)
 {
        u8 nexthdr;
        int err = 0;
@@ -252,7 +253,7 @@ error:
 }
 
 /*
- * Must be protected by xfrm_cfg_sem.  State and tunnel user references are
+ * Must be protected by xfrm_cfg_mutex.  State and tunnel user references are
  * always incremented on success.
  */
 static int ipcomp_tunnel_attach(struct xfrm_state *x)
@@ -345,8 +346,7 @@ static void ipcomp_free_tfms(struct crypto_tfm **tfms)
 
        for_each_cpu(cpu) {
                struct crypto_tfm *tfm = *per_cpu_ptr(tfms, cpu);
-               if (tfm)
-                       crypto_free_tfm(tfm);
+               crypto_free_tfm(tfm);
        }
        free_percpu(tfms);
 }
@@ -411,9 +411,9 @@ static void ipcomp_destroy(struct xfrm_state *x)
        if (!ipcd)
                return;
        xfrm_state_delete_tunnel(x);
-       down(&ipcomp_resource_sem);
+       mutex_lock(&ipcomp_resource_mutex);
        ipcomp_free_data(ipcd);
-       up(&ipcomp_resource_sem);
+       mutex_unlock(&ipcomp_resource_mutex);
        kfree(ipcd);
 }
 
@@ -440,14 +440,14 @@ static int ipcomp_init_state(struct xfrm_state *x)
        if (x->props.mode)
                x->props.header_len += sizeof(struct iphdr);
 
-       down(&ipcomp_resource_sem);
+       mutex_lock(&ipcomp_resource_mutex);
        if (!ipcomp_alloc_scratches())
                goto error;
 
        ipcd->tfms = ipcomp_alloc_tfms(x->calg->alg_name);
        if (!ipcd->tfms)
                goto error;
-       up(&ipcomp_resource_sem);
+       mutex_unlock(&ipcomp_resource_mutex);
 
        if (x->props.mode) {
                err = ipcomp_tunnel_attach(x);
@@ -464,10 +464,10 @@ out:
        return err;
 
 error_tunnel:
-       down(&ipcomp_resource_sem);
+       mutex_lock(&ipcomp_resource_mutex);
 error:
        ipcomp_free_data(ipcd);
-       up(&ipcomp_resource_sem);
+       mutex_unlock(&ipcomp_resource_mutex);
        kfree(ipcd);
        goto out;
 }