summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-06-22 10:47:28 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-06-30 11:02:13 +0200
commit78cca583fee7cf01bef610d0077e2008ed3416e9 (patch)
treeb7815d9d69a290a9fd3aae9ab2f422eea3ec1050
parentsd-bus: indentation (diff)
downloadsystemd-78cca583fee7cf01bef610d0077e2008ed3416e9.tar.xz
systemd-78cca583fee7cf01bef610d0077e2008ed3416e9.zip
sd-netlink: rename sd_netlink_inc_rcvbuf → sd_netlink_increase_rxbuf
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.
-rw-r--r--src/libsystemd/libsystemd.sym2
-rw-r--r--src/libsystemd/sd-netlink/sd-netlink.c2
-rw-r--r--src/network/networkctl.c2
-rw-r--r--src/network/networkd-manager.c4
-rw-r--r--src/systemd/sd-netlink.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym
index cb27f17c56..24dfee7095 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 5afe04c3a3..7b1a77d29a 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 95ef31aab6..2f789e773a 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 3cda1110b9..d8a18006d3 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 38116917ce..dcdf77c4fe 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);