Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[linux-2.6-microblaze.git] / include / linux / bpfilter.h

diff --git a/include/linux/bpfilter.h b/include/linux/bpfilter.h
index d815622..2ae3c8e 100644 (file)
--- a/include/linux/bpfilter.h
+++ b/include/linux/bpfilter.h
@@ -3,22 +3,23 @@
 #define _LINUX_BPFILTER_H
 
 #include <uapi/linux/bpfilter.h>
-#include <linux/umh.h>
+#include <linux/usermode_driver.h>
+#include <linux/sockptr.h>
 
 struct sock;
-int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char __user *optval,
+int bpfilter_ip_set_sockopt(struct sock *sk, int optname, sockptr_t optval,
                            unsigned int optlen);
 int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval,
                            int __user *optlen);
+void bpfilter_umh_cleanup(struct umd_info *info);
+
 struct bpfilter_umh_ops {
-       struct umh_info info;
+       struct umd_info info;
        /* since ip_getsockopt() can run in parallel, serialize access to umh */
        struct mutex lock;
-       int (*sockopt)(struct sock *sk, int optname,
-                      char __user *optval,
+       int (*sockopt)(struct sock *sk, int optname, sockptr_t optval,
                       unsigned int optlen, bool is_set);
        int (*start)(void);
-       bool stop;
 };
 extern struct bpfilter_umh_ops bpfilter_ops;
 #endif