diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-07-23 09:08:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-25 01:41:53 +0300 |
| commit | c8c1bbb6eb498109286739f8b6090e99313dd104 (patch) | |
| tree | 1782966e2597d7cb05e058ed2eeaf4689cfa2a0b /include | |
| parent | c34645ac25484968ddace9a6b140b70e72dc49b3 (diff) | |
| download | linux-c8c1bbb6eb498109286739f8b6090e99313dd104.tar.xz | |
net: switch sock_set_timeout to sockptr_t
Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 62e18fc8ac9f..bfb2fe2fc368 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -59,6 +59,7 @@ #include <linux/filter.h> #include <linux/rculist_nulls.h> #include <linux/poll.h> +#include <linux/sockptr.h> #include <linux/atomic.h> #include <linux/refcount.h> @@ -1669,7 +1670,7 @@ void sock_pfree(struct sk_buff *skb); #endif int sock_setsockopt(struct socket *sock, int level, int op, - char __user *optval, unsigned int optlen); + sockptr_t optval, unsigned int optlen); int sock_getsockopt(struct socket *sock, int level, int op, char __user *optval, int __user *optlen); |