diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-07-23 08:08:57 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-07-24 15:41:54 -0700 |
| commit | de40a3e88311b6f0fc79b876a4768bf2d99f9aae (patch) | |
| tree | 003360e0a61ce0ad32f7071eaa3f53462f56764e /include/net/ip.h | |
| parent | net/ipv4: switch ip_mroute_setsockopt to sockptr_t (diff) | |
| download | linux-dev-de40a3e88311b6f0fc79b876a4768bf2d99f9aae.tar.xz linux-dev-de40a3e88311b6f0fc79b876a4768bf2d99f9aae.zip | |
net/ipv4: merge ip_options_get and ip_options_get_from_user
Use the sockptr_t type to merge the versions.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | include/net/ip.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 3d34acc95ca8..d66ad3a95220 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -23,6 +23,7 @@ #include <linux/in.h> #include <linux/skbuff.h> #include <linux/jhash.h> +#include <linux/sockptr.h> #include <net/inet_sock.h> #include <net/route.h> @@ -707,9 +708,7 @@ int __ip_options_compile(struct net *net, struct ip_options *opt, int ip_options_compile(struct net *net, struct ip_options *opt, struct sk_buff *skb); int ip_options_get(struct net *net, struct ip_options_rcu **optp, - unsigned char *data, int optlen); -int ip_options_get_from_user(struct net *net, struct ip_options_rcu **optp, - unsigned char __user *data, int optlen); + sockptr_t data, int optlen); void ip_options_undo(struct ip_options *opt); void ip_forward_options(struct sk_buff *skb); int ip_options_rcv_srr(struct sk_buff *skb, struct net_device *dev); |