From 78cca583fee7cf01bef610d0077e2008ed3416e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 22 Jun 2022 10:47:28 +0200 Subject: [PATCH] =?utf8?q?sd-netlink:=20rename=20sd=5Fnetlink=5Finc=5Frcvb?= =?utf8?q?uf=20=E2=86=92=20sd=5Fnetlink=5Fincrease=5Frxbuf?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We have RxBufferSize= and TxBufferSize= in .link files. Let's use the same abbreviation here. OTOH, "inc" could be short for "increment" or "increase", let's avoid that. --- src/libsystemd/libsystemd.sym | 2 +- src/libsystemd/sd-netlink/sd-netlink.c | 2 +- src/network/networkctl.c | 2 +- src/network/networkd-manager.c | 4 ++-- src/systemd/sd-netlink.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index cb27f17c56e..24dfee70953 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -791,7 +791,7 @@ global: sd_netlink_new_from_fd; sd_netlink_open; sd_netlink_open_fd; - sd_netlink_inc_rcvbuf; + sd_netlink_increase_rxbuf; sd_netlink_ref; sd_netlink_unref; sd_netlink_send; diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c index 5afe04c3a36..7b1a77d29ac 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/sd-netlink/sd-netlink.c @@ -136,7 +136,7 @@ _public_ int sd_netlink_open(sd_netlink **ret) { return netlink_open_family(ret, NETLINK_ROUTE); } -_public_ int sd_netlink_inc_rcvbuf(sd_netlink *nl, size_t size) { +_public_ int sd_netlink_increase_rxbuf(sd_netlink *nl, size_t size) { assert_return(nl, -EINVAL); assert_return(!netlink_pid_changed(nl), -ECHILD); diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 95ef31aab60..2f789e773a5 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -692,7 +692,7 @@ static void acquire_wlan_link_info(LinkInfo *link) { return; } - (void) sd_netlink_inc_rcvbuf(genl, RCVBUF_SIZE); + (void) sd_netlink_increase_rxbuf(genl, RCVBUF_SIZE); r = wifi_get_interface(genl, link->ifindex, &link->wlan_iftype, &link->ssid); if (r < 0) diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 3cda1110b9d..d8a18006d3d 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -226,7 +226,7 @@ static int manager_connect_genl(Manager *m) { if (r < 0) return r; - r = sd_netlink_inc_rcvbuf(m->genl, RCVBUF_SIZE); + r = sd_netlink_increase_rxbuf(m->genl, RCVBUF_SIZE); if (r < 0) log_warning_errno(r, "Failed to increase receive buffer size for general netlink socket, ignoring: %m"); @@ -298,7 +298,7 @@ static int manager_connect_rtnl(Manager *m) { * case systemd sets the receive buffer size for us, and the value in the .socket unit * should take full effect. */ if (fd < 0) { - r = sd_netlink_inc_rcvbuf(m->rtnl, RCVBUF_SIZE); + r = sd_netlink_increase_rxbuf(m->rtnl, RCVBUF_SIZE); if (r < 0) log_warning_errno(r, "Failed to increase receive buffer size for rtnl socket, ignoring: %m"); } diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h index 38116917ce0..dcdf77c4fe5 100644 --- a/src/systemd/sd-netlink.h +++ b/src/systemd/sd-netlink.h @@ -43,7 +43,7 @@ typedef _sd_destroy_t sd_netlink_destroy_t; int sd_netlink_new_from_fd(sd_netlink **nl, int fd); int sd_netlink_open(sd_netlink **nl); int sd_netlink_open_fd(sd_netlink **nl, int fd); -int sd_netlink_inc_rcvbuf(sd_netlink *nl, const size_t size); +int sd_netlink_increase_rxbuf(sd_netlink *nl, const size_t size); sd_netlink *sd_netlink_ref(sd_netlink *nl); sd_netlink *sd_netlink_unref(sd_netlink *nl); -- 2.47.3