Merge tag 'livepatching-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/include/linux/net.h b/include/linux/net.h
index 016a9c5..d48ff11 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -21,6 +21,7 @@
 #include <linux/rcupdate.h>
 #include <linux/once.h>
 #include <linux/fs.h>
+#include <linux/sockptr.h>
 
 #include <uapi/linux/net.h>
 
@@ -162,15 +163,10 @@ struct proto_ops {
        int             (*listen)    (struct socket *sock, int len);
        int             (*shutdown)  (struct socket *sock, int flags);
        int             (*setsockopt)(struct socket *sock, int level,
-                                     int optname, char __user *optval, unsigned int optlen);
+                                     int optname, sockptr_t optval,
+                                     unsigned int optlen);
        int             (*getsockopt)(struct socket *sock, int level,
                                      int optname, char __user *optval, int __user *optlen);
-#ifdef CONFIG_COMPAT
-       int             (*compat_setsockopt)(struct socket *sock, int level,
-                                     int optname, char __user *optval, unsigned int optlen);
-       int             (*compat_getsockopt)(struct socket *sock, int level,
-                                     int optname, char __user *optval, int __user *optlen);
-#endif
        void            (*show_fdinfo)(struct seq_file *m, struct socket *sock);
        int             (*sendmsg)   (struct socket *sock, struct msghdr *m,
                                      size_t total_len);