netfilter: split nf_sockopt

Split nf_sockopt into a getsockopt and setsockopt side as they share
very little code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
index 02870993d335c9919a649c6ec87d302c57fef667..90469b1f628a8ee5a07797e8715396db7c7d0183 100644 (file)
--- a/net/netfilter/nf_sockopt.c
+++ b/net/netfilter/nf_sockopt.c
@@ -89,36 +89,32 @@ out:
        return ops;
 }
 
-/* Call get/setsockopt() */
-static int nf_sockopt(struct sock *sk, u_int8_t pf, int val,
-                     char __user *opt, int *len, int get)
+int nf_setsockopt(struct sock *sk, u_int8_t pf, int val, char __user *opt,
+                 unsigned int len)
 {
        struct nf_sockopt_ops *ops;
        int ret;
 
-       ops = nf_sockopt_find(sk, pf, val, get);
+       ops = nf_sockopt_find(sk, pf, val, 0);
        if (IS_ERR(ops))
                return PTR_ERR(ops);
-
-       if (get)
-               ret = ops->get(sk, val, opt, len);
-       else
-               ret = ops->set(sk, val, opt, *len);
-
+       ret = ops->set(sk, val, opt, len);
        module_put(ops->owner);
        return ret;
 }
-
-int nf_setsockopt(struct sock *sk, u_int8_t pf, int val, char __user *opt,
-                 unsigned int len)
-{
-       return nf_sockopt(sk, pf, val, opt, &len, 0);
-}
 EXPORT_SYMBOL(nf_setsockopt);
 
 int nf_getsockopt(struct sock *sk, u_int8_t pf, int val, char __user *opt,
                  int *len)
 {
-       return nf_sockopt(sk, pf, val, opt, len, 1);
+       struct nf_sockopt_ops *ops;
+       int ret;
+
+       ops = nf_sockopt_find(sk, pf, val, 1);
+       if (IS_ERR(ops))
+               return PTR_ERR(ops);
+       ret = ops->get(sk, val, opt, len);
+       module_put(ops->owner);
+       return ret;
 }
 EXPORT_SYMBOL(nf_getsockopt);