From: Roy Marples Date: Tue, 5 Nov 2019 21:01:19 +0000 (+0000) Subject: Linux: rename _open_link_socket to if_linksocket X-Git-Tag: v8.1.2~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4071f3c16456ef5caafc1f77ae544aac480df40;p=thirdparty%2Fdhcpcd.git Linux: rename _open_link_socket to if_linksocket --- diff --git a/src/if-linux.c b/src/if-linux.c index 09e2b6d2..f7f280bd 100644 --- a/src/if-linux.c +++ b/src/if-linux.c @@ -335,7 +335,7 @@ if_vlanid(const struct interface *ifp) } static int -_open_link_socket(struct sockaddr_nl *nl, int protocol) +if_linksocket(struct sockaddr_nl *nl, int protocol) { int fd; @@ -372,7 +372,7 @@ if_opensockets_os(struct dhcpcd_ctx *ctx) snl.nl_groups |= RTMGRP_IPV6_ROUTE | RTMGRP_IPV6_IFADDR | RTMGRP_NEIGH; #endif - ctx->link_fd = _open_link_socket(&snl, NETLINK_ROUTE); + ctx->link_fd = if_linksocket(&snl, NETLINK_ROUTE); if (ctx->link_fd == -1) return -1; #ifdef NETLINK_BROADCAST_ERROR @@ -386,7 +386,7 @@ if_opensockets_os(struct dhcpcd_ctx *ctx) ctx->priv = priv; memset(&snl, 0, sizeof(snl)); - priv->route_fd = _open_link_socket(&snl, NETLINK_ROUTE); + priv->route_fd = if_linksocket(&snl, NETLINK_ROUTE); if (priv->route_fd == -1) return -1; len = sizeof(snl); @@ -922,7 +922,7 @@ if_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct nlmsghdr *hdr, .msg_iov = &iov, .msg_iovlen = 1 }; - if ((s = _open_link_socket(&snl, protocol)) == -1) + if ((s = if_linksocket(&snl, protocol)) == -1) return -1; #ifdef NETLINK_GET_STRICT_CHK