diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h index 03f7ba3a08..1b7e881b5b 100644 --- a/lib/isc/netmgr/netmgr-int.h +++ b/lib/isc/netmgr/netmgr-int.h @@ -1331,12 +1331,6 @@ isc__nm_socket_reuse_lb(uv_os_sock_t fd); * Set the SO_REUSEPORT_LB (or equivalent) socket option on the fd */ -isc_result_t -isc__nm_socket_incoming_cpu(uv_os_sock_t fd); -/*%< - * Set the SO_INCOMING_CPU socket option on the fd if available - */ - isc_result_t isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_family_t sa_family); /*%< diff --git a/lib/isc/netmgr/socket.c b/lib/isc/netmgr/socket.c index 2b1e0e652e..7440c0b855 100644 --- a/lib/isc/netmgr/socket.c +++ b/lib/isc/netmgr/socket.c @@ -218,20 +218,6 @@ isc__nm_socket_reuse_lb(uv_os_sock_t fd) { #endif } -isc_result_t -isc__nm_socket_incoming_cpu(uv_os_sock_t fd) { -#ifdef SO_INCOMING_CPU - if (setsockopt_on(fd, SOL_SOCKET, SO_INCOMING_CPU) == -1) { - return (ISC_R_FAILURE); - } else { - return (ISC_R_SUCCESS); - } -#else - UNUSED(fd); -#endif - return (ISC_R_NOTIMPLEMENTED); -} - isc_result_t isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_family_t sa_family) { /* diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c index c106968c26..f43b1118b0 100644 --- a/lib/isc/netmgr/tcp.c +++ b/lib/isc/netmgr/tcp.c @@ -285,7 +285,6 @@ isc__nm_tcp_lb_socket(isc_nm_t *mgr, sa_family_t sa_family) { result = isc__nm_socket(sa_family, SOCK_STREAM, 0, &sock); RUNTIME_CHECK(result == ISC_R_SUCCESS); - (void)isc__nm_socket_incoming_cpu(sock); (void)isc__nm_socket_v6only(sock, sa_family); /* FIXME: set mss */ diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c index 1bcff168b2..653ef778d3 100644 --- a/lib/isc/netmgr/udp.c +++ b/lib/isc/netmgr/udp.c @@ -74,7 +74,6 @@ isc__nm_udp_lb_socket(isc_nm_t *mgr, sa_family_t sa_family) { result = isc__nm_socket(sa_family, SOCK_DGRAM, 0, &sock); RUNTIME_CHECK(result == ISC_R_SUCCESS); - (void)isc__nm_socket_incoming_cpu(sock); (void)isc__nm_socket_disable_pmtud(sock, sa_family); (void)isc__nm_socket_v6only(sock, sa_family); @@ -810,8 +809,6 @@ isc_nm_udpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer, RUNTIME_CHECK(result == ISC_R_SUCCESS || result == ISC_R_NOTIMPLEMENTED); - (void)isc__nm_socket_incoming_cpu(sock->fd); - (void)isc__nm_socket_disable_pmtud(sock->fd, sa_family); (void)isc__nm_socket_min_mtu(sock->fd, sa_family);