diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-05-27 15:11:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-27 15:11:33 -0700 |
| commit | ae920e83a079bc0ed883d6b709f8f6433ce86745 (patch) | |
| tree | d6a4daa41899129ea82b20e0eafaa628455c261c /include/linux | |
| parent | sctp: fix typo sctp_ulpevent_nofity_peer_addr_change (diff) | |
| parent | net: remove kernel_getsockopt (diff) | |
Merge branch 'remove-kernel_getsockopt'
Christoph Hellwig says:
====================
remove kernel_getsockopt
this series reduces scope from the last round and just removes
kernel_getsockopt to avoid conflicting with the sctp cleanup series.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/net.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 6451425e828f..74ef5d7315f7 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -303,8 +303,6 @@ int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen, int flags); int kernel_getsockname(struct socket *sock, struct sockaddr *addr); int kernel_getpeername(struct socket *sock, struct sockaddr *addr); -int kernel_getsockopt(struct socket *sock, int level, int optname, char *optval, - int *optlen); int kernel_setsockopt(struct socket *sock, int level, int optname, char *optval, unsigned int optlen); int kernel_sendpage(struct socket *sock, struct page *page, int offset, |